Merge pull request #330 from avTranscoder/fix/ending_with_video_generator_and_filtering_2

valnoel · web-flow · commit 87e071dab009 · 2022-07-15T15:58:32.000+02:00
FilterGraph: keep reference of the filters input frame
diff --git a/src/AvTranscoder/filter/FilterGraph.cpp b/src/AvTranscoder/filter/FilterGraph.cpp
@@ -275,7 +275,7 @@ void FilterGraph::process(const std::vector<IFrame*>& inputs, IFrame& output)
     {
         // Retrieve frame from buffer or directly from input
         IFrame* inputFrame = (bypassBuffers)? inputs.at(index) : _inputAudioFrameBuffers.at(index).getFrameSampleNb(minInputFrameSamplesNb);
-        const int ret = av_buffersrc_add_frame_flags(_filters.at(index)->getAVFilterContext(), &inputFrame->getAVFrame(), AV_BUFFERSRC_FLAG_PUSH & AV_BUFFERSRC_FLAG_KEEP_REF);
+        const int ret = av_buffersrc_add_frame_flags(_filters.at(index)->getAVFilterContext(), &inputFrame->getAVFrame(), AV_BUFFERSRC_FLAG_KEEP_REF);
 
         if(ret < 0)
         {

Original file line number	Diff line number	Diff line change
`@@ -275,7 +275,7 @@ void FilterGraph::process(const std::vector<IFrame*>& inputs, IFrame& output)`
`275`	`275`	`{`
`276`	`276`	`// Retrieve frame from buffer or directly from input`
`277`	`277`	`IFrame* inputFrame = (bypassBuffers)? inputs.at(index) : _inputAudioFrameBuffers.at(index).getFrameSampleNb(minInputFrameSamplesNb);`
`278`		`- const int ret = av_buffersrc_add_frame_flags(_filters.at(index)->getAVFilterContext(), &inputFrame->getAVFrame(), AV_BUFFERSRC_FLAG_PUSH & AV_BUFFERSRC_FLAG_KEEP_REF);`
	`278`	`+ const int ret = av_buffersrc_add_frame_flags(_filters.at(index)->getAVFilterContext(), &inputFrame->getAVFrame(), AV_BUFFERSRC_FLAG_KEEP_REF);`
`279`	`279`
`280`	`280`	`if(ret < 0)`
`281`	`281`	`{`