IInputStream: remove getStreamType

Clement Champetier · Clement Champetier · commit 10b5a09ca4c6 · 2015-10-30T12:06:02.000+01:00
diff --git a/src/AvTranscoder/stream/IInputStream.hpp b/src/AvTranscoder/stream/IInputStream.hpp
@@ -32,7 +32,6 @@ class AvExport IInputStream
 	virtual const StreamProperties& getProperties() const = 0;
 	virtual size_t getStreamIndex() const = 0;
 	virtual float getDuration() const = 0;  ///< Get duration of the stream, in seconds
-	virtual AVMediaType getStreamType() const = 0;
 
 	//@{
 	/**
diff --git a/src/AvTranscoder/stream/InputStream.cpp b/src/AvTranscoder/stream/InputStream.cpp
@@ -76,7 +76,7 @@ VideoCodec& InputStream::getVideoCodec()
 {
 	assert( _streamIndex <= _inputFile->getFormatContext().getNbStreams() );
 
-	if( getStreamType() != AVMEDIA_TYPE_VIDEO )
+	if( getProperties().getStreamType() != AVMEDIA_TYPE_VIDEO )
 	{
 		throw std::runtime_error( "unable to get video descriptor on non-video stream" );
 	}
@@ -88,7 +88,7 @@ AudioCodec& InputStream::getAudioCodec()
 {
 	assert( _streamIndex <= _inputFile->getFormatContext().getNbStreams() );
 
-	if( getStreamType() != AVMEDIA_TYPE_AUDIO )
+	if( getProperties().getStreamType() != AVMEDIA_TYPE_AUDIO )
 	{
 		throw std::runtime_error( "unable to get audio descriptor on non-audio stream" );
 	}
@@ -100,7 +100,7 @@ DataCodec& InputStream::getDataCodec()
 {
 	assert( _streamIndex <= _inputFile->getFormatContext().getNbStreams() );
 
-	if( getStreamType() != AVMEDIA_TYPE_DATA )
+	if( getProperties().getStreamType() != AVMEDIA_TYPE_DATA )
 	{
 		throw std::runtime_error( "unable to get data descriptor on non-data stream" );
 	}
@@ -113,11 +113,6 @@ const StreamProperties& InputStream::getProperties() const
 	return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex );
 }
 
-AVMediaType InputStream::getStreamType() const
-{
-	return _inputFile->getFormatContext().getAVStream( _streamIndex ).codec->codec_type;
-}
-
 float InputStream::getDuration() const
 {
 	return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex ).getDuration();
diff --git a/src/AvTranscoder/stream/InputStream.hpp b/src/AvTranscoder/stream/InputStream.hpp
@@ -27,7 +27,6 @@ class AvExport InputStream : public IInputStream
 	const StreamProperties& getProperties() const;
 	size_t getStreamIndex() const { return _streamIndex; }
 	float getDuration() const;
-	AVMediaType getStreamType() const;
 
 	VideoCodec& getVideoCodec();
 	AudioCodec& getAudioCodec();
diff --git a/src/AvTranscoder/transcoder/StreamTranscoder.cpp b/src/AvTranscoder/transcoder/StreamTranscoder.cpp
@@ -39,7 +39,7 @@ StreamTranscoder::StreamTranscoder(
 	, _needToSwitchToGenerator( false )
 {
 	// create a re-wrapping case
-	switch( _inputStream->getStreamType() )
+	switch( _inputStream->getProperties().getStreamType() )
 	{
 		case AVMEDIA_TYPE_VIDEO :
 		{
@@ -141,7 +141,7 @@ StreamTranscoder::StreamTranscoder(
 	, _needToSwitchToGenerator( false )
 {
 	// create a transcode case
-	switch( _inputStream->getStreamType() )
+	switch( _inputStream->getProperties().getStreamType() )
 	{
 		case AVMEDIA_TYPE_VIDEO :
 		{
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -317,7 +317,7 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s
 	// Add input file
 	InputFile* referenceFile = addInputFile( filename, streamIndex, offset );
 
-	switch( referenceFile->getStream( streamIndex ).getStreamType() )
+	switch( referenceFile->getStream( streamIndex ).getProperties().getStreamType() )
 	{
 		case AVMEDIA_TYPE_VIDEO:
 		case AVMEDIA_TYPE_AUDIO:
@@ -385,7 +385,7 @@ ProfileLoader::Profile Transcoder::getProfileFromFile( InputFile& inputFile, con
 	const StreamProperties* streamProperties = &inputFile.getProperties().getStreamPropertiesWithIndex( streamIndex );
 	const VideoProperties* videoProperties = NULL;
 	const AudioProperties* audioProperties = NULL;
-	switch( inputFile.getStream( streamIndex ).getStreamType() )
+	switch( inputFile.getStream( streamIndex ).getProperties().getStreamType() )
 	{
 		case AVMEDIA_TYPE_VIDEO:
 		{
@@ -522,7 +522,7 @@ 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().getStreamType();
+		const AVMediaType mediaType = _streamTranscoders.at( streamIndex )->getInputStream().getProperties().getStreamType();
 		switch( mediaType )
 		{
 			case AVMEDIA_TYPE_VIDEO:

Original file line number	Diff line number	Diff line change
`@@ -76,7 +76,7 @@ VideoCodec& InputStream::getVideoCodec()`
`76`	`76`	`{`
`77`	`77`	`assert( _streamIndex <= _inputFile->getFormatContext().getNbStreams() );`
`78`	`78`
`79`		`- if( getStreamType() != AVMEDIA_TYPE_VIDEO )`
	`79`	`+ if( getProperties().getStreamType() != AVMEDIA_TYPE_VIDEO )`
`80`	`80`	`{`
`81`	`81`	`throw std::runtime_error( "unable to get video descriptor on non-video stream" );`
`82`	`82`	`}`
`@@ -88,7 +88,7 @@ AudioCodec& InputStream::getAudioCodec()`
`88`	`88`	`{`
`89`	`89`	`assert( _streamIndex <= _inputFile->getFormatContext().getNbStreams() );`
`90`	`90`
`91`		`- if( getStreamType() != AVMEDIA_TYPE_AUDIO )`
	`91`	`+ if( getProperties().getStreamType() != AVMEDIA_TYPE_AUDIO )`
`92`	`92`	`{`
`93`	`93`	`throw std::runtime_error( "unable to get audio descriptor on non-audio stream" );`
`94`	`94`	`}`
`@@ -100,7 +100,7 @@ DataCodec& InputStream::getDataCodec()`
`100`	`100`	`{`
`101`	`101`	`assert( _streamIndex <= _inputFile->getFormatContext().getNbStreams() );`
`102`	`102`
`103`		`- if( getStreamType() != AVMEDIA_TYPE_DATA )`
	`103`	`+ if( getProperties().getStreamType() != AVMEDIA_TYPE_DATA )`
`104`	`104`	`{`
`105`	`105`	`throw std::runtime_error( "unable to get data descriptor on non-data stream" );`
`106`	`106`	`}`
`@@ -113,11 +113,6 @@ const StreamProperties& InputStream::getProperties() const`
`113`	`113`	`return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex );`
`114`	`114`	`}`
`115`	`115`
`116`		`-AVMediaType InputStream::getStreamType() const`
`117`		`-{`
`118`		`- return _inputFile->getFormatContext().getAVStream( _streamIndex ).codec->codec_type;`
`119`		`-}`
`120`		`-`
`121`	`116`	`float InputStream::getDuration() const`
`122`	`117`	`{`
`123`	`118`	`return _inputFile->getProperties().getStreamPropertiesWithIndex( _streamIndex ).getDuration();`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ StreamTranscoder::StreamTranscoder(`
`39`	`39`	`, _needToSwitchToGenerator( false )`
`40`	`40`	`{`
`41`	`41`	`// create a re-wrapping case`
`42`		`- switch( _inputStream->getStreamType() )`
	`42`	`+ switch( _inputStream->getProperties().getStreamType() )`
`43`	`43`	`{`
`44`	`44`	`case AVMEDIA_TYPE_VIDEO :`
`45`	`45`	`{`
`@@ -141,7 +141,7 @@ StreamTranscoder::StreamTranscoder(`
`141`	`141`	`, _needToSwitchToGenerator( false )`
`142`	`142`	`{`
`143`	`143`	`// create a transcode case`
`144`		`- switch( _inputStream->getStreamType() )`
	`144`	`+ switch( _inputStream->getProperties().getStreamType() )`
`145`	`145`	`{`
`146`	`146`	`case AVMEDIA_TYPE_VIDEO :`
`147`	`147`	`{`
Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ void Transcoder::addTranscodeStream( const std::string& filename, const size_t s`
`317`	`317`	`// Add input file`
`318`	`318`	`InputFile* referenceFile = addInputFile( filename, streamIndex, offset );`
`319`	`319`
`320`		`- switch( referenceFile->getStream( streamIndex ).getStreamType() )`
	`320`	`+ switch( referenceFile->getStream( streamIndex ).getProperties().getStreamType() )`
`321`	`321`	`{`
`322`	`322`	`case AVMEDIA_TYPE_VIDEO:`
`323`	`323`	`case AVMEDIA_TYPE_AUDIO:`
`@@ -385,7 +385,7 @@ ProfileLoader::Profile Transcoder::getProfileFromFile( InputFile& inputFile, con`
`385`	`385`	`const StreamProperties* streamProperties = &inputFile.getProperties().getStreamPropertiesWithIndex( streamIndex );`
`386`	`386`	`const VideoProperties* videoProperties = NULL;`
`387`	`387`	`const AudioProperties* audioProperties = NULL;`
`388`		`- switch( inputFile.getStream( streamIndex ).getStreamType() )`
	`388`	`+ switch( inputFile.getStream( streamIndex ).getProperties().getStreamType() )`
`389`	`389`	`{`
`390`	`390`	`case AVMEDIA_TYPE_VIDEO:`
`391`	`391`	`{`
`@@ -522,7 +522,7 @@ 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().getStreamType();`
	`525`	`+ const AVMediaType mediaType = _streamTranscoders.at( streamIndex )->getInputStream().getProperties().getStreamType();`
`526`	`526`	`switch( mediaType )`
`527`	`527`	`{`
`528`	`528`	`case AVMEDIA_TYPE_VIDEO:`