[Libreoffice-commits] core.git: libreofficekit/qa
Ashod Nakashian
ashod.nakashian at collabora.co.uk
Sat Dec 23 19:43:17 UTC 2017
libreofficekit/qa/tilebench/tilebench.cxx | 71 +++++++++++++++++++++++++-----
1 file changed, 60 insertions(+), 11 deletions(-)
New commits:
commit 62c36eb8c600fe328954c22d83b6f8dda57d5d15
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date: Sun Dec 3 23:34:22 2017 -0500
LOK: support tile-dumping in tilebench
And other improvements.
(cherry picked from commit b7d893d8a1ecb24290c4470e12d71caba2b85216)
Reviewed-on: https://gerrit.libreoffice.org/46678
Reviewed-by: Jan Holesovsky <kendy at collabora.com>
Tested-by: Jan Holesovsky <kendy at collabora.com>
(cherry picked from commit 0e7ccbdd559df3a446e73c367b12824c6c143579)
Change-Id: I5a27d6d2df5f946a708dd3b0b4fef8159da86e5c
Reviewed-on: https://gerrit.libreoffice.org/46985
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
diff --git a/libreofficekit/qa/tilebench/tilebench.cxx b/libreofficekit/qa/tilebench/tilebench.cxx
index ed8d44c13789..61bc562ae9a7 100644
--- a/libreofficekit/qa/tilebench/tilebench.cxx
+++ b/libreofficekit/qa/tilebench/tilebench.cxx
@@ -13,6 +13,7 @@
#include <cmath>
#include <vector>
+#include <fstream>
#include <osl/time.h>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
@@ -36,6 +37,48 @@ static double getTimeNow()
(double)aValue.Nanosec / (1000*1000*1000);
}
+/// Dump an array of RGBA or BGRA to an RGB PPM file.
+static void dumpTile(const int nWidth, const int nHeight, const int mode, const char* pBuffer)
+{
+ std::ofstream ofs("/tmp/dump_tile.ppm");
+ ofs << "P6\n"
+ << nWidth << " "
+ << nHeight << "\n"
+ << 255 << "\n" ;
+
+ for (int y = 0; y < nHeight; ++y)
+ {
+ const char* row = pBuffer + y * nWidth * 4;
+ for (int x = 0; x < nWidth; ++x)
+ {
+ const char* pixel = row + x * 4;
+ if (mode == LOK_TILEMODE_RGBA)
+ {
+ ofs.write(pixel, 3); // Skip alpha
+ }
+ else if (mode == LOK_TILEMODE_BGRA)
+ {
+ const int alpha = *(pixel + 3);
+ char buf[3];
+ if (alpha == 0)
+ {
+ buf[0] = 0;
+ buf[1] = 0;
+ buf[2] = 0;
+ }
+ else
+ {
+ buf[0] = (*(pixel + 2) * 255 + alpha / 2) / alpha;
+ buf[1] = (*(pixel + 1) * 255 + alpha / 2) / alpha;
+ buf[2] = (*(pixel + 0) * 255 + alpha / 2) / alpha;
+ }
+
+ ofs.write(buf, 3);
+ }
+ }
+ }
+}
+
int main( int argc, char* argv[] )
{
static const double origin = getTimeNow();
@@ -73,35 +116,42 @@ int main( int argc, char* argv[] )
aTimes.emplace_back();
const int max_parts = (argc > 3 ? atoi(argv[3]) : -1);
- const int max_tiles = (argc > 4 ? atoi(argv[4]) : -1);
+ int max_tiles = (argc > 4 ? atoi(argv[4]) : -1);
+ const bool dump = true;
if (argv[2] != nullptr)
{
aTimes.emplace_back("load document");
Document *pDocument(pOffice->documentLoad(argv[2]));
aTimes.emplace_back();
+ const int mode = pDocument->getTileMode();
aTimes.emplace_back("getparts");
- const int nOriginalPart = pDocument->getPart();
+ const int nOriginalPart = (pDocument->getDocumentType() == LOK_DOCTYPE_TEXT ? 1 : pDocument->getPart());
// Writer really has 1 part (the full doc).
const int nTotalParts = (pDocument->getDocumentType() == LOK_DOCTYPE_TEXT ? 1 : pDocument->getParts());
const int nParts = (max_parts < 0 ? nTotalParts : std::min(max_parts, nTotalParts));
- fprintf(stderr, "Parts to render: %d, Total Parts: %d, Max parts: %d, Max tiles: %d\n", nParts, nTotalParts, max_parts, max_tiles);
aTimes.emplace_back();
aTimes.emplace_back("get size of parts");
+ long nWidth = 0;
+ long nHeight = 0;
for (int n = 0; n < nParts; ++n)
{
const int nPart = (nOriginalPart + n) % nTotalParts;
char* pName = pDocument->getPartName(nPart);
pDocument->setPart(nPart);
- long nWidth = 0, nHeight = 0;
pDocument->getDocumentSize(&nWidth, &nHeight);
fprintf (stderr, " '%s' -> %ld, %ld\n", pName, nWidth, nHeight);
free (pName);
}
aTimes.emplace_back();
+ // Estimate the maximum tiles based on the number of parts requested, if Writer.
+ if (pDocument->getDocumentType() == LOK_DOCTYPE_TEXT)
+ max_tiles = (int)ceil(max_parts * 16128. / nTilePixelHeight) * ceil((double)nWidth / nTilePixelWidth);
+ fprintf(stderr, "Parts to render: %d, Total Parts: %d, Max parts: %d, Max tiles: %d\n", nParts, nTotalParts, max_parts, max_tiles);
+
std::vector<unsigned char> vBuffer(nTilePixelWidth * nTilePixelHeight * 4);
unsigned char* pPixels = &vBuffer[0];
@@ -110,25 +160,25 @@ int main( int argc, char* argv[] )
const int nPart = (nOriginalPart + n) % nTotalParts;
char* pName = pDocument->getPartName(nPart);
pDocument->setPart(nPart);
- long nWidth = 0, nHeight = 0;
pDocument->getDocumentSize(&nWidth, &nHeight);
fprintf (stderr, "render '%s' -> %ld, %ld\n", pName, nWidth, nHeight);
free (pName);
- if (pDocument->getDocumentType() != LOK_DOCTYPE_TEXT)
- { // whole part; meaningful only for non-writer documents.
+ if (dump || pDocument->getDocumentType() != LOK_DOCTYPE_TEXT)
+ {
+ // whole part; meaningful only for non-writer documents.
aTimes.emplace_back("render whole part");
pDocument->paintTile(pPixels, nTilePixelWidth, nTilePixelHeight,
- 0, 0, nWidth, nHeight); // not square
+ nWidth/2, 2000, 1000, 1000); // not square
aTimes.emplace_back();
+ if (dump)
+ dumpTile(nTilePixelWidth, nTilePixelHeight, mode, reinterpret_cast<char*>(pPixels));
}
{ // 1:1
aTimes.emplace_back("render sub-region at 1:1");
// Estimate the maximum tiles based on the number of parts requested, if Writer.
int nMaxTiles = max_tiles;
- if (pDocument->getDocumentType() == LOK_DOCTYPE_TEXT)
- nMaxTiles = (int)ceil(max_parts * 16128. / nTilePixelHeight) * ceil((double)nWidth / nTilePixelWidth);
int nTiles = 0;
for (int nY = 0; nY < nHeight - 1; nY += nTilePixelHeight)
{
@@ -152,7 +202,6 @@ int main( int argc, char* argv[] )
{ // scaled
aTimes.emplace_back("render sub-regions at scale");
- // Estimate the maximum tiles based on the number of parts requested, if Writer.
int nMaxTiles = max_tiles;
if (pDocument->getDocumentType() == LOK_DOCTYPE_TEXT)
nMaxTiles = (int)ceil(max_parts * 16128. / nTileTwipHeight) * ceil((double)nWidth / nTileTwipWidth);
More information about the Libreoffice-commits
mailing list