avTranscoder · cchampet · Nov 5, 2015 · Oct 9, 2015 · Oct 12, 2015 · Oct 12, 2015
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,17 +2,6 @@ cmake_minimum_required(VERSION 2.8.11)
 
 project(AvTranscoder)
 
-# Set AvTranscoder versions
-set(AVTRANSCODER_VERSION_MAJOR "0")
-set(AVTRANSCODER_VERSION_MINOR "5")
-set(AVTRANSCODER_VERSION_MICRO "10")
-set(AVTRANSCODER_VERSION ${AVTRANSCODER_VERSION_MAJOR}.${AVTRANSCODER_VERSION_MINOR}.${AVTRANSCODER_VERSION_MICRO})
-
-# Define AvTranscoder versions
-add_definitions(-DAVTRANSCODER_VERSION_MAJOR=${AVTRANSCODER_VERSION_MAJOR})
-add_definitions(-DAVTRANSCODER_VERSION_MINOR=${AVTRANSCODER_VERSION_MINOR})
-add_definitions(-DAVTRANSCODER_VERSION_MICRO=${AVTRANSCODER_VERSION_MICRO})
-
 # Define AvTranscoder default path to profiles
 add_definitions(-DAVTRANSCODER_DEFAULT_AVPROFILES="${CMAKE_INSTALL_PREFIX}/share/avprofiles")
 
@@ -37,8 +26,10 @@ if(AVTRANSCODER_COVERAGE)
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
 endif()
 
+# Build library
 add_subdirectory(src)
 
+# Build apps
 if(AVTRANSCODER_DISABLE_APPS)
 	message("Apps disabled, will not build applications.")
 else()

diff --git a/cmake/AvTranscoderMacros.cmake b/cmake/AvTranscoderMacros.cmake
@@ -2,3 +2,24 @@
 set(AVTRANSCODER_APP_PATH "${PROJECT_SOURCE_DIR}/app")
 set(AVTRANSCODER_SRC_PATH "${PROJECT_SOURCE_DIR}/src")
 file(GLOB_RECURSE AVTRANSCODER_SRC_FILES "AvTranscoder/*.cpp" "AvTranscoder/*.hpp")
+
+# Get AvTranscoder versions
+# AVTRANSCODER_VERSION_MAJOR
+# AVTRANSCODER_VERSION_MINOR
+# AVTRANSCODER_VERSION_MICRO
+# AVTRANSCODER_VERSION
+file(STRINGS "${AVTRANSCODER_SRC_PATH}/AvTranscoder/common.hpp" _avtranscoder_VERSION_HPP_CONTENTS REGEX "#define AVTRANSCODER_VERSION_")
+foreach(v MAJOR MINOR MICRO)
+  if("${_avtranscoder_VERSION_HPP_CONTENTS}" MATCHES "#define AVTRANSCODER_VERSION_${v} ([0-9]+)")
+    set(AVTRANSCODER_VERSION_${v} "${CMAKE_MATCH_1}")
+  else()
+    set(AVTRANSCODER_RETRIEVE_VERSION_FAILED 1)
+  endif()
+endforeach()
+unset(_avtranscoder_VERSION_HPP_CONTENTS)
+
+set(AVTRANSCODER_VERSION "${AVTRANSCODER_VERSION_MAJOR}.${AVTRANSCODER_VERSION_MINOR}.${AVTRANSCODER_VERSION_MICRO}")
+
+if(AVTRANSCODER_RETRIEVE_VERSION_FAILED)
+  message(SEND_ERROR "Failed to retrieve AvTranscoder version: ${AVTRANSCODER_VERSION}")
+endif()
diff --git a/src/AvTranscoder/common.hpp b/src/AvTranscoder/common.hpp
@@ -1,6 +1,10 @@
 #ifndef _AV_TRANSCODER_COMMON_HPP_
 #define _AV_TRANSCODER_COMMON_HPP_
 
+#define AVTRANSCODER_VERSION_MAJOR 0
+#define AVTRANSCODER_VERSION_MINOR 5
+#define AVTRANSCODER_VERSION_MICRO 12
+
 #include <AvTranscoder/system.hpp>
 
 extern "C" {

diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -62,7 +62,10 @@ void AudioDecoder::setupDecoder( const ProfileLoader::Profile& profile )
 		throw std::runtime_error( msg );
 	}
 
