InputFile: refactore order of functions

Clement Champetier · Clement Champetier · commit 456cff25a5bb · 2015-01-12T10:32:45.000+01:00
Getters and setters together.
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -133,18 +133,6 @@ FileProperties InputFile::analyseFile( const std::string& filename, IProgress& p
 	return file.getProperties();
 }
 
-AVMediaType InputFile::getStreamType( size_t index )
-{
-	if( index >= _formatContext->nb_streams )
-		return AVMEDIA_TYPE_UNKNOWN;
-	return _formatContext->streams[index]->codec->codec_type;
-}
-
-AvInputStream& InputFile::getStream( size_t index )
-{
-	return *_inputStreams.at( index );
-}
-
 bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )
 {
 	AVPacket packet;
@@ -199,6 +187,29 @@ void InputFile::activateStream( const size_t streamIndex, bool activate )
 	_inputStreams.at( streamIndex )->activate( activate );
 }
 
+AvInputStream& InputFile::getStream( size_t index )
+{
+	try
+	{
+		return *_inputStreams.at( index );
+	}
+	catch( const std::out_of_range& e )
+	{
+		std::stringstream msg;
+		msg << getFilename();
+		msg << " has no stream at index ";
+		msg << index;
+		throw std::runtime_error( msg.str() );
+	}
+}
+
+AVMediaType InputFile::getStreamType( size_t index )
+{
+	if( index >= _formatContext->nb_streams )
+		return AVMEDIA_TYPE_UNKNOWN;
+	return _formatContext->streams[index]->codec->codec_type;
+}
+
 bool InputFile::isStreamActivated( const size_t streamIndex )
 {
 	return _inputStreams.at( streamIndex )->isActivated();
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -36,45 +36,13 @@ class AvExport InputFile
 
 	virtual ~InputFile();
 
-	/**
-	 * @return Return the resource to access
-	**/
-	std::string getFilename() const { return _filename; }
-
 	/**
 	 * @brief Run the analyse on the file after a setup.
 	 *        call this function before getProperties().
 	 * @param progress callback to get analysis progression
 	 * @param level by default eAnalyseLevelFirstGop
 	 **/
 	void analyse( IProgress& progress, const EAnalyseLevel level = eAnalyseLevelFirstGop );
-	
-	/**
-	 * @brief Return media properties on the current InputFile.
-	 * @note require to launch analyse() before to fill the property struture
-	 * @return structure of media metadatas
-	 **/
-	const FileProperties& getProperties() const { return _properties; }
-
-	/**
-	 * @brief Get stream type: video, audio, subtitle, etc.
-	 * @param index stream index
-	 * @return media stream type of specified index stream
-	 **/
-	AVMediaType getStreamType( size_t index );
-
-	/**
-	 * @brief Get stream type: video, audio, subtitle, etc.
-	 * @param index stream index
-	 * @return media stream type of specified index stream
-	 **/
-	AvInputStream& getStream( size_t index );
-
-	/**
-	 * @brief Get LibAV/FFmpeg AVFormatContext
-	 * @return format context on current InputFile
-	 **/
-	AVFormatContext& getAVFormatContext() const { return *_formatContext; }
 
 	/**
 	 * @brief Read the next packet of the specified stream
@@ -95,11 +63,43 @@ class AvExport InputFile
          * @note Activate a stream results in buffered its data when processing
 	 **/
 	void activateStream( const size_t streamIndex, const bool activate = true );
+	
+	/**
+	 * @return Return the resource to access
+	**/
+	std::string getFilename() const { return _filename; }
+
+	/**
+	 * @brief Return media properties on the current InputFile.
+	 * @note require to launch analyse() before to fill the property struture
+	 * @return structure of media metadatas
+	 **/
+	const FileProperties& getProperties() const { return _properties; }
+
+	/**
+	 * @brief Get stream type: video, audio, subtitle, etc.
+	 * @param index stream index
+	 * @return media stream type of specified index stream
+	 **/
+	AvInputStream& getStream( size_t index );
+
+	/**
+	 * @brief Get stream type: video, audio, subtitle, etc.
+	 * @param index stream index
+	 * @return media stream type of specified index stream
+	 **/
+	AVMediaType getStreamType( size_t index );
 
 	/** 
 	 * @brief Indicate that the stream is activated
 	 **/
 	bool isStreamActivated( const size_t streamIndex );
+
+	/**
+	 * @brief Get LibAV/FFmpeg AVFormatContext
+	 * @return format context on current InputFile
+	 **/
+	AVFormatContext& getAVFormatContext() const { return *_formatContext; }
 	
 	/**
 	 * @brief Set the format of the input file
