StreamTranscoder: added a FilterGraph attribute

Clement Champetier · Clement Champetier · commit b2b5d0a37260 · 2016-01-21T17:21:03.000+01:00
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -30,6 +30,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
     , _currentDecoder(NULL)
     , _outputEncoder(NULL)
     , _transform(NULL)
+    , _filterGraph(NULL)
     , _subStreamIndex(-1)
     , _offset(offset)
     , _needToSwitchToGenerator(false)
@@ -44,6 +45,9 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
 
             try
             {
+                // filter
+                _filterGraph = new FilterGraph(_inputStream->getVideoCodec());
+
                 VideoFrameDesc inputFrameDesc(_inputStream->getVideoCodec().getVideoFrameDesc());
 
                 // generator decoder
@@ -78,6 +82,9 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
 
             try
             {
+                // filter
+                _filterGraph = new FilterGraph(_inputStream->getAudioCodec());
+
                 AudioFrameDesc inputFrameDesc(_inputStream->getAudioCodec().getAudioFrameDesc());
 
                 // generator decoder
@@ -128,6 +135,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
     , _currentDecoder(NULL)
     , _outputEncoder(NULL)
     , _transform(NULL)
+    , _filterGraph(NULL)
     , _subStreamIndex(subStreamIndex)
     , _offset(offset)
     , _needToSwitchToGenerator(false)
@@ -137,6 +145,9 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
     {
         case AVMEDIA_TYPE_VIDEO:
         {
+            // filter
+            _filterGraph = new FilterGraph(_inputStream->getVideoCodec());
+
             // input decoder
             VideoDecoder* inputVideo = new VideoDecoder(*static_cast<InputStream*>(_inputStream));
             inputVideo->setupDecoder();
@@ -170,6 +181,9 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
         }
         case AVMEDIA_TYPE_AUDIO:
         {
+            // filter
+            _filterGraph = new FilterGraph(_inputStream->getAudioCodec());
+
             // input decoder
             AudioDecoder* inputAudio = new AudioDecoder(*static_cast<InputStream*>(_inputStream));
             inputAudio->setupDecoder();
@@ -228,6 +242,7 @@ StreamTranscoder::StreamTranscoder(const ICodec& inputCodec, IOutputFile& output
     , _currentDecoder(NULL)
     , _outputEncoder(NULL)
     , _transform(NULL)
+    , _filterGraph(NULL)
     , _subStreamIndex(-1)
     , _offset(0)
     , _needToSwitchToGenerator(false)
@@ -241,6 +256,9 @@ StreamTranscoder::StreamTranscoder(const ICodec& inputCodec, IOutputFile& output
         _generator = generatorVideo;
         _currentDecoder = _generator;
 
+        // filter
+        _filterGraph = new FilterGraph(inputVideoCodec);
+
         // buffers to process
         VideoFrameDesc inputFrameDesc = inputVideoCodec.getVideoFrameDesc();
         VideoFrameDesc outputFrameDesc = inputFrameDesc;
@@ -267,6 +285,9 @@ StreamTranscoder::StreamTranscoder(const ICodec& inputCodec, IOutputFile& output
         _generator = generatorAudio;
         _currentDecoder = _generator;
 
+        // filter
+        _filterGraph = new FilterGraph(inputAudioCodec);
+
         // buffers to process
         AudioFrameDesc inputFrameDesc = inputAudioCodec.getAudioFrameDesc();
         AudioFrameDesc outputFrameDesc = inputFrameDesc;
@@ -298,6 +319,7 @@ StreamTranscoder::~StreamTranscoder()
     delete _generator;
     delete _outputEncoder;
     delete _transform;
+    delete _filterGraph;
     delete _inputDecoder;
 }
 
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -10,7 +10,7 @@
 #include <AvTranscoder/encoder/IEncoder.hpp>
 
 #include <AvTranscoder/file/IOutputFile.hpp>
-
+#include <AvTranscoder/filter/FilterGraph.hpp>
 #include <AvTranscoder/profile/ProfileLoader.hpp>
 
 namespace avtranscoder
@@ -131,6 +131,8 @@ class AvExport StreamTranscoder
 
     ITransform* _transform; ///< Video or audio transform (has ownership)
 
+    FilterGraph* _filterGraph; ///< Filter graph (has ownership)
+
     int _subStreamIndex; ///< Index of channel that is processed from the input stream (<0 if no demultiplexing).
 
     float _offset; ///< Offset, in seconds, at the beginning of the StreamTranscoder.
