fix: take skip bug in progress reports and output buffering

Mahlet-Inc · Sep 15, 2020 · 92c8a29 · 92c8a29
1 parent 89ff6e3
commit 92c8a29
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 24 deletions.
diff --git a/src/hobbits-core/bitcontainer.cpp b/src/hobbits-core/bitcontainer.cpp
@@ -15,24 +15,24 @@ BitContainer::BitContainer() :
     setActionLineage(PluginActionLineage::actionlessLineage());
 }
 
-QSharedPointer<BitContainer> BitContainer::create(QByteArray bytes, qint64 bitLen, QSharedPointer<BitInfo> bitInfo)
+QSharedPointer<BitContainer> BitContainer::create(QByteArray bytes, qint64 bitLen, QSharedPointer<const BitInfo> bitInfo)
 {
     QBuffer buffer(&bytes);
     buffer.open(QIODevice::ReadOnly);
     return create(&buffer, bitLen, bitInfo);
 }
 
-QSharedPointer<BitContainer> BitContainer::create(QIODevice *readableBytes, qint64 bitLen, QSharedPointer<BitInfo> bitInfo)
+QSharedPointer<BitContainer> BitContainer::create(QIODevice *readableBytes, qint64 bitLen, QSharedPointer<const BitInfo> bitInfo)
 {
     return create(QSharedPointer<BitArray>(new BitArray(readableBytes, bitLen)), bitInfo);
 }
 
-QSharedPointer<BitContainer> BitContainer::create(QSharedPointer<const BitArray> bits, QSharedPointer<BitInfo> bitInfo)
+QSharedPointer<BitContainer> BitContainer::create(QSharedPointer<const BitArray> bits, QSharedPointer<const BitInfo> bitInfo)
 {
     return create(QSharedPointer<BitArray>(new BitArray(*bits.data())), bitInfo);
 }
 
-QSharedPointer<BitContainer> BitContainer::create(QSharedPointer<BitArray> bits, QSharedPointer<BitInfo> bitInfo)
+QSharedPointer<BitContainer> BitContainer::create(QSharedPointer<BitArray> bits, QSharedPointer<const BitInfo> bitInfo)
 {
     auto container = QSharedPointer<BitContainer>(new BitContainer());
     container->m_bits = bits;

diff --git a/src/hobbits-core/bitcontainer.h b/src/hobbits-core/bitcontainer.h
@@ -22,10 +22,10 @@ class HOBBITSCORESHARED_EXPORT BitContainer : public QObject
     friend class OperatorActor;
 
 public:
-    static QSharedPointer<BitContainer> create(QByteArray bytes, qint64 bitLen = -1, QSharedPointer<BitInfo> info=QSharedPointer<BitInfo>());
-    static QSharedPointer<BitContainer> create(QIODevice *readableBytes, qint64 bitLen = -1, QSharedPointer<BitInfo> info=QSharedPointer<BitInfo>());
-    static QSharedPointer<BitContainer> create(QSharedPointer<const BitArray> bits, QSharedPointer<BitInfo> info=QSharedPointer<BitInfo>());
-    static QSharedPointer<BitContainer> create(QSharedPointer<BitArray> bits, QSharedPointer<BitInfo> info=QSharedPointer<BitInfo>());
+    static QSharedPointer<BitContainer> create(QByteArray bytes, qint64 bitLen = -1, QSharedPointer<const BitInfo> info=QSharedPointer<const BitInfo>());
+    static QSharedPointer<BitContainer> create(QIODevice *readableBytes, qint64 bitLen = -1, QSharedPointer<const BitInfo> info=QSharedPointer<const BitInfo>());
+    static QSharedPointer<BitContainer> create(QSharedPointer<const BitArray> bits, QSharedPointer<const BitInfo> info=QSharedPointer<const BitInfo>());
+    static QSharedPointer<BitContainer> create(QSharedPointer<BitArray> bits, QSharedPointer<const BitInfo> info=QSharedPointer<const BitInfo>());
 
     void setInfo(QSharedPointer<const BitInfo> info);
 

diff --git a/src/hobbits-plugins/operators/QamRemapper/qamremapper.cpp b/src/hobbits-plugins/operators/QamRemapper/qamremapper.cpp
@@ -187,7 +187,7 @@ QSharedPointer<const OperatorResult> QamRemapper::operateOnContainers(
         }
     }
 
-    QSharedPointer<BitContainer> container = BitContainer::create(outputArray);
+    QSharedPointer<BitContainer> container = BitContainer::create(outputArray, inputContainers.at(0)->info());
     container->setName(QString("%1 <- %2").arg("QAM Remap").arg(inputContainers.at(0)->name()));
 
     return OperatorResult::result({container}, pluginState);

diff --git a/src/hobbits-plugins/operators/TakeSkipOperator/skipop.cpp b/src/hobbits-plugins/operators/TakeSkipOperator/skipop.cpp
@@ -25,8 +25,7 @@ void SkipOp::apply(
 
 qint64 SkipOp::inputStep(qint64 inputBits) const
 {
-    Q_UNUSED(inputBits)
-    return m_value;
+    return qMin(inputBits, m_value);
 }
 
 qint64 SkipOp::outputStep(qint64 inputBits) const

diff --git a/src/hobbits-plugins/operators/TakeSkipOperator/takeskipoperator.cpp b/src/hobbits-plugins/operators/TakeSkipOperator/takeskipoperator.cpp
@@ -107,19 +107,20 @@ QSharedPointer<const OperatorResult> TakeSkipOperator::operateOnContainers(
     qint64 inputBitCount = 0;
     qint64 inputStepTotal = 0;
     qint64 outputStepTotal = 0;
-    for (QSharedPointer<BitOp> op : ops) {
-        for (auto input : inputs) {
-            for (int i = 0; i < frameCount; i++) {
-                Frame frame;
-                if (frameBased) {
-                    frame = input.first->frameAt(i);
-                }
-                else {
-                    frame = {Frame(input.first->bits(), 0,
-                             input.first->bits()->sizeInBits() - 1)};
-                }
-                // need to check for integer overflow
-                inputBitCount += frame.size();
+    for (auto input : inputs) {
+        for (int i = 0; i < frameCount; i++) {
+            Frame frame;
+            if (frameBased) {
+                frame = input.first->frameAt(i);
+            }
+            else {
+                frame = {Frame(input.first->bits(), 0,
+                         input.first->bits()->sizeInBits() - 1)};
+            }
+            // need to check for integer overflow
+            inputBitCount += frame.size();
+
+            for (QSharedPointer<BitOp> op : ops) {
                 qint64 frameStep = op->inputStep(frame.size());
                 qint64 inTotal = frameStep + inputStepTotal;
                 if (inTotal < frameStep || inTotal < inputStepTotal) {
@@ -222,6 +223,8 @@ QSharedPointer<const OperatorResult> TakeSkipOperator::operateOnContainers(
             if (progressTracker->getCancelled()) {
                 return OperatorResult::error("Processing cancelled");
             }
+
+            bitsProcessed = 0;
         }
     }