-	LOG_INFO( "Setup audio decoder with:\n" << profile )
+	if( ! profile.empty() )
+	{
+		LOG_INFO( "Setup audio decoder with:\n" << profile )
+	}
 
 	AudioCodec& codec = _inputStream->getAudioCodec();
 

diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -60,7 +60,10 @@ void VideoDecoder::setupDecoder( const ProfileLoader::Profile& profile )
 		throw std::runtime_error( msg );
 	}
 
-	LOG_INFO( "Setup video decoder with:\n" << profile )
+	if( ! profile.empty() )
+	{
+		LOG_INFO( "Setup video decoder with:\n" << profile )
+	}
 
 	VideoCodec& codec = _inputStream->getVideoCodec();
 

diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -37,7 +37,10 @@ AudioEncoder::~AudioEncoder()
 
 void AudioEncoder::setupAudioEncoder( const AudioFrameDesc& frameDesc, const ProfileLoader::Profile& profile )
 {
-	LOG_INFO( "Setup audio encoder with:\n" << profile )
+	if( ! profile.empty() )
+	{
+		LOG_INFO( "Setup audio encoder with:\n" << profile )
+	}
 
 	// set sampleRate, number of channels, sample format
 	_codec.setAudioParameters( frameDesc );

diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -38,7 +38,10 @@ VideoEncoder::~VideoEncoder()
 
 void VideoEncoder::setupVideoEncoder( const VideoFrameDesc& frameDesc, const ProfileLoader::Profile& profile )
 {
-	LOG_INFO( "Setup video encoder with:\n" << profile )
+	if( ! profile.empty() )
+	{
+		LOG_INFO( "Setup video encoder with:\n" << profile )
+	}
 
 	// set width, height, pixel format, fps
 	_codec.setImageParameters( frameDesc );

diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -142,11 +142,9 @@ AVStream& FormatContext::addAVStream( const AVCodec& avCodec )
 	return *stream;
 }
 
-bool FormatContext::seek( uint64_t position, const int flag )
+bool FormatContext::seek( const uint64_t position, const int flag )
 {
-	if( (int)getStartTime() != AV_NOPTS_VALUE )
-		position += getStartTime();
-
+	LOG_INFO( "Seek in '" << _avFormatContext->filename << "' at " << position << " (in AV_TIME_BASE units)" )
 	int err = av_seek_frame( _avFormatContext, -1, position, flag );
 	if( err < 0 )
 	{

diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
@@ -77,10 +77,10 @@ class AvExport FormatContext
 	 * @brief Seek at a specific position
 	 * @param position: can be in AV_TIME_BASE units, in frames... depending on the flag value
 	 * @param flag: seeking mode (AVSEEK_FLAG_xxx)
-	 * @note before seek, add offset of start time
 	 * @return seek status
+	 * @see flushDecoder
 	 */
-	bool seek( uint64_t position, const int flag );
+	bool seek( const uint64_t position, const int flag );
 
 	size_t getNbStreams() const { return _avFormatContext->nb_streams; }
 	/// Get duration of the program, in seconds

diff --git a/src/AvTranscoder/file/IOutputFile.hpp b/src/AvTranscoder/file/IOutputFile.hpp
@@ -26,7 +26,6 @@ class AvExport IOutputFile
 
 	/**
 	 * @brief Add a video output stream
-	 * @note call setup() before adding any stream
 	 * @param videoCodec description of output stream
 	**/
 	virtual IOutputStream& addVideoStream( const VideoCodec& videoCodec )
@@ -36,7 +35,6 @@ class AvExport IOutputFile
 
 	/**
 	 * @brief Add an audio output stream
-	 * @note call setup() before adding any stream
 	 * @param audioCodec description of output stream
 	**/
 	virtual IOutputStream& addAudioStream( const AudioCodec& audioCodec )
@@ -46,7 +44,6 @@ class AvExport IOutputFile
 
 	/**
 	 * @brief Add a data output stream
-	 * @note call setup() before adding any stream
 	 * @param dataCodec description of output stream
 	**/
 	virtual IOutputStream& addDataStream( const DataCodec& dataCodec )
@@ -62,7 +59,9 @@ class AvExport IOutputFile
 	/**
 	 * @brief Wrap a packet of data in the output ressource
 	 * @param data coded packet information for the current stream
-	 * @param streamId refers to the stream in output ressource
+	 * @param streamIndex refers to the stream in output ressource
+	 * @return the wrapping status after wrapping
+	 * @see EWrappingStatus
 	**/
 	virtual IOutputStream::EWrappingStatus wrap( const CodedData& data, const size_t streamIndex ) = 0;
 
@@ -73,7 +72,7 @@ class AvExport IOutputFile
 
 	/**
 	 * @brief Get the output stream
-	 * @param streamId select the output stream
+	 * @param streamIndex select the output stream
 	 * @return the output stream reference
 	**/
 	virtual IOutputStream& getStream( const size_t streamIndex ) = 0;

diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -173,8 +173,10 @@ void InputFile::setupUnwrapping( const ProfileLoader::Profile& profile )
 		throw std::runtime_error( msg );
 	}
 
-	// set profile
-	LOG_INFO( "Setup unwrapping with:\n" << profile )
+	if( ! profile.empty() )
+	{
+		LOG_INFO( "Setup unwrapping with:\n" << profile )
+	}
 
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
 	{

diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -73,7 +73,9 @@ IOutputStream& OutputFile::addAudioStream( const AudioCodec& audioDesc )
 
 	stream.codec->sample_rate = audioDesc.getAVCodecContext().sample_rate;
 	stream.codec->channels = audioDesc.getAVCodecContext().channels;
+	stream.codec->channel_layout = audioDesc.getAVCodecContext().channel_layout;
 	stream.codec->sample_fmt = audioDesc.getAVCodecContext().sample_fmt;
+	stream.codec->frame_size = audioDesc.getAVCodecContext().frame_size;
 
 	// need to set the time_base on the AVCodecContext of the AVStream
 	av_reduce(
@@ -99,11 +101,11 @@ IOutputStream& OutputFile::addDataStream( const DataCodec& dataDesc )
 	return *outputStream;
 }
 
-IOutputStream& OutputFile::getStream( const size_t streamId )
+IOutputStream& OutputFile::getStream( const size_t streamIndex )
 {
-	if( streamId >= _outputStreams.size() )
+	if( streamIndex >= _outputStreams.size() )
 		throw std::runtime_error( "unable to get output stream (out of range)" );
-	return *_outputStreams.at( streamId );
+	return *_outputStreams.at( streamIndex );
 }
 
 std::string OutputFile::getFilename() const
@@ -157,16 +159,16 @@ bool OutputFile::beginWrap( )
 	return true;
 }
 
-IOutputStream::EWrappingStatus OutputFile::wrap( const CodedData& data, const size_t streamId )
+IOutputStream::EWrappingStatus OutputFile::wrap( const CodedData& data, const size_t streamIndex )
 {
 	if( ! data.getSize() )
 		return IOutputStream::eWrappingSuccess;
 
-	LOG_DEBUG( "Wrap on stream " << streamId << " (" << data.getSize() << " bytes for frame " << _frameCount.at( streamId ) << ")" )
+	LOG_DEBUG( "Wrap on stream " << streamIndex << " (" << data.getSize() << " bytes for frame " << _frameCount.at( streamIndex ) << ")" )
 
 	AVPacket packet;
 	av_init_packet( &packet );
-	packet.stream_index = streamId;
+	packet.stream_index = streamIndex;
 	packet.data = (uint8_t*)data.getData();
 	packet.size = data.getSize();
 
@@ -175,15 +177,15 @@ IOutputStream::EWrappingStatus OutputFile::wrap( const CodedData& data, const si
 	// free packet.side_data, set packet.data to NULL and packet.size to 0
 	av_free_packet( &packet );
 
-	const double currentStreamDuration = _outputStreams.at( streamId )->getStreamDuration();
+	const double currentStreamDuration = _outputStreams.at( streamIndex )->getStreamDuration();
 	if( currentStreamDuration < _previousProcessedStreamDuration )
 	{
 		// if the current stream is strictly shorter than the previous, wait for more data
 		return IOutputStream::eWrappingWaitingForData;
 	}
 
 	_previousProcessedStreamDuration = currentStreamDuration;
-	_frameCount.at( streamId )++;
+	_frameCount.at( streamIndex )++;
 
 	return IOutputStream::eWrappingSuccess;
 }
@@ -221,7 +223,10 @@ void OutputFile::setupWrapping( const ProfileLoader::Profile& profile )
 		throw std::runtime_error( msg );
 	}
 
-	LOG_INFO( "Setup wrapping with:\n" << profile )
+	if( ! profile.empty() )
+	{
+		LOG_INFO( "Setup wrapping with:\n" << profile )
+	}
 
 	// check if output format indicated is valid with the filename extension
 	if( ! matchFormat( profile.find( constants::avProfileFormat )->second, getFilename() ) )

diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -37,10 +37,10 @@ class AvExport OutputFile : public IOutputFile
 	 * @brief Open ressource, write header, and setup specific wrapping options given when call setupWrapping.
 	 * @note Need to add the streams to mux before calling this method.
 	 * @note After this call, a new list of AVOption, relative to the format choosen, will be available for the OutputFile.
-         */
+	 */
 	bool beginWrap();
 
-	IOutputStream::EWrappingStatus wrap( const CodedData& data, const size_t streamId );
+	IOutputStream::EWrappingStatus wrap( const CodedData& data, const size_t streamIndex );
 
 	/**
 	 * @brief Close ressource and write trailer.
@@ -54,7 +54,7 @@ class AvExport OutputFile : public IOutputFile
 	void addMetadata( const PropertyVector& data );
 	void addMetadata( const std::string& key, const std::string& value );
 
-	IOutputStream& getStream( const size_t streamId );
+	IOutputStream& getStream( const size_t streamIndex );
 
 	std::string getFilename() const;
 

diff --git a/src/AvTranscoder/log.cpp b/src/AvTranscoder/log.cpp
@@ -3,6 +3,8 @@
 namespace avtranscoder
 {
 
+std::string Logger::logHeaderMessage = "";
+
 void callbackToWriteInFile( void *ptr, int level, const char *fmt, va_list vl )
 {
 	std::ofstream outputFile;
@@ -23,13 +25,10 @@ void callbackToWriteInFile( void *ptr, int level, const char *fmt, va_list vl )
 
 void Logger::setLogLevel( const int level )
 {
+	// set ffmpeg log level
 	av_log_set_level( level );
-}
-
-void Logger::log( const int level, const std::string& msg )
-{
-	std::string avTranscoderMsg( "[avTranscoder - " );
 
+	// set avtranscoder header message
 	std::string levelStr;
 	switch( level )
 	{
@@ -48,12 +47,15 @@ void Logger::log( const int level, const std::string& msg )
 		default:
 			break;
 	}
+	Logger::logHeaderMessage = "[avTranscoder - " + levelStr + "] ";
+}
 
-	avTranscoderMsg += levelStr;
-	avTranscoderMsg += "] ";
-	avTranscoderMsg += msg;
-	avTranscoderMsg += "\n";
-	av_log( NULL, level, avTranscoderMsg.c_str() );
+void Logger::log( const int level, const std::string& msg )
+{
+	std::string logMessage = Logger::logHeaderMessage;
+	logMessage += msg;
+	logMessage += "\n";
+	av_log( NULL, level, logMessage.c_str() );
 }
 
 void Logger::logInFile()

diff --git a/src/AvTranscoder/log.hpp b/src/AvTranscoder/log.hpp
@@ -44,6 +44,9 @@ class AvExport Logger
 	 * @note log filename is avtranscoder.log
 	 */
 	static void logInFile();
+
+private:
+	static std::string logHeaderMessage;  ///< First caracters present for each logging message
 };
 
 }

