StreamTranscoder: fixed getProcessCase in case of transcoding

Clement Champetier · Clement Champetier · commit 44f62ace60a0 · 2016-07-20T16:48:29.000+02:00
The _currentDecoder could be one of the decoder in the _inputDecoders
list.
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -15,6 +15,7 @@
 #include <cassert>
 #include <limits>
 #include <sstream>
+#include <algorithm>
 
 namespace avtranscoder
 {
@@ -633,7 +634,7 @@ void StreamTranscoder::setOffset(const float offset)
 
 StreamTranscoder::EProcessCase StreamTranscoder::getProcessCase() const
 {
-    if(! _inputStreams.empty() && ! _inputDecoders.empty() && _inputDecoders.at(0) == _currentDecoder)
+    if(! _inputStreams.empty() && ! _inputDecoders.empty() && std::find(_inputDecoders.begin(), _inputDecoders.end(), _currentDecoder) != _inputDecoders.end() )
         return eProcessCaseTranscode;
     else if(! _inputStreams.empty() && _inputDecoders.empty() && !_currentDecoder)
         return eProcessCaseRewrap;

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@`
`15`	`15`	`#include <cassert>`
`16`	`16`	`#include <limits>`
`17`	`17`	`#include <sstream>`
	`18`	`+#include <algorithm>`
`18`	`19`
`19`	`20`	`namespace avtranscoder`
`20`	`21`	`{`
`@@ -633,7 +634,7 @@ void StreamTranscoder::setOffset(const float offset)`
`633`	`634`
`634`	`635`	`StreamTranscoder::EProcessCase StreamTranscoder::getProcessCase() const`
`635`	`636`	`{`
`636`		`- if(! _inputStreams.empty() && ! _inputDecoders.empty() && _inputDecoders.at(0) == _currentDecoder)`
	`637`	`+ if(! _inputStreams.empty() && ! _inputDecoders.empty() && std::find(_inputDecoders.begin(), _inputDecoders.end(), _currentDecoder) != _inputDecoders.end() )`
`637`	`638`	`return eProcessCaseTranscode;`
`638`	`639`	`else if(! _inputStreams.empty() && _inputDecoders.empty() && !_currentDecoder)`
`639`	`640`	`return eProcessCaseRewrap;`