Do not add duplicate sounds for merging.

MaurycyLiebner · Sep 25, 2022 · d919d4d · d919d4d
1 parent beb3d3b
commit d919d4d
Show file tree

Hide file tree

Showing 8 changed files with 85 additions and 48 deletions.
diff --git a/src/core/CacheHandlers/soundcachehandler.h b/src/core/CacheHandlers/soundcachehandler.h
@@ -20,7 +20,7 @@
 #include "CacheHandlers/hddcachablecachehandler.h"
 #include "CacheHandlers/soundcachecontainer.h"
 #include "FileCacheHandlers/audiostreamsdata.h"
-#include "FileCacheHandlers/soundreader.h"
+#include "FileCacheHandlers/soundreaderformerger.h"
 
 class CORE_EXPORT SoundDataHandler : public FileDataCacheHandler {
     typedef stdsptr<SoundCacheContainer> stdptrSCC;

diff --git a/src/core/FileCacheHandlers/soundreader.cpp b/src/core/FileCacheHandlers/soundreader.cpp
@@ -205,16 +205,3 @@ void SoundReader::readFrame() {
                                           dstSampleRate,
                                           dstSampleFormat, dstChLayout);
 }
-
-#include "Sound/soundmerger.h"
-void SoundReaderForMerger::afterProcessing() {
-    for(const auto& merger : mMergers) {
-        if(!merger) continue;
-        for(const auto& ss : mSSAbsRanges) {
-            merger->addSoundToMerge({ss.fSampleShift, ss.fSamplesRange,
-                                     ss.fVolume, ss.fSpeed,
-                                     enve::make_shared<Samples>(getSamples())});
-        }
-    }
-    SoundReader::afterProcessing();
-}
diff --git a/src/core/FileCacheHandlers/soundreader.h b/src/core/FileCacheHandlers/soundreader.h
@@ -62,35 +62,4 @@ class CORE_EXPORT SoundReader : public eHddTask {
     stdsptr<Samples> mSamples;
 };
 
-#include "Sound/soundmerger.h"
-class CORE_EXPORT SoundReaderForMerger : public SoundReader {
-    e_OBJECT
-    struct SingleSound {
-        int fSampleShift;
-        SampleRange fSamplesRange;
-        QrealSnapshot fVolume;
-        qreal fSpeed;
-    };
-protected:
-    SoundReaderForMerger(SoundHandler * const cacheHandler,
-                         const stdsptr<AudioStreamsData>& openedAudio,
-                         const int secondId, const SampleRange& sampleRange) :
-        SoundReader(cacheHandler, openedAudio, secondId, sampleRange) {}
-
-    void afterProcessing();
-public:
-    void addSingleSound(const int sampleShift,
-                        const SampleRange& absRange,
-                        const QrealSnapshot& volume,
-                        const qreal speed) {
-        mSSAbsRanges.append({sampleShift, absRange, volume, speed});
-    }
-
-    void addMerger(SoundMerger * const merger) {
-        mMergers << merger;
-    }
-private:
-    QList<SingleSound> mSSAbsRanges;
-    QList<stdptr<SoundMerger>> mMergers;
-};
 #endif // SOUNDREADER_H
