FileProperties: add array of properties per stream (of all types)

Clement Champetier · Clement Champetier · commit cdb849f7078c · 2015-04-22T10:14:53.000+02:00
* It containes only references to the other properties (video,
audio...).
* Get the properties at the indicated stream index with only one
function.
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp
@@ -3,6 +3,7 @@
 #include <AvTranscoder/progress/NoDisplayProgress.hpp>
 
 #include <stdexcept>
+#include <sstream>
 
 namespace avtranscoder
 {
@@ -40,36 +41,42 @@ void FileProperties::extractStreamProperties( IProgress& progress, const EAnalys
 			{
 				VideoProperties properties( *_formatContext, streamIndex, progress, level );
 				_videoStreams.push_back( properties );
+				_streams.push_back( &_videoStreams.back() );
 				break;
 			}
 			case AVMEDIA_TYPE_AUDIO:
 			{
 				AudioProperties properties( *_formatContext, streamIndex );
 				_audioStreams.push_back( properties );
+				_streams.push_back( &_audioStreams.back() );
 				break;
 			}
 			case AVMEDIA_TYPE_DATA:
 			{
 				DataProperties properties( *_formatContext, streamIndex );
 				_dataStreams.push_back( properties );
+				_streams.push_back( &_dataStreams.back() );
 				break;
 			}
 			case AVMEDIA_TYPE_SUBTITLE:
 			{
 				SubtitleProperties properties( *_formatContext, streamIndex );
 				_subtitleStreams.push_back( properties );
+				_streams.push_back( &_subtitleStreams.back() );
 				break;
 			}
 			case AVMEDIA_TYPE_ATTACHMENT:
 			{
 				AttachementProperties properties( *_formatContext, streamIndex );
 				_attachementStreams.push_back( properties );
+				_streams.push_back( &_attachementStreams.back() );
 				break;
 			}
 			case AVMEDIA_TYPE_UNKNOWN:
 			{
 				UnknownProperties properties( *_formatContext, streamIndex );
 				_unknownStreams.push_back( properties );
+				_streams.push_back( &_unknownStreams.back() );
 				break;
 			}
 			case AVMEDIA_TYPE_NB:
@@ -140,28 +147,17 @@ size_t FileProperties::getPacketSize() const
 	return _avFormatContext->packet_size;
 }
 
-const avtranscoder::VideoProperties& FileProperties::getVideoPropertiesWithStreamIndex( const size_t streamIndex ) const
+const avtranscoder::StreamProperties& FileProperties::getStreamPropertiesWithIndex( const size_t streamIndex ) const
 {
-	for( std::vector< VideoProperties >::const_iterator it = _videoStreams.begin(); it != _videoStreams.end(); ++it )
+	for( std::vector< StreamProperties* >::const_iterator it = _streams.begin(); it != _streams.end(); ++it )
 	{
-		if( it->getStreamIndex() == streamIndex )
-			return *it;
+		if( (*it)->getStreamIndex() == streamIndex )
+			return *(*it);
 	}
-	std::string msg( "no video properties correspond to stream at index " );
-	msg += streamIndex;
-	throw std::runtime_error( msg );
-}
-
-const avtranscoder::AudioProperties& FileProperties::getAudioPropertiesWithStreamIndex( const size_t streamIndex ) const
-{
-	for( std::vector< AudioProperties >::const_iterator it = _audioStreams.begin(); it != _audioStreams.end(); ++it )
-	{
-		if( it->getStreamIndex() == streamIndex )
-			return *it;
-	}
-	std::string msg( "no audio properties correspond to stream at index " );
-	msg += streamIndex;
-	throw std::runtime_error( msg );
+	std::stringstream os;
+	os << "No stream properties correspond to stream at index ";
+	os <<  streamIndex;
+	throw std::runtime_error( os.str() );
 }
 
 size_t FileProperties::getNbStreams() const
@@ -202,6 +198,8 @@ PropertyVector FileProperties::getPropertiesAsVector() const
 
 void FileProperties::clearStreamProperties()
 {
+	_streams.clear();
+
 	_videoStreams.clear();
 	_audioStreams.clear();
 	_dataStreams.clear();
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.hpp b/src/AvTranscoder/mediaProperty/FileProperties.hpp
@@ -6,6 +6,7 @@
 #include <AvTranscoder/file/FormatContext.hpp>
 #include <AvTranscoder/progress/IProgress.hpp>
 
+#include <AvTranscoder/mediaProperty/StreamProperties.hpp>
 #include <AvTranscoder/mediaProperty/VideoProperties.hpp>
 #include <AvTranscoder/mediaProperty/AudioProperties.hpp>
 #include <AvTranscoder/mediaProperty/DataProperties.hpp>
@@ -59,9 +60,8 @@ class AvExport FileProperties
 	const FormatContext& getFormatContext() { return *_formatContext; }
 
 	//@{
-	// @brief Get the properties with the indicated stream index
-	const avtranscoder::VideoProperties& getVideoPropertiesWithStreamIndex( const size_t streamIndex ) const;
-	const avtranscoder::AudioProperties& getAudioPropertiesWithStreamIndex( const size_t streamIndex ) const;
+	// @brief Get the properties at the indicated stream index
+	const avtranscoder::StreamProperties& getStreamPropertiesWithIndex( const size_t streamIndex ) const;
 	//@}
 
 	//@{
@@ -102,6 +102,7 @@ class AvExport FileProperties
 	const FormatContext* _formatContext;  ///< Has link (no ownership)
 	const AVFormatContext* _avFormatContext;  ///< Has link (no ownership)
 
+	std::vector< StreamProperties* > _streams;  ///< Array of properties per stream (of all types) - only references to the following properties
 	std::vector< VideoProperties > _videoStreams;  ///< Array of properties per video stream
 	std::vector< AudioProperties >  _audioStreams;  ///< Array of properties per audio stream
 	std::vector< DataProperties > _dataStreams;  ///< Array of properties per data stream
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -5,7 +5,6 @@
 
 #include <limits>
 #include <algorithm>
-#include <sstream>
 
 namespace avtranscoder
 {
@@ -375,18 +374,19 @@ InputFile* Transcoder::addInputFile( const std::string& filename, const size_t s
 
 ProfileLoader::Profile Transcoder::getProfileFromFile( InputFile& inputFile, const size_t streamIndex )
 {
+	const StreamProperties* streamProperties = &inputFile.getProperties().getStreamPropertiesWithIndex( streamIndex );
 	const VideoProperties* videoProperties = NULL;
 	const AudioProperties* audioProperties = NULL;
 	switch( inputFile.getStream( streamIndex ).getStreamType() )
 	{
 		case AVMEDIA_TYPE_VIDEO:
 		{
-			videoProperties = &inputFile.getProperties().getVideoPropertiesWithStreamIndex( streamIndex );
+			videoProperties = dynamic_cast<const VideoProperties*>( streamProperties );
 			break;
 		}
 		case AVMEDIA_TYPE_AUDIO:
 		{
-			audioProperties = &inputFile.getProperties().getAudioPropertiesWithStreamIndex( streamIndex );
+			audioProperties = dynamic_cast<const AudioProperties*>( streamProperties );
 			break;
 		}
 		default:

Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,7 @@`
`3`	`3`	`#include <AvTranscoder/progress/NoDisplayProgress.hpp>`
`4`	`4`
`5`	`5`	`#include <stdexcept>`
	`6`	`+#include <sstream>`
`6`	`7`
`7`	`8`	`namespace avtranscoder`
`8`	`9`	`{`
`@@ -40,36 +41,42 @@ void FileProperties::extractStreamProperties( IProgress& progress, const EAnalys`
`40`	`41`	`{`
`41`	`42`	`VideoProperties properties( *_formatContext, streamIndex, progress, level );`
`42`	`43`	`_videoStreams.push_back( properties );`
	`44`	`+ _streams.push_back( &_videoStreams.back() );`
`43`	`45`	`break;`
`44`	`46`	`}`
`45`	`47`	`case AVMEDIA_TYPE_AUDIO:`
`46`	`48`	`{`
`47`	`49`	`AudioProperties properties( *_formatContext, streamIndex );`
`48`	`50`	`_audioStreams.push_back( properties );`
	`51`	`+ _streams.push_back( &_audioStreams.back() );`
`49`	`52`	`break;`
`50`	`53`	`}`
`51`	`54`	`case AVMEDIA_TYPE_DATA:`
`52`	`55`	`{`
`53`	`56`	`DataProperties properties( *_formatContext, streamIndex );`
`54`	`57`	`_dataStreams.push_back( properties );`
	`58`	`+ _streams.push_back( &_dataStreams.back() );`
`55`	`59`	`break;`
`56`	`60`	`}`
`57`	`61`	`case AVMEDIA_TYPE_SUBTITLE:`
`58`	`62`	`{`
`59`	`63`	`SubtitleProperties properties( *_formatContext, streamIndex );`
`60`	`64`	`_subtitleStreams.push_back( properties );`
	`65`	`+ _streams.push_back( &_subtitleStreams.back() );`
`61`	`66`	`break;`
`62`	`67`	`}`
`63`	`68`	`case AVMEDIA_TYPE_ATTACHMENT:`
`64`	`69`	`{`
`65`	`70`	`AttachementProperties properties( *_formatContext, streamIndex );`
`66`	`71`	`_attachementStreams.push_back( properties );`
	`72`	`+ _streams.push_back( &_attachementStreams.back() );`
`67`	`73`	`break;`
`68`	`74`	`}`
`69`	`75`	`case AVMEDIA_TYPE_UNKNOWN:`
`70`	`76`	`{`
`71`	`77`	`UnknownProperties properties( *_formatContext, streamIndex );`
`72`	`78`	`_unknownStreams.push_back( properties );`
	`79`	`+ _streams.push_back( &_unknownStreams.back() );`
`73`	`80`	`break;`
`74`	`81`	`}`
`75`	`82`	`case AVMEDIA_TYPE_NB:`
`@@ -140,28 +147,17 @@ size_t FileProperties::getPacketSize() const`
`140`	`147`	`return _avFormatContext->packet_size;`
`141`	`148`	`}`
`142`	`149`
`143`		`-const avtranscoder::VideoProperties& FileProperties::getVideoPropertiesWithStreamIndex( const size_t streamIndex ) const`
	`150`	`+const avtranscoder::StreamProperties& FileProperties::getStreamPropertiesWithIndex( const size_t streamIndex ) const`
`144`	`151`	`{`
`145`		`- for( std::vector< VideoProperties >::const_iterator it = _videoStreams.begin(); it != _videoStreams.end(); ++it )`
	`152`	`+ for( std::vector< StreamProperties* >::const_iterator it = _streams.begin(); it != _streams.end(); ++it )`
`146`	`153`	`{`
`147`		`- if( it->getStreamIndex() == streamIndex )`
`148`		`- return *it;`
	`154`	`+ if( (*it)->getStreamIndex() == streamIndex )`
	`155`	`+ return (it);`
`149`	`156`	`}`
`150`		`- std::string msg( "no video properties correspond to stream at index " );`
`151`		`- msg += streamIndex;`
`152`		`- throw std::runtime_error( msg );`
`153`		`-}`
`154`		`-`
`155`		`-const avtranscoder::AudioProperties& FileProperties::getAudioPropertiesWithStreamIndex( const size_t streamIndex ) const`
`156`		`-{`
`157`		`- for( std::vector< AudioProperties >::const_iterator it = _audioStreams.begin(); it != _audioStreams.end(); ++it )`
`158`		`- {`
`159`		`- if( it->getStreamIndex() == streamIndex )`
`160`		`- return *it;`
`161`		`- }`
`162`		`- std::string msg( "no audio properties correspond to stream at index " );`
`163`		`- msg += streamIndex;`
`164`		`- throw std::runtime_error( msg );`
	`157`	`+ std::stringstream os;`
	`158`	`+ os << "No stream properties correspond to stream at index ";`
	`159`	`+ os << streamIndex;`
	`160`	`+ throw std::runtime_error( os.str() );`
`165`	`161`	`}`
`166`	`162`
`167`	`163`	`size_t FileProperties::getNbStreams() const`
`@@ -202,6 +198,8 @@ PropertyVector FileProperties::getPropertiesAsVector() const`
`202`	`198`
`203`	`199`	`void FileProperties::clearStreamProperties()`
`204`	`200`	`{`
	`201`	`+ _streams.clear();`
	`202`	`+`
`205`	`203`	`_videoStreams.clear();`
`206`	`204`	`_audioStreams.clear();`
`207`	`205`	`_dataStreams.clear();`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,6 @@`
`5`	`5`
`6`	`6`	`#include <limits>`
`7`	`7`	`#include <algorithm>`
`8`		`-#include <sstream>`
`9`	`8`
`10`	`9`	`namespace avtranscoder`
`11`	`10`	`{`
`@@ -375,18 +374,19 @@ InputFile* Transcoder::addInputFile( const std::string& filename, const size_t s`
`375`	`374`
`376`	`375`	`ProfileLoader::Profile Transcoder::getProfileFromFile( InputFile& inputFile, const size_t streamIndex )`
`377`	`376`	`{`
	`377`	`+ const StreamProperties* streamProperties = &inputFile.getProperties().getStreamPropertiesWithIndex( streamIndex );`
`378`	`378`	`const VideoProperties* videoProperties = NULL;`
`379`	`379`	`const AudioProperties* audioProperties = NULL;`
`380`	`380`	`switch( inputFile.getStream( streamIndex ).getStreamType() )`
`381`	`381`	`{`
`382`	`382`	`case AVMEDIA_TYPE_VIDEO:`
`383`	`383`	`{`
`384`		`- videoProperties = &inputFile.getProperties().getVideoPropertiesWithStreamIndex( streamIndex );`
	`384`	`+ videoProperties = dynamic_cast<const VideoProperties*>( streamProperties );`
`385`	`385`	`break;`
`386`	`386`	`}`
`387`	`387`	`case AVMEDIA_TYPE_AUDIO:`
`388`	`388`	`{`
`389`		`- audioProperties = &inputFile.getProperties().getAudioPropertiesWithStreamIndex( streamIndex );`
	`389`	`+ audioProperties = dynamic_cast<const AudioProperties*>( streamProperties );`
`390`	`390`	`break;`
`391`	`391`	`}`
`392`	`392`	`default:`