StreamTranscoder: added _filteredData attribute

Clement Champetier · Clement Champetier · commit 9341a4c583a3 · 2016-07-19T17:28:34.000+02:00
To have a buffer of filtered data.
diff --git a/src/AvTranscoder/filter/FilterGraph.cpp b/src/AvTranscoder/filter/FilterGraph.cpp
@@ -39,7 +39,8 @@ void FilterGraph::process(const std::vector<Frame*>& inputs, Frame& output)
 {
     if(!hasFilters())
     {
-        LOG_DEBUG("No filter to process.")
+        LOG_DEBUG("No filter to process: reference first input frame to the given output.")
+        output.refFrame(*inputs.at(0));
         return;
     }
 
diff --git a/src/AvTranscoder/filter/FilterGraph.hpp b/src/AvTranscoder/filter/FilterGraph.hpp
@@ -42,7 +42,7 @@ class AvExport FilterGraph
 
     /**
      * @brief Pull filtered data from the filter graph, and put result to the given frame.
-     * @param inputs: input data buffers.
+     * @param inputs: input data buffers (at least one).
      * @param output: output data buffer.
      * @note Do nothing if there was no filter added.
      *  If there is one input buffer, the filter graph is a chain of effects: input -> filter 1 -> filter 2 -> output.
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -25,6 +25,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
     , _currentInputStream(&inputStream)
     , _outputStream(NULL)
     , _decodedData()
+    , _filteredData()
     , _transformedData()
     , _inputDecoders()
     , _generators()
@@ -57,6 +58,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
 
                 // buffers to process
                 _decodedData.push_back(new VideoFrame(inputFrameDesc));
+                _filteredData.push_back(new VideoFrame(inputFrameDesc));
                 _transformedData.push_back(new VideoFrame(inputFrameDesc));
 
                 // transform
@@ -92,6 +94,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
 
                 // buffers to process
                 _decodedData.push_back(new AudioFrame(inputFrameDesc));
+                _filteredData.push_back(new AudioFrame(inputFrameDesc));
                 _transformedData.push_back(new AudioFrame(inputFrameDesc));
 
                 // transform
@@ -130,6 +133,7 @@ StreamTranscoder::StreamTranscoder(const InputStreamDesc& inputStreamDesc, IInpu
     , _currentInputStream(&inputStream)
     , _outputStream(NULL)
     , _decodedData()
+    , _filteredData()
     , _transformedData()
     , _inputDecoders()
     , _generators()
@@ -170,6 +174,7 @@ StreamTranscoder::StreamTranscoder(const InputStreamDesc& inputStreamDesc, IInpu
 
             // buffers to process
             _decodedData.push_back(new VideoFrame(_currentInputStream->getVideoCodec().getVideoFrameDesc()));
+            _filteredData.push_back(new VideoFrame(_currentInputStream->getVideoCodec().getVideoFrameDesc()));
             _transformedData.push_back(new VideoFrame(outputVideo->getVideoCodec().getVideoFrameDesc()));
 
             // transform
@@ -210,6 +215,7 @@ StreamTranscoder::StreamTranscoder(const InputStreamDesc& inputStreamDesc, IInpu
                 inputFrameDesc._nbChannels = inputStreamDesc._channelIndexArray.size();
 
             _decodedData.push_back(new AudioFrame(inputFrameDesc));
+            _filteredData.push_back(new AudioFrame(inputFrameDesc));
             _transformedData.push_back(new AudioFrame(outputAudio->getAudioCodec().getAudioFrameDesc()));
 
             // transform
@@ -235,6 +241,7 @@ StreamTranscoder::StreamTranscoder(IOutputFile& outputFile, const ProfileLoader:
     , _currentInputStream(NULL)
     , _outputStream(NULL)
     , _decodedData()
+    , _filteredData()
     , _transformedData()
     , _inputDecoders()
     , _generators()
@@ -264,6 +271,7 @@ StreamTranscoder::StreamTranscoder(IOutputFile& outputFile, const ProfileLoader:
         VideoFrameDesc outputFrameDesc = inputFrameDesc;
         outputFrameDesc.setParameters(profile);
         _decodedData.push_back(new VideoFrame(inputFrameDesc));
+        _filteredData.push_back(new VideoFrame(inputFrameDesc));
         _transformedData.push_back(new VideoFrame(outputFrameDesc));
 
         // transform
@@ -296,6 +304,7 @@ StreamTranscoder::StreamTranscoder(IOutputFile& outputFile, const ProfileLoader:
         AudioFrameDesc outputFrameDesc = inputFrameDesc;
         outputFrameDesc.setParameters(profile);
         _decodedData.push_back(new AudioFrame(inputFrameDesc));
+        _filteredData.push_back(new AudioFrame(inputFrameDesc));
         _transformedData.push_back(new AudioFrame(outputFrameDesc));
 
         // transform
@@ -321,6 +330,10 @@ StreamTranscoder::~StreamTranscoder()
     {
         delete(*it);
     }
+    for(std::vector<Frame*>::iterator it = _filteredData.begin(); it != _filteredData.end(); ++it)
+    {
+        delete(*it);
+    }
     for(std::vector<Frame*>::iterator it = _transformedData.begin(); it != _transformedData.end(); ++it)
     {
         delete(*it);
@@ -475,6 +488,7 @@ bool StreamTranscoder::processTranscode()
     assert(_currentDecoder != NULL);
     assert(_outputEncoder != NULL);
     assert(! _decodedData.empty());
+    assert(! _filteredData.empty());
     assert(! _transformedData.empty());
     assert(_transform != NULL);
 
@@ -491,10 +505,10 @@ bool StreamTranscoder::processTranscode()
     if(decodingStatus)
     {
         LOG_DEBUG("Filtering")
-        _filterGraph->process(_decodedData, *_decodedData.at(0));
+        _filterGraph->process(_decodedData, *_filteredData.at(0));
 
         LOG_DEBUG("Convert")
-        _transform->convert(*_decodedData.at(0), *_transformedData.at(0));
+        _transform->convert(*_filteredData.at(0), *_transformedData.at(0));
 
         LOG_DEBUG("Encode")
         _outputEncoder->encodeFrame(*_transformedData.at(0), data);
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -128,6 +128,7 @@ class AvExport StreamTranscoder
     IOutputStream* _outputStream; ///< Output stream to wrap next packet (has link, no ownership)
 
     std::vector<Frame*> _decodedData; ///< Buffer of decoded data (has ownership).
+    std::vector<Frame*> _filteredData;  ///< Buffer of filtered data (has ownership).
     std::vector<Frame*> _transformedData;  ///< Buffer of transformed data (has ownership).
 
     std::vector<IDecoder*> _inputDecoders;   ///< Decoders of packets read from _inputStream (has ownership)

Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,8 @@ void FilterGraph::process(const std::vector<Frame*>& inputs, Frame& output)`
`39`	`39`	`{`
`40`	`40`	`if(!hasFilters())`
`41`	`41`	`{`
`42`		`- LOG_DEBUG("No filter to process.")`
	`42`	`+ LOG_DEBUG("No filter to process: reference first input frame to the given output.")`
	`43`	`+ output.refFrame(*inputs.at(0));`
`43`	`44`	`return;`
`44`	`45`	`}`
`45`	`46`