Merge pull request #323 from avTranscoder/fix/filters_memory_leak

valnoel · web-flow · commit af4c6091534a · 2021-02-01T15:45:26.000+01:00
Fix filter memory leak
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 3
+#define AVTRANSCODER_VERSION_MICRO 4
 
 #include <AvTranscoder/system.hpp>
 
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -751,6 +751,12 @@ 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;
@@ -805,12 +811,6 @@ IOutputStream::EWrappingStatus StreamTranscoder::processTranscode()
         LOG_DEBUG("Encode")
         _outputEncoder->encodeFrame(*_transformedData, data);
 
-        if(_filterGraph->hasFilters())
-        {
-            LOG_DEBUG("Free filtered data") // filled from filter graph sink
-            av_frame_unref(&_filteredData->getAVFrame());
-            _filteredData->freeData();
-        }
     }
     else
     {

Original file line number	Diff line number	Diff line change
`@@ -751,6 +751,12 @@ IOutputStream::EWrappingStatus StreamTranscoder::processTranscode()`
`751`	`751`	`_transformedData->allocateData();`
`752`	`752`	`}`
`753`	`753`	`}`
	`754`	`+ else if(_filterGraph->hasFilters())`
	`755`	`+ {`
	`756`	`+ LOG_DEBUG("Free filtered data") // filled from filter graph sink`
	`757`	`+ av_frame_unref(&_filteredData->getAVFrame());`
	`758`	`+ _filteredData->freeData();`
	`759`	`+ }`
`754`	`760`
`755`	`761`	`// Check decoding status`
`756`	`762`	`bool continueProcess = true;`
`@@ -805,12 +811,6 @@ IOutputStream::EWrappingStatus StreamTranscoder::processTranscode()`
`805`	`811`	`LOG_DEBUG("Encode")`
`806`	`812`	`_outputEncoder->encodeFrame(*_transformedData, data);`
`807`	`813`
`808`		`- if(_filterGraph->hasFilters())`
`809`		`- {`
`810`		`- LOG_DEBUG("Free filtered data") // filled from filter graph sink`
`811`		`- av_frame_unref(&_filteredData->getAVFrame());`
`812`		`- _filteredData->freeData();`
`813`		`- }`
`814`	`814`	`}`
`815`	`815`	`else`
`816`	`816`	`{`