Merge pull request #324 from avTranscoder/fix/video_filters

valnoel · web-flow · commit 18cc5325a81e · 2022-04-27T15:12:53.000+02:00
Fix video filters
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -3,7 +3,7 @@
 
 #define AVTRANSCODER_VERSION_MAJOR 0
 #define AVTRANSCODER_VERSION_MINOR 15
-#define AVTRANSCODER_VERSION_MICRO 4
+#define AVTRANSCODER_VERSION_MICRO 5
 
 #include <AvTranscoder/system.hpp>
 
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -751,12 +751,6 @@ IOutputStream::EWrappingStatus StreamTranscoder::processTranscode()
             _transformedData->allocateData();
         }
     }
-    else if(_filterGraph->hasFilters())
-    {
-        LOG_DEBUG("Free filtered data") // filled from filter graph sink
-        av_frame_unref(&_filteredData->getAVFrame());
-        _filteredData->freeData();
-    }
 
     // Check decoding status
     bool continueProcess = true;
@@ -811,6 +805,15 @@ IOutputStream::EWrappingStatus StreamTranscoder::processTranscode()
         LOG_DEBUG("Encode")
         _outputEncoder->encodeFrame(*_transformedData, data);
 
+        if(_filterGraph->hasFilters())
+        {
+            LOG_DEBUG("Free filtered data") // filled from filter graph sink
+            if (_filteredData->isVideoFrame()) {
+                // Do not unref filter audio frame, to avoid reallocating it each time
+                av_frame_unref(&_filteredData->getAVFrame());
+            }
+            _filteredData->freeData();
+        }
     }
     else
     {
