InputStreamDesc: renamed _channelsIndex attribute to _channelIndexArray

Clement Champetier · Clement Champetier · commit 76f2b3fd0525 · 2016-07-18T17:21:45.000+02:00
diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -116,7 +116,7 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer)
     return decodeNextFrame;
 }
 
-bool AudioDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelsIndex)
+bool AudioDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray)
 {
     AudioFrame& audioBuffer = static_cast<AudioFrame&>(frameBuffer);
 
@@ -137,7 +137,7 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t>
         return false;
 
     // check if each expected channel exists
-    for(std::vector<size_t>::const_iterator channelIndex = channelsIndex.begin(); channelIndex != channelsIndex.end(); ++channelIndex)
+    for(std::vector<size_t>::const_iterator channelIndex = channelIndexArray.begin(); channelIndex != channelIndexArray.end(); ++channelIndex)
     {
         if((*channelIndex) > srcNbChannels - 1)
         {
@@ -153,8 +153,8 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t>
 
     // copy frame properties of decoded frame
     audioBuffer.copyProperties(allDataOfNextFrame);
-    av_frame_set_channels(&audioBuffer.getAVFrame(), channelsIndex.size());
-    av_frame_set_channel_layout(&audioBuffer.getAVFrame(), av_get_default_channel_layout(channelsIndex.size()));
+    av_frame_set_channels(&audioBuffer.getAVFrame(), channelIndexArray.size());
+    av_frame_set_channel_layout(&audioBuffer.getAVFrame(), av_get_default_channel_layout(channelIndexArray.size()));
     audioBuffer.setNbSamplesPerChannel(allDataOfNextFrame.getNbSamplesPerChannel());
 
     // @todo manage cases with data of frame not only on data[0] (use _frame.linesize)
@@ -165,20 +165,20 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t>
     for(size_t sample = 0; sample < allDataOfNextFrame.getNbSamplesPerChannel(); ++sample)
     {
         // offset in source buffer
-        src += channelsIndex.at(0) * bytePerSample;
+        src += channelIndexArray.at(0) * bytePerSample;
 
-        for(size_t i = 0; i < channelsIndex.size(); ++i)
+        for(size_t i = 0; i < channelIndexArray.size(); ++i)
         {
             memcpy(dst, src, bytePerSample);
             dst += bytePerSample;
 
             // shift to the corresponding sample in the next channel of the current layout
-            if(i < channelsIndex.size() - 1)
-                src += (channelsIndex.at(i+1) - channelsIndex.at(i)) * bytePerSample;
+            if(i < channelIndexArray.size() - 1)
+                src += (channelIndexArray.at(i+1) - channelIndexArray.at(i)) * bytePerSample;
             // else shift to the next layout
             else
             {
-                src += (srcNbChannels - channelsIndex.at(i)) * bytePerSample;
+                src += (srcNbChannels - channelIndexArray.at(i)) * bytePerSample;
                 break;
             }
         }
diff --git a/src/AvTranscoder/decoder/AudioDecoder.hpp b/src/AvTranscoder/decoder/AudioDecoder.hpp
@@ -17,7 +17,7 @@ class AvExport AudioDecoder : public IDecoder
     void setupDecoder(const ProfileLoader::Profile& profile = ProfileLoader::Profile());
 
     bool decodeNextFrame(Frame& frameBuffer);
-    bool decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelsIndex);
+    bool decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray);
 
     void flushDecoder();
 
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -71,7 +71,7 @@ bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)
     return true;
 }
 
-bool AudioGenerator::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelsIndex)
+bool AudioGenerator::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray)
 {
     return decodeNextFrame(frameBuffer);
 }
diff --git a/src/AvTranscoder/decoder/AudioGenerator.hpp b/src/AvTranscoder/decoder/AudioGenerator.hpp
@@ -19,7 +19,7 @@ class AvExport AudioGenerator : public IDecoder
     ~AudioGenerator();
 
     bool decodeNextFrame(Frame& frameBuffer);
-    bool decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelsIndex);
+    bool decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray);
 
     void setNextFrame(Frame& inputFrame) { _inputFrame = &inputFrame; }
 
