FilterGraph: refactoring of getMinInputFrameSize() private method

Valentin NOEL · Valentin NOEL · commit 27cf448a274f · 2017-09-06T12:11:23.000+02:00
Add a new getAvailableFrameSize() private method
diff --git a/src/AvTranscoder/filter/FilterGraph.cpp b/src/AvTranscoder/filter/FilterGraph.cpp
@@ -132,17 +132,25 @@ FilterGraph::~FilterGraph()
     avfilter_graph_free(&_graph);
 }
 
+size_t FilterGraph::getAvailableFrameSize(const std::vector<IFrame*>& inputs, const size_t& index)
+{
+    size_t frameSize = inputs.at(index)->getDataSize();
+    if(frameSize == 0)
+        frameSize = _inputFramesBuffer.at(index).getDataSize();
+    return frameSize;
+}
+
 size_t FilterGraph::getMinInputFrameSize(const std::vector<IFrame*>& inputs)
 {
     if(!inputs.size())
         return 0;
 
-    int minFrameSize = inputs.at(0)->getDataSize();
+    size_t minFrameSize = getAvailableFrameSize(inputs, 0);
     for(size_t index = 1; index < inputs.size(); ++index)
     {
-        // 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();
+        const size_t availableFrameSize = getAvailableFrameSize(inputs, index);
+        if(minFrameSize > availableFrameSize)
+            minFrameSize = availableFrameSize;
     }
     return minFrameSize;
 }
diff --git a/src/AvTranscoder/filter/FilterGraph.hpp b/src/AvTranscoder/filter/FilterGraph.hpp
@@ -127,7 +127,15 @@ class AvExport FilterGraph
     void addOutBuffer(const IFrame& output);
     //@}
 
+    /**
+     * @brief Return the input frame size if not null, or the available size into the corresponding frame buffer
+     */
+    size_t getAvailableFrameSize(const std::vector<IFrame*>& inputs, const size_t& index);
+    /**
+     * @brief Get the minimum size between input frames, or available frame buffers
+     */
     size_t getMinInputFrameSize(const std::vector<IFrame*>& inputs);
+
     bool areInputFrameSizeEqual(const std::vector<IFrame*>& inputs);
     bool areFrameBuffersEmpty();
 

Original file line number	Diff line number	Diff line change
`@@ -132,17 +132,25 @@ FilterGraph::~FilterGraph()`
`132`	`132`	`avfilter_graph_free(&_graph);`
`133`	`133`	`}`
`134`	`134`
	`135`	`+size_t FilterGraph::getAvailableFrameSize(const std::vector<IFrame*>& inputs, const size_t& index)`
	`136`	`+{`
	`137`	`+ size_t frameSize = inputs.at(index)->getDataSize();`
	`138`	`+ if(frameSize == 0)`
	`139`	`+ frameSize = _inputFramesBuffer.at(index).getDataSize();`
	`140`	`+ return frameSize;`
	`141`	`+}`
	`142`	`+`
`135`	`143`	`size_t FilterGraph::getMinInputFrameSize(const std::vector<IFrame*>& inputs)`
`136`	`144`	`{`
`137`	`145`	`if(!inputs.size())`
`138`	`146`	`return 0;`
`139`	`147`
`140`		`- int minFrameSize = inputs.at(0)->getDataSize();`
	`148`	`+ size_t minFrameSize = getAvailableFrameSize(inputs, 0);`
`141`	`149`	`for(size_t index = 1; index < inputs.size(); ++index)`
`142`	`150`	`{`
`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())`
`145`		`- minFrameSize = inputs.at(index)->getDataSize();`
	`151`	`+ const size_t availableFrameSize = getAvailableFrameSize(inputs, index);`
	`152`	`+ if(minFrameSize > availableFrameSize)`
	`153`	`+ minFrameSize = availableFrameSize;`
`146`	`154`	`}`
`147`	`155`	`return minFrameSize;`
`148`	`156`	`}`