Transcoder: added a check of the stream type when adding a list of inputs

Clement Champetier · Clement Champetier · commit f05574bfcf3b · 2016-07-21T15:17:26.000+02:00
Added a python test to check this behavior.
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -255,12 +255,21 @@ void Transcoder::addTranscodeStream(const std::vector<InputStreamDesc>& inputStr
                                           << "with encodingProfile=" << profile.at(constants::avProfileIdentificatorHuman) << std::endl
                                           << "and offset=" << offset << "s")
 
-    // Add input file
+    // Create all streams from the given inputs
     std::vector<IInputStream*> inputStreams;
+    AVMediaType commonStreamType = AVMEDIA_TYPE_UNKNOWN;
     for(std::vector<InputStreamDesc>::const_iterator it = inputStreamDescArray.begin(); it != inputStreamDescArray.end(); ++it)
     {
         InputFile* referenceFile = addInputFile(it->_filename, it->_streamIndex, offset);
         inputStreams.push_back(&referenceFile->getStream(it->_streamIndex));
+
+        // Check stream type
+        const AVMediaType currentStreamType = referenceFile->getProperties().getStreamPropertiesWithIndex(it->_streamIndex).getStreamType();
+        if(commonStreamType == AVMEDIA_TYPE_UNKNOWN)
+            commonStreamType = currentStreamType;
+        else if(currentStreamType != commonStreamType)
+            throw std::runtime_error("All the given inputs should be of the same type (video, audio...).");
+
     }
 
     _streamTranscodersAllocated.push_back(
@@ -380,8 +389,10 @@ ProfileLoader::Profile Transcoder::getProfileFromInputs(const std::vector<InputS
             else
             {
                 InputFile inputFile(it->_filename);
-                const AudioProperties& audioStream = dynamic_cast<const AudioProperties&>(inputFile.getProperties().getStreamPropertiesWithIndex(inputStreamDesc._streamIndex));
-                nbChannels += audioStream.getNbChannels();
+                const StreamProperties& currentStream = inputFile.getProperties().getStreamPropertiesWithIndex(inputStreamDesc._streamIndex);
+                if(currentStream.getStreamType() != AVMEDIA_TYPE_AUDIO)
+                    throw std::runtime_error("All the given inputs should be audio streams.");
+                nbChannels += dynamic_cast<const AudioProperties&>(currentStream).getNbChannels();
             }
         }
         ss << nbChannels;
diff --git a/test/pyTest/testTranscoderAdd.py b/test/pyTest/testTranscoderAdd.py
@@ -69,6 +69,24 @@ def testEmptyListOfInputs():
     transcoder.addStream(inputs)
 
 
+@raises(RuntimeError)
+def testAllSeveralInputsWithDifferentType():
+    """
+    Add one video and one audio to create one output stream.
+    """
+    # inputs
+    inputs = av.InputStreamDescVector()
+    inputs.append(av.InputStreamDesc(os.environ['AVTRANSCODER_TEST_AUDIO_MOV_FILE'], 0))
+    inputs.append(av.InputStreamDesc(os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE'], 0))
+
+    # output
+    outputFileName = "testAllSeveralInputsWithDifferentType.mov"
+    ouputFile = av.OutputFile(outputFileName)
+
+    transcoder = av.Transcoder(ouputFile)
+    transcoder.addStream(inputs)
+
+
 def testAddSeveralInputsToCreateOneOutput():
     """
     Add several audio inputs and create one output stream.