diff --git a/src/AvTranscoder/decoder/IDecoder.hpp b/src/AvTranscoder/decoder/IDecoder.hpp
@@ -33,10 +33,10 @@ class AvExport IDecoder
     /**
      * @brief Decode substream of next frame
      * @param frameBuffer: the frame decoded
-     * @param channelIndex: list of channels to extract
+     * @param channelIndexArray: list of channels to extract
      * @return status of decoding
      */
-    virtual bool decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelsIndex) = 0;
+    virtual bool decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray) = 0;
 
     /**
      * @brief Set the next frame of the input stream (which bypass the work of decoding)
diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -114,7 +114,7 @@ bool VideoDecoder::decodeNextFrame(Frame& frameBuffer)
     return decodeNextFrame;
 }
 
-bool VideoDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelsIndex)
+bool VideoDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray)
 {
     return false;
 }
diff --git a/src/AvTranscoder/decoder/VideoDecoder.hpp b/src/AvTranscoder/decoder/VideoDecoder.hpp
@@ -17,7 +17,7 @@ class AvExport VideoDecoder : public IDecoder
     void setupDecoder(const ProfileLoader::Profile& profile = ProfileLoader::Profile());
 
     bool decodeNextFrame(Frame& frameBuffer);
-    bool decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelsIndex);
+    bool decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray);
 
     void flushDecoder();
 
diff --git a/src/AvTranscoder/decoder/VideoGenerator.cpp b/src/AvTranscoder/decoder/VideoGenerator.cpp
@@ -72,7 +72,7 @@ bool VideoGenerator::decodeNextFrame(Frame& frameBuffer)
     return true;
 }
 
-bool VideoGenerator::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelsIndex)
+bool VideoGenerator::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray)
 {
     return false;
 }
diff --git a/src/AvTranscoder/decoder/VideoGenerator.hpp b/src/AvTranscoder/decoder/VideoGenerator.hpp
@@ -19,7 +19,7 @@ class AvExport VideoGenerator : public IDecoder
     ~VideoGenerator();
 
     bool decodeNextFrame(Frame& frameBuffer);
-    bool decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelsIndex);
+    bool decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray);
 
     void setNextFrame(Frame& inputFrame) { _inputFrame = &inputFrame; }
 
diff --git a/src/AvTranscoder/reader/IReader.cpp b/src/AvTranscoder/reader/IReader.cpp
@@ -74,9 +74,9 @@ Frame* IReader::readFrameAt(const size_t frame)
     bool decodingStatus = false;
     if(_channelIndex != -1)
     {
-        std::vector<size_t> channelsIndex;
-        channelsIndex.push_back(_channelIndex);
-        decodingStatus = _currentDecoder->decodeNextFrame(*_srcFrame, channelsIndex);
+        std::vector<size_t> channelIndexArray;
+        channelIndexArray.push_back(_channelIndex);
+        decodingStatus = _currentDecoder->decodeNextFrame(*_srcFrame, channelIndexArray);
     }
     else
         decodingStatus = _currentDecoder->decodeNextFrame(*_srcFrame);
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -31,7 +31,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
     , _outputEncoder(NULL)
     , _transform(NULL)
     , _filterGraph(NULL)
-    , _channelsIndex()
+    , _channelIndexArray()
     , _offset(offset)
     , _needToSwitchToGenerator(false)
 {
@@ -122,7 +122,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
 }
 
 StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outputFile, const ProfileLoader::Profile& profile,
-                                   const std::vector<size_t> channelsIndex, const float offset)
+                                   const std::vector<size_t> channelIndexArray, const float offset)
     : _inputStream(&inputStream)
     , _outputStream(NULL)
     , _sourceBuffer(NULL)
@@ -133,7 +133,7 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
     , _outputEncoder(NULL)
     , _transform(NULL)
     , _filterGraph(NULL)
-    , _channelsIndex(channelsIndex)
+    , _channelIndexArray(channelIndexArray)
     , _offset(offset)
     , _needToSwitchToGenerator(false)
 {
@@ -191,17 +191,17 @@ StreamTranscoder::StreamTranscoder(IInputStream& inputStream, IOutputFile& outpu
 
             AudioFrameDesc outputFrameDesc(_inputStream->getAudioCodec().getAudioFrameDesc());
             outputFrameDesc.setParameters(profile);
-            if(!_channelsIndex.empty())
-                outputFrameDesc._nbChannels = _channelsIndex.size();
+            if(!_channelIndexArray.empty())
+                outputFrameDesc._nbChannels = _channelIndexArray.size();
             outputAudio->setupAudioEncoder(outputFrameDesc, profile);
 
             // output stream
             _outputStream = &outputFile.addAudioStream(outputAudio->getAudioCodec());
 
             // buffers to process
             AudioFrameDesc inputFrameDesc(_inputStream->getAudioCodec().getAudioFrameDesc());
-            if(!_channelsIndex.empty())
-                inputFrameDesc._nbChannels = _channelsIndex.size();
+            if(!_channelIndexArray.empty())
+                inputFrameDesc._nbChannels = _channelIndexArray.size();
 
             _sourceBuffer = new AudioFrame(inputFrameDesc);
             _frameBuffer = new AudioFrame(outputAudio->getAudioCodec().getAudioFrameDesc());
@@ -234,7 +234,7 @@ StreamTranscoder::StreamTranscoder(IOutputFile& outputFile, const ProfileLoader:
     , _outputEncoder(NULL)
     , _transform(NULL)
     , _filterGraph(NULL)
-    , _channelsIndex()
+    , _channelIndexArray()
     , _offset(0)
     , _needToSwitchToGenerator(false)
 {
@@ -472,10 +472,10 @@ bool StreamTranscoder::processTranscode()
 
     LOG_DEBUG("Decode next frame")
     bool decodingStatus = false;
-    if(_channelsIndex.empty())
+    if(_channelIndexArray.empty())
         decodingStatus = _currentDecoder->decodeNextFrame(*_sourceBuffer);
     else
-        decodingStatus = _currentDecoder->decodeNextFrame(*_sourceBuffer, _channelsIndex);
+        decodingStatus = _currentDecoder->decodeNextFrame(*_sourceBuffer, _channelIndexArray);
 
     CodedData data;
     if(decodingStatus)
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -35,7 +35,7 @@ class AvExport StreamTranscoder
      * @brief Transcode the given stream.
      **/
     StreamTranscoder(IInputStream& inputStream, IOutputFile& outputFile, const ProfileLoader::Profile& profile,
-                     const std::vector<size_t> channelsIndex, const float offset = 0);
+                     const std::vector<size_t> channelIndexArray, const float offset = 0);
 
     /**
      * @brief encode from a generated stream
@@ -136,7 +136,7 @@ class AvExport StreamTranscoder
 
     FilterGraph* _filterGraph; ///< Filter graph (has ownership)
 
-    std::vector<size_t> _channelsIndex; ///< List of channels that is processed from the input stream (empty if no demultiplexing).
+    std::vector<size_t> _channelIndexArray; ///< List of channels that is processed from the input stream (empty if no demultiplexing).
 
     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
@@ -225,7 +225,7 @@ void Transcoder::addTranscodeStream(const InputStreamDesc& inputStreamDesc,
     {
         // number of channels
         std::stringstream ss;
-        ss << inputStreamDesc._channelsIndex.size();
+        ss << inputStreamDesc._channelIndexArray.size();
         profile[constants::avProfileChannel] = ss.str();
     }
 
@@ -251,7 +251,7 @@ void Transcoder::addTranscodeStream(const InputStreamDesc& inputStreamDesc,
         case AVMEDIA_TYPE_AUDIO:
         {
             _streamTranscodersAllocated.push_back(
-                new StreamTranscoder(referenceFile->getStream(inputStreamDesc._streamIndex), _outputFile, profile, inputStreamDesc._channelsIndex, offset));
+                new StreamTranscoder(referenceFile->getStream(inputStreamDesc._streamIndex), _outputFile, profile, inputStreamDesc._channelIndexArray, offset));
             _streamTranscoders.push_back(_streamTranscodersAllocated.back());
             break;
         }
@@ -509,9 +509,9 @@ std::ostream& operator<<(std::ostream& flux, const InputStreamDesc& inputStreamD
     if(inputStreamDesc.demultiplexing())
     {
         flux << "- channels index: ";
-        for(size_t c = 0; c < inputStreamDesc._channelsIndex.size(); ++c)
+        for(size_t c = 0; c < inputStreamDesc._channelIndexArray.size(); ++c)
         {
-            flux << inputStreamDesc._channelsIndex.at(c) << ", ";
+            flux << inputStreamDesc._channelIndexArray.at(c) << ", ";
         }
         flux << std::endl;
     }
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -21,35 +21,35 @@ namespace avtranscoder
  */
 struct InputStreamDesc {
 
-    InputStreamDesc(const std::string& filename, const size_t streamIndex, const std::vector<size_t>& channelsIndex)
+    InputStreamDesc(const std::string& filename, const size_t streamIndex, const std::vector<size_t>& channelIndexArray)
         : _filename(filename)
         , _streamIndex(streamIndex)
-        , _channelsIndex(channelsIndex)
+        , _channelIndexArray(channelIndexArray)
     {}
 
     InputStreamDesc(const std::string& filename, const size_t streamIndex, const size_t channelIndex)
         : _filename(filename)
         , _streamIndex(streamIndex)
-        , _channelsIndex()
+        , _channelIndexArray()
     {
-	_channelsIndex.push_back(channelIndex);
+	_channelIndexArray.push_back(channelIndex);
     }
 
     InputStreamDesc(const std::string& filename, const size_t streamIndex)
         : _filename(filename)
         , _streamIndex(streamIndex)
-        , _channelsIndex()
+        , _channelIndexArray()
     {}
 
     /**
      * @return If a demultiplexing step will be done to extract the expected data.
      */
-    bool demultiplexing() const { return ! _channelsIndex.empty(); }
+    bool demultiplexing() const { return ! _channelIndexArray.empty(); }
 
 public:
     std::string _filename; ///< Source file path.
     size_t _streamIndex; ///< Source stream to extract.
-    std::vector<size_t> _channelsIndex; ///< List of source channels to extract from the stream
+    std::vector<size_t> _channelIndexArray; ///< List of source channels to extract from the stream
 };
 
 #ifndef SWIG

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer)`
`116`	`116`	`return decodeNextFrame;`
`117`	`117`	`}`
`118`	`118`
`119`		`-bool AudioDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelsIndex)`
	`119`	`+bool AudioDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray)`
`120`	`120`	`{`
`121`	`121`	`AudioFrame& audioBuffer = static_cast<AudioFrame&>(frameBuffer);`
`122`	`122`
`@@ -137,7 +137,7 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t>`
`137`	`137`	`return false;`
`138`	`138`
`139`	`139`	`// check if each expected channel exists`
`140`		`- for(std::vector<size_t>::const_iterator channelIndex = channelsIndex.begin(); channelIndex != channelsIndex.end(); ++channelIndex)`
	`140`	`+ for(std::vector<size_t>::const_iterator channelIndex = channelIndexArray.begin(); channelIndex != channelIndexArray.end(); ++channelIndex)`
`141`	`141`	`{`
`142`	`142`	`if((*channelIndex) > srcNbChannels - 1)`
`143`	`143`	`{`
`@@ -153,8 +153,8 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t>`
`153`	`153`
`154`	`154`	`// copy frame properties of decoded frame`
`155`	`155`	`audioBuffer.copyProperties(allDataOfNextFrame);`
`156`		`- av_frame_set_channels(&audioBuffer.getAVFrame(), channelsIndex.size());`
`157`		`- av_frame_set_channel_layout(&audioBuffer.getAVFrame(), av_get_default_channel_layout(channelsIndex.size()));`
	`156`	`+ av_frame_set_channels(&audioBuffer.getAVFrame(), channelIndexArray.size());`
	`157`	`+ av_frame_set_channel_layout(&audioBuffer.getAVFrame(), av_get_default_channel_layout(channelIndexArray.size()));`
`158`	`158`	`audioBuffer.setNbSamplesPerChannel(allDataOfNextFrame.getNbSamplesPerChannel());`
`159`	`159`
`160`	`160`	`// @todo manage cases with data of frame not only on data[0] (use _frame.linesize)`
`@@ -165,20 +165,20 @@ bool AudioDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t>`
`165`	`165`	`for(size_t sample = 0; sample < allDataOfNextFrame.getNbSamplesPerChannel(); ++sample)`
`166`	`166`	`{`
`167`	`167`	`// offset in source buffer`
`168`		`- src += channelsIndex.at(0) * bytePerSample;`
	`168`	`+ src += channelIndexArray.at(0) * bytePerSample;`
`169`	`169`
`170`		`- for(size_t i = 0; i < channelsIndex.size(); ++i)`
	`170`	`+ for(size_t i = 0; i < channelIndexArray.size(); ++i)`
`171`	`171`	`{`
`172`	`172`	`memcpy(dst, src, bytePerSample);`
`173`	`173`	`dst += bytePerSample;`
`174`	`174`
`175`	`175`	`// shift to the corresponding sample in the next channel of the current layout`
`176`		`- if(i < channelsIndex.size() - 1)`
`177`		`- src += (channelsIndex.at(i+1) - channelsIndex.at(i)) * bytePerSample;`
	`176`	`+ if(i < channelIndexArray.size() - 1)`
	`177`	`+ src += (channelIndexArray.at(i+1) - channelIndexArray.at(i)) * bytePerSample;`
`178`	`178`	`// else shift to the next layout`
`179`	`179`	`else`
`180`	`180`	`{`
`181`		`- src += (srcNbChannels - channelsIndex.at(i)) * bytePerSample;`
	`181`	`+ src += (srcNbChannels - channelIndexArray.at(i)) * bytePerSample;`
`182`	`182`	`break;`
`183`	`183`	`}`
`184`	`184`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ bool AudioGenerator::decodeNextFrame(Frame& frameBuffer)`
`71`	`71`	`return true;`
`72`	`72`	`}`
`73`	`73`
`74`		`-bool AudioGenerator::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelsIndex)`
	`74`	`+bool AudioGenerator::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray)`
`75`	`75`	`{`
`76`	`76`	`return decodeNextFrame(frameBuffer);`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ bool VideoDecoder::decodeNextFrame(Frame& frameBuffer)`
`114`	`114`	`return decodeNextFrame;`
`115`	`115`	`}`
`116`	`116`
`117`		`-bool VideoDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelsIndex)`
	`117`	`+bool VideoDecoder::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray)`
`118`	`118`	`{`
`119`	`119`	`return false;`
`120`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ bool VideoGenerator::decodeNextFrame(Frame& frameBuffer)`
`72`	`72`	`return true;`
`73`	`73`	`}`
`74`	`74`
`75`		`-bool VideoGenerator::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelsIndex)`
	`75`	`+bool VideoGenerator::decodeNextFrame(Frame& frameBuffer, const std::vector<size_t> channelIndexArray)`
`76`	`76`	`{`
`77`	`77`	`return false;`
`78`	`78`	`}`
Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,9 @@ Frame* IReader::readFrameAt(const size_t frame)`
`74`	`74`	`bool decodingStatus = false;`
`75`	`75`	`if(_channelIndex != -1)`
`76`	`76`	`{`
`77`		`- std::vector<size_t> channelsIndex;`
`78`		`- channelsIndex.push_back(_channelIndex);`
`79`		`- decodingStatus = _currentDecoder->decodeNextFrame(*_srcFrame, channelsIndex);`
	`77`	`+ std::vector<size_t> channelIndexArray;`
	`78`	`+ channelIndexArray.push_back(_channelIndex);`
	`79`	`+ decodingStatus = _currentDecoder->decodeNextFrame(*_srcFrame, channelIndexArray);`
`80`	`80`	`}`
`81`	`81`	`else`
`82`	`82`	`decodingStatus = _currentDecoder->decodeNextFrame(*_srcFrame);`