FilterGraph: improve input frame size computing

Valentin NOEL · Valentin NOEL · commit 3864d7e5ceed · 2017-09-05T16:58:37.000+02:00
diff --git a/src/AvTranscoder/filter/FilterGraph.cpp b/src/AvTranscoder/filter/FilterGraph.cpp
@@ -140,7 +140,8 @@ size_t FilterGraph::getMinInputFrameSize(const std::vector<IFrame*>& inputs)
     int minFrameSize = inputs.at(0)->getDataSize();
     for(size_t index = 1; index < inputs.size(); ++index)
     {
-        if(minFrameSize > inputs.at(index)->getDataSize())
+        // if the input frame is shorter, and if there is no data enough into the corresponding frame buffer
+        if(minFrameSize > inputs.at(index)->getDataSize() && minFrameSize > _inputFramesBuffer.at(index).getDataSize())
             minFrameSize = inputs.at(index)->getDataSize();
     }
     return minFrameSize;

Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,8 @@ size_t FilterGraph::getMinInputFrameSize(const std::vector<IFrame*>& inputs)`
`140`	`140`	`int minFrameSize = inputs.at(0)->getDataSize();`
`141`	`141`	`for(size_t index = 1; index < inputs.size(); ++index)`
`142`	`142`	`{`
`143`		`- if(minFrameSize > inputs.at(index)->getDataSize())`
	`143`	`+ // if the input frame is shorter, and if there is no data enough into the corresponding frame buffer`
	`144`	`+ if(minFrameSize > inputs.at(index)->getDataSize() && minFrameSize > _inputFramesBuffer.at(index).getDataSize())`
`144`	`145`	`minFrameSize = inputs.at(index)->getDataSize();`
`145`	`146`	`}`
`146`	`147`	`return minFrameSize;`