FilterGraph: updated process method to specify input/output

Clement Champetier · Clement Champetier · commit 18dcdc47b898 · 2016-07-19T16:00:24.000+02:00
The buffer could be different.
diff --git a/src/AvTranscoder/filter/FilterGraph.cpp b/src/AvTranscoder/filter/FilterGraph.cpp
@@ -35,7 +35,7 @@ FilterGraph::~FilterGraph()
     avfilter_graph_free(&_graph);
 }
 
-void FilterGraph::process(Frame& frame)
+void FilterGraph::process(const Frame& inputFrame, Frame& outputFrame)
 {
     if(!hasFilters())
     {
@@ -45,10 +45,10 @@ void FilterGraph::process(Frame& frame)
 
     // init filter graph
     if(!_isInit)
-        init(frame);
+        init(inputFrame, outputFrame);
 
     // setup source frame
-    int ret = av_buffersrc_write_frame(_filters.at(0)->getAVFilterContext(), &frame.getAVFrame());
+    int ret = av_buffersrc_write_frame(_filters.at(0)->getAVFilterContext(), &inputFrame.getAVFrame());
     if(ret < 0)
     {
         throw std::runtime_error("Error when adding a frame to the source buffer used to start to process filters: " +
@@ -58,7 +58,7 @@ void FilterGraph::process(Frame& frame)
     // pull filtered data from the filter graph
     for(;;)
     {
-        ret = av_buffersink_get_frame(_filters.at(_filters.size() - 1)->getAVFilterContext(), &frame.getAVFrame());
+        ret = av_buffersink_get_frame(_filters.at(_filters.size() - 1)->getAVFilterContext(), &outputFrame.getAVFrame());
         if(ret == AVERROR_EOF || ret == AVERROR(EAGAIN))
             break;
         if(ret < 0)
@@ -77,15 +77,15 @@ Filter& FilterGraph::addFilter(const std::string& filterName, const std::string&
     return *_filters.back();
 }
 
-void FilterGraph::init(const Frame& frame)
+void FilterGraph::init(const Frame& inputFrame, Frame& outputFrame)
 {
     // push filters to the graph
-    pushInBuffer(frame);
+    pushInBuffer(inputFrame);
     for(size_t i = 1; i < _filters.size(); ++i)
     {
         pushFilter(*_filters.at(i));
     }
-    pushOutBuffer(frame);
+    pushOutBuffer(outputFrame);
 
     // connect filters
     for(size_t index = 0; index < _filters.size() - 1; ++index)
diff --git a/src/AvTranscoder/filter/FilterGraph.hpp b/src/AvTranscoder/filter/FilterGraph.hpp
@@ -44,10 +44,11 @@ class AvExport FilterGraph
 
     /**
      * @brief Pull filtered data from the filter graph, and put result to the given frame.
-     * @param frame: both input and output data of the method.
+     * @param inputFrame: input data.
+     * @param inputFrame: output data.
      * @note Do nothing if there was no filter added.
      */
-    void process(Frame& frame);
+    void process(const Frame& inputFrame, Frame& outputFrame);
 
 private:
     /**
@@ -61,7 +62,7 @@ class AvExport FilterGraph
      * @see pushInBuffer
      * @see pushOutBuffer
      */
-    void init(const Frame& frame);
+    void init(const Frame& inputFrame, Frame& outputFrame);
 
     /**
      * @brief Push the given Filter to the graph.
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -491,7 +491,7 @@ bool StreamTranscoder::processTranscode()
     if(decodingStatus)
     {
         LOG_DEBUG("Filtering")
-        _filterGraph->process(*_sourceBuffers.at(0));
+        _filterGraph->process(*_sourceBuffers.at(0), *_sourceBuffers.at(0));
 
         LOG_DEBUG("Convert")
         _transform->convert(*_sourceBuffers.at(0), *_frameBuffers.at(0));

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ FilterGraph::~FilterGraph()`
`35`	`35`	`avfilter_graph_free(&_graph);`
`36`	`36`	`}`
`37`	`37`
`38`		`-void FilterGraph::process(Frame& frame)`
	`38`	`+void FilterGraph::process(const Frame& inputFrame, Frame& outputFrame)`
`39`	`39`	`{`
`40`	`40`	`if(!hasFilters())`
`41`	`41`	`{`
`@@ -45,10 +45,10 @@ void FilterGraph::process(Frame& frame)`
`45`	`45`
`46`	`46`	`// init filter graph`
`47`	`47`	`if(!_isInit)`
`48`		`- init(frame);`
	`48`	`+ init(inputFrame, outputFrame);`
`49`	`49`
`50`	`50`	`// setup source frame`
`51`		`- int ret = av_buffersrc_write_frame(_filters.at(0)->getAVFilterContext(), &frame.getAVFrame());`
	`51`	`+ int ret = av_buffersrc_write_frame(_filters.at(0)->getAVFilterContext(), &inputFrame.getAVFrame());`
`52`	`52`	`if(ret < 0)`
`53`	`53`	`{`
`54`	`54`	`throw std::runtime_error("Error when adding a frame to the source buffer used to start to process filters: " +`
`@@ -58,7 +58,7 @@ void FilterGraph::process(Frame& frame)`
`58`	`58`	`// pull filtered data from the filter graph`
`59`	`59`	`for(;;)`
`60`	`60`	`{`
`61`		`- ret = av_buffersink_get_frame(_filters.at(_filters.size() - 1)->getAVFilterContext(), &frame.getAVFrame());`
	`61`	`+ ret = av_buffersink_get_frame(_filters.at(_filters.size() - 1)->getAVFilterContext(), &outputFrame.getAVFrame());`
`62`	`62`	`if(ret == AVERROR_EOF \|\| ret == AVERROR(EAGAIN))`
`63`	`63`	`break;`
`64`	`64`	`if(ret < 0)`
`@@ -77,15 +77,15 @@ Filter& FilterGraph::addFilter(const std::string& filterName, const std::string&`
`77`	`77`	`return *_filters.back();`
`78`	`78`	`}`
`79`	`79`
`80`		`-void FilterGraph::init(const Frame& frame)`
	`80`	`+void FilterGraph::init(const Frame& inputFrame, Frame& outputFrame)`
`81`	`81`	`{`
`82`	`82`	`// push filters to the graph`
`83`		`- pushInBuffer(frame);`
	`83`	`+ pushInBuffer(inputFrame);`
`84`	`84`	`for(size_t i = 1; i < _filters.size(); ++i)`
`85`	`85`	`{`
`86`	`86`	`pushFilter(*_filters.at(i));`
`87`	`87`	`}`
`88`		`- pushOutBuffer(frame);`
	`88`	`+ pushOutBuffer(outputFrame);`
`89`	`89`
`90`	`90`	`// connect filters`
`91`	`91`	`for(size_t index = 0; index < _filters.size() - 1; ++index)`
Original file line number	Diff line number	Diff line change
`@@ -491,7 +491,7 @@ bool StreamTranscoder::processTranscode()`
`491`	`491`	`if(decodingStatus)`
`492`	`492`	`{`
`493`	`493`	`LOG_DEBUG("Filtering")`
`494`		`- _filterGraph->process(*_sourceBuffers.at(0));`
	`494`	`+ _filterGraph->process(_sourceBuffers.at(0), _sourceBuffers.at(0));`
`495`	`495`
`496`	`496`	`LOG_DEBUG("Convert")`
`497`	`497`	`_transform->convert(_sourceBuffers.at(0), _frameBuffers.at(0));`