diff --git a/src/AvTranscoder/mediaProperty/StreamProperties.cpp b/src/AvTranscoder/mediaProperty/StreamProperties.cpp
@@ -43,6 +43,13 @@ float StreamProperties::getDuration() const
 	return ( timeBase.num / (float) timeBase.den ) * _formatContext->streams[_streamIndex]->duration;
 }
 
+AVMediaType StreamProperties::getStreamType() const
+{
+	if( ! _formatContext )
+		throw std::runtime_error( "unknown format context" );
+	return _formatContext->streams[_streamIndex]->codec->codec_type;
+}
+
 PropertyVector StreamProperties::getPropertiesAsVector() const
 {
 	PropertyVector data;

diff --git a/src/AvTranscoder/mediaProperty/StreamProperties.hpp b/src/AvTranscoder/mediaProperty/StreamProperties.hpp
@@ -19,10 +19,11 @@ class AvExport StreamProperties
 	size_t getStreamId() const;
 	Rational getTimeBase() const;
 	float getDuration() const;  ///< in seconds
+	AVMediaType getStreamType() const;
 	const PropertyVector& getMetadatas() const { return _metadatas; }
 
 #ifndef SWIG
-	const AVFormatContext& getAVFormatContext() { return *_formatContext; }
+	const AVFormatContext& getAVFormatContext() const { return *_formatContext; }
 #endif
 
 	PropertyMap getPropertiesAsMap() const;  ///< Return all properties as a map (name of property, value)