StreamTranscoder: throw if a stream needs to switch to a generator but cannot

Clement Champetier · Clement Champetier · commit 33723c818916 · 2016-07-19T10:55:36.000+02:00
* Updated doc of the method.
* Added a python test.
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -560,10 +560,9 @@ void StreamTranscoder::needToSwitchToGenerator(const bool needToSwitch)
     if(needToSwitch && !canSwitchToGenerator())
     {
         std::stringstream os;
-        LOG_WARN("The stream " << _inputStream->getStreamIndex() << " has a duration of " << getDuration()
-                               << "s. It needs to switch to a generator during the process, but it cannot. "
-                               << "No generator will be used for this stream.")
-        return;
+        os << "The stream at index " << _inputStream->getStreamIndex() << " has a duration of " << getDuration() << "s.";
+        os << " It needs to switch to a generator during the process, but it cannot. ";
+        throw std::runtime_error(os.str());
     }
     _needToSwitchToGenerator = needToSwitch;
 }
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -27,7 +27,6 @@ class AvExport StreamTranscoder
 public:
     /**
      * @brief Rewrap the given stream.
-     * @note offset feature when rewrap a stream is not supported
      **/
     StreamTranscoder(IInputStream& inputStream, IOutputFile& outputFile, const float offset = 0);
 
diff --git a/test/pyTest/testOffset.py b/test/pyTest/testOffset.py
@@ -15,6 +15,22 @@
 from pyAvTranscoder import avtranscoder as av
 
 
+@raises(RuntimeError)
+def testRewrapVideoPositiveOffsetWithoutGenerator():
+    """
+    Add a positive offset supposed to have a generator.
+    Depending on the codec and the given parameters, the generator could not be instanciate.
+    """
+    inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_RAW_FILE']
+    outputFileName = "testPositiveOffsetWithoutGenerator.h264"
+    offset = 10
+
+    ouputFile = av.OutputFile( outputFileName )
+    transcoder = av.Transcoder( ouputFile )
+
+    transcoder.addStream( av.InputStreamDesc(inputFileName, 0), "", offset )
+
+
 def testTranscodeAudioPositiveOffset():
     """
     Transcode one audio stream (profile wave24b48kmono) with offset at the beginning of the process.

Original file line number	Diff line number	Diff line change
`@@ -560,10 +560,9 @@ void StreamTranscoder::needToSwitchToGenerator(const bool needToSwitch)`
`560`	`560`	`if(needToSwitch && !canSwitchToGenerator())`
`561`	`561`	`{`
`562`	`562`	`std::stringstream os;`
`563`		`- LOG_WARN("The stream " << _inputStream->getStreamIndex() << " has a duration of " << getDuration()`
`564`		`- << "s. It needs to switch to a generator during the process, but it cannot. "`
`565`		`- << "No generator will be used for this stream.")`
`566`		`- return;`
	`563`	`+ os << "The stream at index " << _inputStream->getStreamIndex() << " has a duration of " << getDuration() << "s.";`
	`564`	`+ os << " It needs to switch to a generator during the process, but it cannot. ";`
	`565`	`+ throw std::runtime_error(os.str());`
`567`	`566`	`}`
`568`	`567`	`_needToSwitchToGenerator = needToSwitch;`
`569`	`568`	`}`