StreamTranscoder: updated constructor parameters

Clement Champetier · Clement Champetier · commit bd012988001d · 2016-07-19T11:22:47.000+02:00
To get all inputStreamDesc instead of only the array of channel index.
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -1,4 +1,3 @@
-
 #include "StreamTranscoder.hpp"
 
 #include <AvTranscoder/stream/InputStream.hpp>
@@ -31,7 +30,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
     , _outputEncoder(NULL)
     , _transform(NULL)
     , _filterGraph(NULL)
-    , _channelIndexArray()
+    , _inputStreamDesc()
     , _offset(offset)
     , _needToSwitchToGenerator(false)
 {
@@ -121,8 +120,8 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
     setOffset(offset);
 }
 
-StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outputFile, const ProfileLoader::Profile& profile,
-                                   const std::vector<size_t> channelIndexArray, const float offset)
+StreamTranscoder::StreamTranscoder(const InputStreamDesc& inputStreamDesc, IInputStream& inputStream, IOutputFile& outputFile,
+                                   const ProfileLoader::Profile& profile, const float offset)
     : _inputStream(&inputStream)
     , _outputStream(NULL)
     , _sourceBuffer(NULL)
@@ -133,7 +132,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
     , _outputEncoder(NULL)
     , _transform(NULL)
     , _filterGraph(NULL)
-    , _channelIndexArray(channelIndexArray)
+    , _inputStreamDesc(inputStreamDesc)
     , _offset(offset)
     , _needToSwitchToGenerator(false)
 {
@@ -191,17 +190,17 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
 
             AudioFrameDesc outputFrameDesc(_inputStream->getAudioCodec().getAudioFrameDesc());
             outputFrameDesc.setParameters(profile);
-            if(!_channelIndexArray.empty())
-                outputFrameDesc._nbChannels = _channelIndexArray.size();
+            if(_inputStreamDesc.demultiplexing())
+                outputFrameDesc._nbChannels = _inputStreamDesc._channelIndexArray.size();
             outputAudio->setupAudioEncoder(outputFrameDesc, profile);
 
             // output stream
             _outputStream = &outputFile.addAudioStream(outputAudio->getAudioCodec());
 
             // buffers to process
             AudioFrameDesc inputFrameDesc(_inputStream->getAudioCodec().getAudioFrameDesc());
-            if(!_channelIndexArray.empty())
-                inputFrameDesc._nbChannels = _channelIndexArray.size();
+            if(_inputStreamDesc.demultiplexing())
+                inputFrameDesc._nbChannels = _inputStreamDesc._channelIndexArray.size();
 
             _sourceBuffer = new AudioFrame(inputFrameDesc);
             _frameBuffer = new AudioFrame(outputAudio->getAudioCodec().getAudioFrameDesc());
@@ -234,7 +233,7 @@ StreamTranscoder::StreamTranscoder(IOutputFile& outputFile, const ProfileLoader:
     , _outputEncoder(NULL)
     , _transform(NULL)
     , _filterGraph(NULL)
-    , _channelIndexArray()
+    , _inputStreamDesc()
     , _offset(0)
     , _needToSwitchToGenerator(false)
 {
@@ -466,10 +465,10 @@ bool StreamTranscoder::processTranscode()
 
     LOG_DEBUG("Decode next frame")
     bool decodingStatus = false;
-    if(_channelIndexArray.empty())
-        decodingStatus = _currentDecoder->decodeNextFrame(*_sourceBuffer);
+    if(_inputStreamDesc.demultiplexing())
+        decodingStatus = _currentDecoder->decodeNextFrame(*_sourceBuffer, _inputStreamDesc._channelIndexArray);
     else
-        decodingStatus = _currentDecoder->decodeNextFrame(*_sourceBuffer, _channelIndexArray);
+        decodingStatus = _currentDecoder->decodeNextFrame(*_sourceBuffer);
 
     CodedData data;
     if(decodingStatus)
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -3,6 +3,8 @@
 
 #include <AvTranscoder/common.hpp>
 
+#include <AvTranscoder/transcoder/InputStreamDesc.hpp>
+
 #include <AvTranscoder/stream/IInputStream.hpp>
 #include <AvTranscoder/stream/IOutputStream.hpp>
 
@@ -33,8 +35,8 @@ class AvExport StreamTranscoder
     /**
      * @brief Transcode the given stream.
      **/
-    StreamTranscoder(IInputStream& inputStream, IOutputFile& outputFile, const ProfileLoader::Profile& profile,
-                     const std::vector<size_t> channelIndexArray, const float offset = 0);
+    StreamTranscoder(const InputStreamDesc& inputStreamDesc, IInputStream& inputStream, IOutputFile& outputFile, 
+                     const ProfileLoader::Profile& profile, const float offset = 0);
 
     /**
      * @brief Encode a generated stream
@@ -135,8 +137,7 @@ class AvExport StreamTranscoder
 
     FilterGraph* _filterGraph; ///< Filter graph (has ownership)
 
-    std::vector<size_t>
-        _channelIndexArray; ///< List of channels that is processed from the input stream (empty if no demultiplexing).
+    const InputStreamDesc _inputStreamDesc; ///< Description of the data to extract from the input stream.
 
     float _offset; ///< Offset, in seconds, at the beginning of the StreamTranscoder.
 
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -242,7 +242,7 @@ void Transcoder::addTranscodeStream(const InputStreamDesc& inputStreamDesc, cons
         case AVMEDIA_TYPE_AUDIO:
         {
             _streamTranscodersAllocated.push_back(
-                new StreamTranscoder(inputStream, _outputFile, profile, inputStreamDesc._channelIndexArray, offset));
+                new StreamTranscoder(inputStreamDesc, inputStream, _outputFile, profile, offset));
             _streamTranscoders.push_back(_streamTranscodersAllocated.back());
             break;
         }

Original file line number	Diff line number	Diff line change
`@@ -242,7 +242,7 @@ void Transcoder::addTranscodeStream(const InputStreamDesc& inputStreamDesc, cons`
`242`	`242`	`case AVMEDIA_TYPE_AUDIO:`
`243`	`243`	`{`
`244`	`244`	`_streamTranscodersAllocated.push_back(`
`245`		`- new StreamTranscoder(inputStream, _outputFile, profile, inputStreamDesc._channelIndexArray, offset));`
	`245`	`+ new StreamTranscoder(inputStreamDesc, inputStream, _outputFile, profile, offset));`
`246`	`246`	`_streamTranscoders.push_back(_streamTranscodersAllocated.back());`
`247`	`247`	`break;`
`248`	`248`	`}`