dev/null |binary
kit/Delta.hpp | 221 ----------------------------------
kit/Kit.cpp | 10 -
loleaflet/src/core/Socket.js | 20 ---
loleaflet/src/layer/tile/TileLayer.js | 96 --------------
test/DeltaTests.cpp | 209 --------------------------------
test/Makefile.am | 1
wsd/TileDesc.hpp | 1
8 files changed, 6 insertions(+), 552 deletions(-)
New commits:
commit 05bff893c96a57ede75576658159223ebfa02ad6
Author: Michael Meeks <michael.me...@collabora.com>
Date: Fri Dec 1 21:32:18 2017 +0000
Revert incomplete deltas work with blue surrounds.
Pushed in error, and not ready for prime-time:
Revert "Deltas - collapse multiple rows to a single row."
This reverts commit 74f44251b782e5cab42960d1e328102a1538e72f.
Revert "Convert Javascript to row deltas."
This reverts commit fa86ba9ec5ecb418bd025c0bc7bbea8456409c07.
Revert "Make delta-builder row-based."
This reverts commit 5efb59db50a49374bcf53198f7c0a1e120754cc9.
Revert "Start of Delta unit-tests."
This reverts commit 42d264eeb00fc14bb89104c7dc8b3bcd53897e30.
Revert "Move the Delta generator out into its own file."
This reverts commit 78398d4482a5a39c87d7c0ec88fc9d357f73408c.
Revert "Insert pixels from 'new' not 'old'."
This reverts commit ed8807a1a5a613f54dfc5a204294e870969254e2.
Revert "Deltas should be pixel based, add debugging."
This reverts commit b1124c05a89007bd00f29be3e1a42d7817458048.
Revert "Start of delta creator."
This reverts commit 0bfbbf98510f82eb9a8ff3dc44254bd848458d53.
diff --git a/kit/Delta.hpp b/kit/Delta.hpp
deleted file mode 100644
index 1cc3afba..00000000
--- a/kit/Delta.hpp
+++ /dev/null
@@ -1,221 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-#ifndef INCLUDED_DELTA_HPP
-#define INCLUDED_DELTA_HPP
-
-#include <vector>
-#include <assert.h>
-#include <Log.hpp>
-
-#ifndef TILE_WIRE_ID
-# define TILE_WIRE_ID
- typedef uint32_t TileWireId;
-#endif
-
-/// A quick and dirty delta generator for last tile changes
-class DeltaGenerator {
-
- struct DeltaBitmapRow {
- uint64_t _crc;
- std::vector<uint32_t> _pixels;
-
- bool identical(const DeltaBitmapRow &other) const
- {
- if (_crc != other._crc)
- return false;
- return _pixels == other._pixels;
- }
- };
-
- struct DeltaData {
- TileWireId _wid;
- int _width;
- int _height;
- std::vector<DeltaBitmapRow> _rows;
- };
- std::vector<std::shared_ptr<DeltaData>> _deltaEntries;
-
- bool makeDelta(
- const DeltaData &prev,
- const DeltaData &cur,
- std::vector<char>& output)
- {
- // TODO: should we split and compress alpha separately ?
- if (prev._width != cur._width || prev._height != cur._height)
- {
- LOG_ERR("mis-sized delta: " << prev._width << "x" << prev._height
<< " vs "
- << cur._width << "x" << cur._height);
- return false;
- }
-
- output.push_back('D');
- LOG_TRC("building delta of a " << cur._width << "x" << cur._height <<
" bitmap");
-
- // row move/copy src/dest is a byte.
- assert (prev._height <= 256);
- // column position is a byte.
- assert (prev._width <= 256);
-
- // How do the rows look against each other ?
- size_t lastMatchOffset = 0;
- size_t lastCopy = 0;
- for (int y = 0; y < prev._height; ++y)
- {
- // Life is good where rows match:
- if (prev._rows[y].identical(cur._rows[y]))
- continue;
-
- // Hunt for other rows
- bool matched = false;
- for (int yn = 0; yn < prev._height && !matched; ++yn)
- {
- size_t match = (y + lastMatchOffset + yn) % prev._height;
- if (prev._rows[match].identical(cur._rows[y]))
- {
- // TODO: if offsets are >256 - use 16bits?
- if (lastCopy > 0)
- {
- char cnt = output[lastCopy];
- if (output[lastCopy + 1] + cnt == (char)(match) &&
- output[lastCopy + 2] + cnt == (char)(y))
- {
- output[lastCopy]++;
- matched = true;
- continue;
- }
- }
-
- lastMatchOffset = match - y;
- output.push_back('c'); // copy-row
- lastCopy = output.size();
- output.push_back(1); // count
- output.push_back(match); // src
- output.push_back(y); // dest
-
- matched = true;
- continue;
- }
- }
- if (matched)
- continue;
-
- // Our row is just that different:
- const DeltaBitmapRow &curRow = cur._rows[y];
- const DeltaBitmapRow &prevRow = prev._rows[y];
- for (int x = 0; x < prev._width;)
- {
- int same;
- for (same = 0; same + x < prev._width &&
- prevRow._pixels[x+same] == curRow._pixels[x+same];)
- ++same;
-
- x += same;
-
- int diff;
- for (diff = 0; diff + x < prev._width &&
- (prevRow._pixels[x+diff] == curRow._pixels[x+diff] ||
diff < 2) &&
- diff < 254;)
- ++diff;
- if (diff > 0)
- {
- output.push_back('d');
- output.push_back(y);
- output.push_back(x);
- output.push_back(diff);
-
- size_t dest = output.size();
- output.resize(dest + diff * 4);
- memcpy(&output[dest], &curRow._pixels[x], diff * 4);
-
- LOG_TRC("different " << diff << "pixels");
- x += diff;
- }
- }
- }
-
- return true;
- }
-
- std::shared_ptr<DeltaData> dataToDeltaData(
- TileWireId wid,
- unsigned char* pixmap, size_t startX, size_t startY,
- int width, int height,
- int bufferWidth, int bufferHeight)
- {
- auto data = std::make_shared<DeltaData>();
- data->_wid = wid;
-
- assert (startX + width <= (size_t)bufferWidth);
- assert (startY + height <= (size_t)bufferHeight);
-
- (void)bufferHeight;
-
- LOG_TRC("Converting pixel data to delta data of size "
- << (width * height * 4) << " width " << width
- << " height " << height);
-
- data->_width = width;
- data->_height = height;
- data->_rows.resize(height);
- for (int y = 0; y < height; ++y)
- {
- DeltaBitmapRow &row = data->_rows[y];
- size_t position = ((startY + y) * bufferWidth * 4) + (startX * 4);
- int32_t *src = reinterpret_cast<int32_t *>(pixmap + position);
-
- // We get the hash ~for free as we copy - with a cheap hash.
- uint64_t crc = 0x7fffffff - 1;
- row._pixels.resize(width);
- for (int x = 0; x < width; ++x)
- {
- crc = (crc << 7) + crc + src[x];
- row._pixels[x] = src[x];
- }
- }
-
- return data;
- }
-
- public:
- DeltaGenerator() {}
-
- /**
- * Creates a delta between @oldWid and pixmap if possible:
- * if so - returns @true and appends the delta to @output
- * stores @pixmap, and other data to accelerate delta
- * creation in a limited size cache.
- */
- bool createDelta(
- unsigned char* pixmap, size_t startX, size_t startY,
- int width, int height,
- int bufferWidth, int bufferHeight,
- std::vector<char>& output,
- TileWireId wid, TileWireId oldWid)
- {
- // First store a copy for later:
- if (_deltaEntries.size() > 6) // FIXME: hard-coded ...
- _deltaEntries.erase(_deltaEntries.begin());
-
- std::shared_ptr<DeltaData> update =
- dataToDeltaData(wid, pixmap, startX, startY, width, height,
- bufferWidth, bufferHeight);
- _deltaEntries.push_back(update);
-
- for (auto &old : _deltaEntries)
- {
- if (oldWid == old->_wid)
- return makeDelta(*old, *update, output);
- }
- return false;
- }
-};
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index df2d6ce5..1a7d87c1 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -66,7 +66,6 @@
#include "Unit.hpp"
#include "UserMessages.hpp"
#include "Util.hpp"
-#include "Delta.hpp"
#include "common/SigUtil.hpp"
#include "common/Seccomp.hpp"
@@ -311,7 +310,6 @@ class PngCache
size_t _cacheHits;
size_t _cacheTests;
TileWireId _nextId;
- DeltaGenerator _deltaGen;
std::map< TileBinaryHash, CacheEntry > _cache;
std::map< TileWireId, TileBinaryHash > _wireToHash;
@@ -408,15 +406,9 @@ class PngCache
int width, int height,
int bufferWidth, int bufferHeight,
std::vector<char>& output,
LibreOfficeKitTileMode mode,
- TileBinaryHash hash, TileWireId wid,
TileWireId oldWid)
+ TileBinaryHash hash, TileWireId wid,
TileWireId /* oldWid */)
{
LOG_DBG("PNG cache with hash " << hash << " missed.");
- if (_deltaGen.createDelta(pixmap, startX, startY, width, height,
- bufferWidth, bufferHeight,
- output, wid, oldWid))
- return true;
-
- LOG_DBG("Encode a new png for this tile.");
CacheEntry newEntry(bufferWidth * bufferHeight * 1, wid);
if (Png::encodeSubBufferToPNG(pixmap, startX, startY, width, height,
bufferWidth, bufferHeight,
diff --git a/loleaflet/src/core/Socket.js b/loleaflet/src/core/Socket.js
index 36c75624..5adf34b8 100644
--- a/loleaflet/src/core/Socket.js
+++ b/loleaflet/src/core/Socket.js
@@ -611,7 +611,6 @@ L.Socket = L.Class.extend({
else if (!textMsg.startsWith('tile:') &&
!textMsg.startsWith('renderfont:') && !textMsg.startsWith('dialogpaint:') &&
!textMsg.startsWith('dialogchildpaint:')) {
// log the tile msg separately as we need the tile
coordinates
L.Log.log(textMsg, L.INCOMING);
-
if (imgBytes !== undefined) {
try {
// if it's not a tile, parse the whole
message
@@ -629,21 +628,12 @@ L.Socket = L.Class.extend({
}
else {
var data = imgBytes.subarray(index + 1);
-
- if (data.length > 0 && data[0] == 68 /* D */)
- {
- console.log('Socket: got a delta !');
- var img = data;
- }
- else
- {
- // read the tile data
- var strBytes = '';
- for (var i = 0; i < data.length; i++) {
- strBytes +=
String.fromCharCode(data[i]);
- }
- var img = 'data:image/png;base64,' +
window.btoa(strBytes);
+ // read the tile data
+ var strBytes = '';
+ for (var i = 0; i < data.length; i++) {
+ strBytes += String.fromCharCode(data[i]);
}
+ var img = 'data:image/png;base64,' +
window.btoa(strBytes);
}
if (textMsg.startsWith('status:')) {
diff --git a/loleaflet/src/layer/tile/TileLayer.js
b/loleaflet/src/layer/tile/TileLayer.js
index 5f0ba440..7ee9c90c 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -13,18 +13,6 @@ if (typeof String.prototype.startsWith !== 'function') {
};
}
-function hex2string(inData)
-{
- hexified = [];
- data = new Uint8Array(inData);
- for (var i = 0; i < data.length; i++) {
- hex = data[i].toString(16);
- paddedHex = ('00' + hex).slice(-2);
- hexified.push(paddedHex);
- }
- return hexified.join('');
-}
-
L.Compatibility = {
clipboardGet: function (event) {
var text = null;
@@ -1293,90 +1281,6 @@ L.TileLayer = L.GridLayer.extend({
docType: this._docType
});
}
- else if (tile && typeof(img) == 'object') {
- // 'Uint8Array' delta
- var canvas = document.createElement('canvas');
- canvas.width = 256;
- canvas.height = 256;
- var ctx = canvas.getContext('2d');
-
- oldImg = new Image();
- oldImg.src = tile.el.src;
- ctx.drawImage(oldImg, 0, 0);
-
- // FIXME; can we operate directly on the image ?
- var imgData = ctx.getImageData(0, 0, canvas.width,
canvas.height);
- var oldData = new Uint8ClampedArray(imgData.data);
-
- var delta = img;
- var pixSize = canvas.width * canvas.height * 4;
- var offset = 0;
-
- console.log('Applying a delta of length ' +
delta.length + ' pix size: ' + pixSize + '\nhex: ' + hex2string(delta));
-
- // Green-tinge the old-Data ...
-// for (var i = 0; i < pixSize; ++i)
-// {
-// oldData[i*4 + 1] = 128;
-// }
-
- // wipe to grey.
-// for (var i = 0; i < pixSize * 4; ++i)
-// {
-// imgData.data[i] = 128;
-// }
-
- // Apply delta.
- for (var i = 1; i < delta.length;)
- {
- switch (delta[i])
- {
- case 99: // 'c': // copy row
- var count = delta[i+1];
- var srcRow = delta[i+2];
- var destRow = delta[i+3];
- i+= 4;
- console.log('copy ' + count + ' row(s)
' + srcRow + ' to ' + destRow);
- for (var cnt = 0; cnt < count; ++cnt)
- {
- var src = (srcRow + cnt) *
canvas.width * 4;
- var dest = (destRow + cnt) *
canvas.width * 4;
- for (var j = 0; j <
canvas.width * 4; ++j)
- {
- imgData.data[dest + j]
= oldData[src + j];
- }
- }
- break;
- case 100: // 'd': // new run
- var destRow = delta[i+1];
- var destCol = delta[i+2];
- var span = delta[i+3];
- var offset = destRow * canvas.width * 4
+ destCol * 4;
- i += 4;
- console.log('apply new span of size ' +
span + ' at pos ' + destCol + ', ' + destRow + ' into delta at byte: ' +
offset);
- span *= 4;
- imgData.data[offset + 1] = 256; //
debug - greener start
- while (span-- > 0) {
- imgData.data[offset++] =
delta[i++];
- }
- imgData.data[offset - 2] = 256; //
debug - blue terminator
- break;
- default:
- console.log('ERROR: Unknown code ' +
delta[i] +
- ' at offset ' + i);
- i = delta.length;
- break;
- }
- }
-
- ctx.putImageData(imgData, 0, 0);
-
- tile.oldWireId = tile.wireId;
- tile.wireId = command.wireId;
- tile.el.src = canvas.toDataURL('image/png');
-
- console.log('set new image');
- }
else if (tile) {
if (command.wireId != undefined) {
tile.oldWireId = command.wireId;
diff --git a/test/DeltaTests.cpp b/test/DeltaTests.cpp
deleted file mode 100644
index 66868523..00000000
--- a/test/DeltaTests.cpp
+++ /dev/null
@@ -1,209 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4;
fill-column: 100 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- */
-
-#include "config.h"
-
-#include <cppunit/extensions/HelperMacros.h>
-
-#include "Delta.hpp"
-#include "Util.hpp"
-#include "Png.hpp"
-#include "helpers.hpp"
-
-/// Delta unit-tests.
-class DeltaTests : public CPPUNIT_NS::TestFixture
-{
- CPPUNIT_TEST_SUITE(DeltaTests);
-
- CPPUNIT_TEST(testDeltaSequence);
- CPPUNIT_TEST(testRandomDeltas);
-
- CPPUNIT_TEST_SUITE_END();
-
- void testDeltaSequence();
- void testRandomDeltas();
-
- std::vector<char> loadPng(const char *relpath,
- png_uint_32& height,
- png_uint_32& width,
- png_uint_32& rowBytes)
- {
- std::ifstream file(relpath);
- std::stringstream buffer;
- buffer << file.rdbuf();
- file.close();
- std::vector<png_bytep> rows =
- Png::decodePNG(buffer, height, width, rowBytes);
- std::vector<char> output;
- for (png_uint_32 y = 0; y < height; ++y)
- {
- for (png_uint_32 i = 0; i < width * 4; ++i)
- {
- output.push_back(rows[y][i]);
- }
- }
- return output;
- }
-
- std::vector<char> applyDelta(
- const std::vector<char> &pixmap,
- png_uint_32 width, png_uint_32 height,
- const std::vector<char> &delta);
-
- void assertEqual(const std::vector<char> &a,
- const std::vector<char> &b,
- int width, int height);
-};
-
-// Quick hack for debugging
-std::vector<char> DeltaTests::applyDelta(
- const std::vector<char> &pixmap,
- png_uint_32 width, png_uint_32 height,
- const std::vector<char> &delta)
-{
- CPPUNIT_ASSERT(delta.size() >= 4);
- CPPUNIT_ASSERT(delta[0] == 'D');
-
- std::cout << "apply delta of size " << delta.size() << "\n";
-
- // start with the same state.
- std::vector<char> output = pixmap;
- CPPUNIT_ASSERT_EQUAL(output.size(), size_t(pixmap.size()));
- CPPUNIT_ASSERT_EQUAL(output.size(), size_t(width * height * 4));
-
- size_t offset = 0, i;
- for (i = 1; i < delta.size() && offset < output.size();)
- {
- switch (delta[i])
- {
- case 'c': // copy row.
- {
- int count = (uint8_t)(delta[i+1]);
- int srcRow = (uint8_t)(delta[i+2]);
- int destRow = (uint8_t)(delta[i+3]);
-
-// std::cout << "copy " << count <<" row(s) " << srcRow << " to "
<< destRow << "\n";
- for (int cnt = 0; cnt < count; ++cnt)
- {
- const char *src = &pixmap[width * (srcRow + cnt) * 4];
- char *dest = &output[width * (destRow + cnt) * 4];
- for (size_t j = 0; j < width * 4; ++j)
- *dest++ = *src++;
- }
- i += 4;
- break;
- }
- case 'd': // new run
- {
- int destRow = (uint8_t)(delta[i+1]);
- int destCol = (uint8_t)(delta[i+2]);
- size_t length = (uint8_t)(delta[i+3]);
- i += 4;
-
-// std::cout << "new " << length << " at " << destCol << ", " <<
destRow << "\n";
- CPPUNIT_ASSERT(length <= width - destCol);
-
- char *dest = &output[width * destRow * 4 + destCol * 4];
- for (size_t j = 0; j < length * 4 && i < delta.size(); ++j)
- *dest++ = delta[i++];
- break;
- }
- default:
- std::cout << "Unknown delta code " << delta[i] << "\n";
- CPPUNIT_ASSERT(false);
- break;
- }
- }
- CPPUNIT_ASSERT_EQUAL(delta.size(), i);
- return output;
-}
-
-void DeltaTests::assertEqual(const std::vector<char> &a,
- const std::vector<char> &b,
- int width, int /* height */)
-{
- CPPUNIT_ASSERT_EQUAL(a.size(), b.size());
- for (size_t i = 0; i < a.size(); ++i)
- {
- if (a[i] != b[i])
- {
- std::cout << "Differences starting at byte " << i << " "
- << (i/4 % width) << ", " << (i / (width * 4)) << ":\n";
- size_t len;
- for (len = 0; (a[i+len] != b[i+len] || len < 8) && i + len <
a.size(); ++len)
- {
- std::cout << std::hex << (int)((unsigned char)a[i+len]) << "
!= ";
- std::cout << std::hex << (int)((unsigned char)b[i+len]) << "
";
- if (len > 0 && (len % 16 == 0))
- std::cout<< "\n";
- }
- std::cout << " size " << len << "\n";
- CPPUNIT_ASSERT(false);
- }
- }
-}
-
-void DeltaTests::testDeltaSequence()
-{
- DeltaGenerator gen;
-
- png_uint_32 height, width, rowBytes;
- const TileWireId textWid = 1;
- std::vector<char> text =
- DeltaTests::loadPng("data/delta-text.png",
- height, width, rowBytes);
- CPPUNIT_ASSERT(height == 256 && width == 256 && rowBytes == 256*4);
- CPPUNIT_ASSERT_EQUAL(size_t(256 * 256 * 4), text.size());
-
- const TileWireId text2Wid = 2;
- std::vector<char> text2 =
- DeltaTests::loadPng("data/delta-text2.png",
- height, width, rowBytes);
- CPPUNIT_ASSERT(height == 256 && width == 256 && rowBytes == 256*4);
- CPPUNIT_ASSERT_EQUAL(size_t(256 * 256 * 4), text2.size());
-
- std::vector<char> delta;
- // Stash it in the cache
- CPPUNIT_ASSERT(gen.createDelta(
- reinterpret_cast<unsigned char *>(&text[0]),
- 0, 0, width, height, width, height,
- delta, textWid, 0) == false);
- CPPUNIT_ASSERT(delta.size() == 0);
-
- // Build a delta between text2 & textWid
- CPPUNIT_ASSERT(gen.createDelta(
- reinterpret_cast<unsigned char *>(&text2[0]),
- 0, 0, width, height, width, height,
- delta, text2Wid, textWid) == true);
- CPPUNIT_ASSERT(delta.size() > 0);
-
- // Apply it to move to the second frame
- std::vector<char> reText2 = applyDelta(text, width, height, delta);
- assertEqual(reText2, text2, width, height);
-
- // Build a delta between text & text2Wid
- std::vector<char> two2one;
- CPPUNIT_ASSERT(gen.createDelta(
- reinterpret_cast<unsigned char *>(&text[0]),
- 0, 0, width, height, width, height,
- two2one, textWid, text2Wid) == true);
- CPPUNIT_ASSERT(two2one.size() > 0);
-
- // Apply it to get back to where we started
- std::vector<char> reText = applyDelta(text2, width, height, two2one);
- assertEqual(reText, text, width, height);
-}
-
-void DeltaTests::testRandomDeltas()
-{
-}
-
-CPPUNIT_TEST_SUITE_REGISTRATION(DeltaTests);
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/test/Makefile.am b/test/Makefile.am
index 98426f72..aa54e0cb 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -47,7 +47,6 @@ wsd_sources = \
test_base_source = \
TileQueueTests.cpp \
WhiteBoxTests.cpp \
- DeltaTests.cpp \
$(wsd_sources)
test_all_source = \
diff --git a/test/data/delta-text.png b/test/data/delta-text.png
deleted file mode 100644
index 3d48d9bf..00000000
Binary files a/test/data/delta-text.png and /dev/null differ
diff --git a/test/data/delta-text2.png b/test/data/delta-text2.png
deleted file mode 100644
index d05b897c..00000000
Binary files a/test/data/delta-text2.png and /dev/null differ
diff --git a/wsd/TileDesc.hpp b/wsd/TileDesc.hpp
index 7e738f64..a4c61636 100644
--- a/wsd/TileDesc.hpp
+++ b/wsd/TileDesc.hpp
@@ -20,7 +20,6 @@
#include "Exceptions.hpp"
#include "Protocol.hpp"
-#define TILE_WIRE_ID
typedef uint32_t TileWireId;
typedef uint64_t TileBinaryHash;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