diff --git a/src/core/FileCacheHandlers/soundreaderformerger.cpp b/src/core/FileCacheHandlers/soundreaderformerger.cpp
@@ -0,0 +1,36 @@
+#include "soundreaderformerger.h"
+
+#include "Sound/soundmerger.h"
+
+SoundReaderForMerger::SoundReaderForMerger(
+        SoundHandler* const cacheHandler,
+        const stdsptr<AudioStreamsData>& openedAudio,
+        const int secondId, const SampleRange& sampleRange) :
+    SoundReader(cacheHandler, openedAudio, secondId, sampleRange) {}
+
+void SoundReaderForMerger::afterProcessing() {
+    for(const auto& merger : mMergers) {
+        if(!merger) continue;
+        for(const auto& ss : mSSAbsRanges) {
+            merger->addSoundToMerge({ss.fSampleShift, ss.fSamplesRange,
+                                     ss.fVolume, ss.fSpeed,
+                                     enve::make_shared<Samples>(getSamples())});
+        }
+    }
+    SoundReader::afterProcessing();
+}
+
+void SoundReaderForMerger::addSingleSound(void* const soundPtr,
+                                          const int sampleShift,
+                                          const SampleRange& absRange,
+                                          const QrealSnapshot& volume,
+                                          const qreal speed) {
+    const bool c = mSoundPtrs.contains(soundPtr);
+    if(c) return;
+    mSoundPtrs.append(soundPtr);
+    mSSAbsRanges.append({sampleShift, absRange, volume, speed});
+}
+
+void SoundReaderForMerger::addMerger(SoundMerger* const merger) {
+    mMergers << merger;
+}
diff --git a/src/core/FileCacheHandlers/soundreaderformerger.h b/src/core/FileCacheHandlers/soundreaderformerger.h
@@ -0,0 +1,38 @@
+#ifndef SOUNDREADERFORMERGER_H
+#define SOUNDREADERFORMERGER_H
+
+#include "soundreader.h"
+
+#include "Animators/qrealsnapshot.h"
+
+class SoundMerger;
+
+class CORE_EXPORT SoundReaderForMerger : public SoundReader {
+    e_OBJECT
+    struct SingleSound {
+        int fSampleShift;
+        SampleRange fSamplesRange;
+        QrealSnapshot fVolume;
+        qreal fSpeed;
+    };
+protected:
+    SoundReaderForMerger(SoundHandler * const cacheHandler,
+                         const stdsptr<AudioStreamsData>& openedAudio,
+                         const int secondId, const SampleRange& sampleRange);
+
+    void afterProcessing();
+public:
+    void addSingleSound(void* const soundPtr,
+                        const int sampleShift,
+                        const SampleRange& absRange,
+                        const QrealSnapshot& volume,
+                        const qreal speed);
+
+    void addMerger(SoundMerger * const merger);
+private:
+    QList<void*> mSoundPtrs;
+    QList<SingleSound> mSSAbsRanges;
+    QList<stdptr<SoundMerger>> mMergers;
+};
+
+#endif // SOUNDREADERFORMERGER_H
diff --git a/src/core/FileCacheHandlers/videocachehandler.h b/src/core/FileCacheHandlers/videocachehandler.h
@@ -16,10 +16,14 @@
 
 #ifndef VIDEOCACHEHANDLER_H
 #define VIDEOCACHEHANDLER_H
+
 #include "animationcachehandler.h"
 #include "videostreamsdata.h"
-#include <set>
 #include "filecachehandler.h"
+#include "CacheHandlers/hddcachablecachehandler.h"
+
+#include <set>
+
 class VideoFrameLoader;
 class VideoFrameHandler;
 

diff --git a/src/core/Sound/soundcomposition.cpp b/src/core/Sound/soundcomposition.cpp
@@ -19,7 +19,7 @@
 #include "canvas.h"
 #include "CacheHandlers/soundcachecontainer.h"
 #include "soundmerger.h"
-#include "FileCacheHandlers/soundreader.h"
+#include "FileCacheHandlers/soundreaderformerger.h"
 
 SoundComposition::SoundComposition(Canvas * const parent) :
     QIODevice(parent), mParent(parent) {
@@ -120,7 +120,8 @@ SoundMerger *SoundComposition::scheduleSecond(const int secondId) {
                 if(!reader) continue;
                 reader->addMerger(task.get());
                 reader->addDependent(task.get());
-                reader->addSingleSound(sound->getSampleShift(),
+                reader->addSingleSound(sound.get(),
+                                       sound->getSampleShift(),
                                        sound->absSampleRange(),
                                        sound->getVolumeSnap(),
                                        sound->getStretch());

diff --git a/src/core/core.pro b/src/core/core.pro
@@ -134,6 +134,7 @@ SOURCES += \
     FileCacheHandlers/imagecachehandler.cpp \
     FileCacheHandlers/imagesequencecachehandler.cpp \
     FileCacheHandlers/soundreader.cpp \
+    FileCacheHandlers/soundreaderformerger.cpp \
     FileCacheHandlers/svgfilecachehandler.cpp \
     FileCacheHandlers/videocachehandler.cpp \
     FileCacheHandlers/videoframeloader.cpp \
@@ -460,6 +461,7 @@ HEADERS += \
     FileCacheHandlers/imagecachehandler.h \
     FileCacheHandlers/imagesequencecachehandler.h \
     FileCacheHandlers/soundreader.h \
+    FileCacheHandlers/soundreaderformerger.h \
     FileCacheHandlers/svgfilecachehandler.h \
     FileCacheHandlers/videocachehandler.h \
     FileCacheHandlers/videoframeloader.h \