InputStream: fix get properties of stream

Clement Champetier · Clement Champetier · commit e65a4ca2b21d · 2015-02-10T18:19:48.000+01:00
Warning:
getVideoProperties().at(index) !=
getVideoPropertiesWithStreamIndex(index)
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp
@@ -74,6 +74,54 @@ size_t FileProperties::getPacketSize() const
 	return _formatContext->packet_size;
 }
 
+VideoProperties& FileProperties::getVideoPropertiesWithStreamIndex( const size_t streamIndex )
+{
+	for( std::vector< VideoProperties >::iterator it = _videoStreams.begin(); it != _videoStreams.end(); ++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::VideoProperties& FileProperties::getVideoPropertiesWithStreamIndex( const size_t streamIndex ) const
+{
+	for( std::vector< VideoProperties >::const_iterator it = _videoStreams.begin(); it != _videoStreams.end(); ++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 );
+}
+
+AudioProperties& FileProperties::getAudioPropertiesWithStreamIndex( const size_t streamIndex )
+{
+	for( std::vector< AudioProperties >::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 );
+}
+
+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 );
+}
+
 size_t FileProperties::getNbStreams() const
 {
 	if( ! _formatContext )
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.hpp b/src/AvTranscoder/mediaProperty/FileProperties.hpp
@@ -42,15 +42,28 @@ class AvExport FileProperties
 	size_t getNbAttachementStreams() const { return _attachementStreams.size(); }
 	size_t getNbUnknownStreams() const { return _unknownStreams.size(); }
 
+	//@{
+	// @brief Get the properties with the indicated stream index
+	avtranscoder::VideoProperties& getVideoPropertiesWithStreamIndex( const size_t streamIndex );
+	avtranscoder::AudioProperties& getAudioPropertiesWithStreamIndex( const size_t streamIndex );
+	//@}
+
+	//@{
+	// @brief Get the list of properties for a given type (video, audio...)
 	std::vector< avtranscoder::VideoProperties >& getVideoProperties() { return  _videoStreams; }
 	std::vector< avtranscoder::AudioProperties >& getAudioProperties() { return  _audioStreams; }
 	std::vector< avtranscoder::DataProperties >& getDataProperties() { return  _dataStreams; }
 	std::vector< avtranscoder::SubtitleProperties >& getSubtitleProperties() { return  _subtitleStreams; }
 	std::vector< avtranscoder::AttachementProperties >& getAttachementProperties() { return  _attachementStreams; }
 	std::vector< avtranscoder::UnknownProperties >& getUnknownPropertiesProperties() { return  _unknownStreams; }
+	//@}
 
 #ifndef SWIG
 	const AVFormatContext& getAVFormatContext() { return *_formatContext; }
+
+	const avtranscoder::VideoProperties& getVideoPropertiesWithStreamIndex( const size_t streamIndex ) const;
+	const avtranscoder::AudioProperties& getAudioPropertiesWithStreamIndex( const size_t streamIndex ) const;
+
 	const std::vector< avtranscoder::VideoProperties >& getVideoProperties() const  { return  _videoStreams; }
 	const std::vector< avtranscoder::AudioProperties >& getAudioProperties() const  { return  _audioStreams; }
 	const std::vector< avtranscoder::DataProperties >& getDataProperties() const  { return  _dataStreams; }
