Transcoder: fix seg fault on fillProcessStat call for generated streams

Clement Champetier · Clement Champetier · commit 3f96a6744f10 · 2015-12-17T16:38:31.000+01:00
Warning: update API of StreamTranscoder.
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.hpp b/src/AvTranscoder/transcoder/StreamTranscoder.hpp
@@ -79,7 +79,7 @@ class AvExport StreamTranscoder
 	ITransform& getTransform() const { return *_transform; }
 
 	/// Returns a reference to the stream which unwraps data
-	IInputStream& getInputStream() const { return *_inputStream; }
+	IInputStream* getInputStream() const { return _inputStream; }
 	/// Returns a reference to the stream which wraps data
 	IOutputStream& getOutputStream() const { return *_outputStream; }
 
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -522,7 +522,12 @@ void Transcoder::fillProcessStat( ProcessStat& processStat )
 	for( size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex )
 	{
 		IOutputStream& stream = _streamTranscoders.at( streamIndex )->getOutputStream();
-		const AVMediaType mediaType = _streamTranscoders.at( streamIndex )->getInputStream().getProperties().getStreamType();
+		const IInputStream* inputStream = _streamTranscoders.at( streamIndex )->getInputStream();
+		if(inputStream == NULL) {
+			LOG_WARN( "Cannot process statistics of generated stream." )
+			continue;
+		}
+		const AVMediaType mediaType = inputStream->getProperties().getStreamType();
 		switch( mediaType )
 		{
 			case AVMEDIA_TYPE_VIDEO:

Original file line number	Diff line number	Diff line change
`@@ -522,7 +522,12 @@ void Transcoder::fillProcessStat( ProcessStat& processStat )`
`522`	`522`	`for( size_t streamIndex = 0; streamIndex < _streamTranscoders.size(); ++streamIndex )`
`523`	`523`	`{`
`524`	`524`	`IOutputStream& stream = _streamTranscoders.at( streamIndex )->getOutputStream();`
`525`		`- const AVMediaType mediaType = _streamTranscoders.at( streamIndex )->getInputStream().getProperties().getStreamType();`
	`525`	`+ const IInputStream* inputStream = _streamTranscoders.at( streamIndex )->getInputStream();`
	`526`	`+ if(inputStream == NULL) {`
	`527`	`+ LOG_WARN( "Cannot process statistics of generated stream." )`
	`528`	`+ continue;`
	`529`	`+ }`
	`530`	`+ const AVMediaType mediaType = inputStream->getProperties().getStreamType();`
`526`	`531`	`switch( mediaType )`
`527`	`532`	`{`
`528`	`533`	`case AVMEDIA_TYPE_VIDEO:`