Disable sample imbalance-carry patch

Seems to be causing a problem with peak gains between samples causing pops, and it’s no longer necessary for SSB
cjcliffe · Feb 23, 2015 · 40938a3 · 40938a3
1 parent a7a4ba9
commit 40938a3
Showing 1 changed file with 25 additions and 23 deletions.
diff --git a/src/demod/DemodulatorPreThread.cpp b/src/demod/DemodulatorPreThread.cpp
@@ -70,8 +70,8 @@ void DemodulatorPreThread::threadMain() {
 
     std::vector<liquid_float_complex> in_buf_data;
     std::vector<liquid_float_complex> out_buf_data;
-    liquid_float_complex carrySample;   // Keep the stream count even to simplify some demod operations
-    bool carrySampleFlag = false;
+//    liquid_float_complex carrySample;   // Keep the stream count even to simplify some demod operations
+//    bool carrySampleFlag = false;
 
     terminated = false;
 
@@ -200,27 +200,29 @@ void DemodulatorPreThread::threadMain() {
 
             resamp->setRefCount(1);
 
-            bool uneven = (numWritten % 2 != 0);
-
-            if (!carrySampleFlag && !uneven) {
-                resamp->data.assign(resampledData.begin(), resampledData.begin() + numWritten);
-                carrySampleFlag = false;
-            } else if (!carrySampleFlag && uneven) {
-                resamp->data.assign(resampledData.begin(), resampledData.begin() + (numWritten-1));
-                carrySample = resampledData.back();
-                carrySampleFlag = true;
-            } else if (carrySampleFlag && uneven) {
-                resamp->data.resize(numWritten+1);
-                resamp->data[0] = carrySample;
-                memcpy(&resamp->data[1],&resampledData[0],sizeof(liquid_float_complex)*numWritten);
-                carrySampleFlag = false;
-            } else if (carrySampleFlag && !uneven) {
-                resamp->data.resize(numWritten);
-                resamp->data[0] = carrySample;
-                memcpy(&resamp->data[1],&resampledData[0],sizeof(liquid_float_complex)*(numWritten-1));
-                carrySample = resampledData.back();
-                carrySampleFlag = true;
-            }
+            resamp->data.assign(resampledData.begin(), resampledData.begin() + numWritten);
+
+//            bool uneven = (numWritten % 2 != 0);
+
+//            if (!carrySampleFlag && !uneven) {
+//                resamp->data.assign(resampledData.begin(), resampledData.begin() + numWritten);
+//                carrySampleFlag = false;
+//            } else if (!carrySampleFlag && uneven) {
+//                resamp->data.assign(resampledData.begin(), resampledData.begin() + (numWritten-1));
+//                carrySample = resampledData.back();
+//                carrySampleFlag = true;
+//            } else if (carrySampleFlag && uneven) {
+//                resamp->data.resize(numWritten+1);
+//                resamp->data[0] = carrySample;
+//                memcpy(&resamp->data[1],&resampledData[0],sizeof(liquid_float_complex)*numWritten);
+//                carrySampleFlag = false;
+//            } else if (carrySampleFlag && !uneven) {
+//                resamp->data.resize(numWritten);
+//                resamp->data[0] = carrySample;
+//                memcpy(&resamp->data[1],&resampledData[0],sizeof(liquid_float_complex)*(numWritten-1));
+//                carrySample = resampledData.back();
+//                carrySampleFlag = true;
+//            }