avTranscoder · MarcAntoine-Arnaud · Apr 17, 2015 · Mar 25, 2015 · Mar 25, 2015 · Mar 25, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -1,9 +1,14 @@
+env:
+  matrix:
+    - DEPENDENCY_MODE=libav
+    - DEPENDENCY_MODE=ffmpeg
+
+language: cpp
+
 os:
   - linux
   - osx
 
-language: cpp
-
 compiler:
   - gcc
   - clang
@@ -28,4 +33,4 @@ script:
   # Launch tests
   - cd ..
   - chmod +x tools/travis.python.nosetests.sh
-  - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./tools/travis.python.nosetests.sh; fi
+  - if [ "${TRAVIS_OS_NAME}" = "linux" && "${DEPENDENCY_MODE}" = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -5,7 +5,7 @@ project(AvTranscoder)
 # Set AvTranscoder versions
 set(AVTRANSCODER_VERSION_MAJOR "0")
 set(AVTRANSCODER_VERSION_MINOR "5")
-set(AVTRANSCODER_VERSION_MICRO "4")
+set(AVTRANSCODER_VERSION_MICRO "5")
 set(AVTRANSCODER_VERSION ${AVTRANSCODER_VERSION_MAJOR}.${AVTRANSCODER_VERSION_MINOR}.${AVTRANSCODER_VERSION_MICRO})
 
 # Define AvTranscoder versions

diff --git a/ressource/v_h264.prf b/ressource/v_h264.prf
diff --git a/ressource/v_h264_hq.prf b/ressource/v_h264_hq.prf
@@ -0,0 +1,9 @@
+avProfileName=h264-hq
+avProfileLongName=H.264 High Quality
+avProfileType=avProfileTypeVideo
+codec=h264
+pix_fmt=yuv422p
+profile=high422
+preset=slow
+tune=fastdecode,zerolatency
+level=5
diff --git a/ressource/v_h264_lq.prf b/ressource/v_h264_lq.prf
@@ -0,0 +1,9 @@
+avProfileName=h264-lq
+avProfileLongName=H.264 Low Quality
+avProfileType=avProfileTypeVideo
+codec=h264
+pix_fmt=yuv420p
+profile=baseline
+preset=ultrafast
+tune=fastdecode,zerolatency
+level=3
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -16,23 +16,19 @@
 
 %{
 #include <AvTranscoder/Library.hpp>
-#include <AvTranscoder/Option.hpp>
 #include <AvTranscoder/log.hpp>
 %}
 
-namespace std {
-%template(IntPair)         pair< size_t, size_t >;
-}
-
 %include "AvTranscoder/progress/progress.i"
 %include "AvTranscoder/mediaProperty/mediaProperty.i"
 %include "AvTranscoder/frame/frame.i"
 %include "AvTranscoder/profile/profile.i"
 
 %include <AvTranscoder/Library.hpp>
-%include <AvTranscoder/Option.hpp>
 %include <AvTranscoder/log.hpp>
 
+%include "AvTranscoder/option.i"
+%include "AvTranscoder/util.i"
 %include "AvTranscoder/codec/codec.i"
 %include "AvTranscoder/stream/stream.i"
 %include "AvTranscoder/decoder/decoder.i"

diff --git a/src/AvTranscoder/decoder/AudioDecoder.cpp b/src/AvTranscoder/decoder/AudioDecoder.cpp
@@ -147,6 +147,8 @@ bool AudioDecoder::decodeNextFrame()
 
 void AudioDecoder::setProfile( const ProfileLoader::Profile& profile )
 {
+	LOG_DEBUG( "Set profile of audio decoder with:\n" << profile )
+
 	AudioCodec& codec = _inputStream->getAudioCodec();
 
 	// set threads before any other options

diff --git a/src/AvTranscoder/decoder/VideoDecoder.cpp b/src/AvTranscoder/decoder/VideoDecoder.cpp
@@ -105,7 +105,9 @@ void VideoDecoder::flushDecoder()
 }
 
 void VideoDecoder::setProfile( const ProfileLoader::Profile& profile )
-{
+{	
+	LOG_DEBUG( "Set profile of video decoder with:\n" << profile )
+
 	VideoCodec& codec = _inputStream->getVideoCodec();
 
 	// set threads before any other options

diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -135,6 +135,8 @@ bool AudioEncoder::encodeFrame( Frame& codedFrame )
 
 void AudioEncoder::setProfile( const ProfileLoader::Profile& profile, const AudioFrameDesc& frameDesc  )
 {
+	LOG_DEBUG( "Set profile of 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
@@ -128,6 +128,8 @@ bool VideoEncoder::encodeFrame( Frame& codedFrame )
 
 void VideoEncoder::setProfile( const ProfileLoader::Profile& profile, const avtranscoder::VideoFrameDesc& frameDesc )
 {
+	LOG_DEBUG( "Set profile of video encoder with:\n" << profile )
+
 	// set width, height, pixel format, fps
 	_codec.setImageParameters( frameDesc );
 

diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -199,7 +199,9 @@ double InputFile::getFps()
 }
 
 void InputFile::setProfile( const ProfileLoader::Profile& profile )
-{	
+{
+	LOG_DEBUG( "Set profile of input file with:\n" << profile )
+
 	for( ProfileLoader::Profile::const_iterator it = profile.begin(); it != profile.end(); ++it )
 	{
 		if( (*it).first == constants::avProfileIdentificator ||

diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -132,9 +132,9 @@ bool OutputFile::endWrap( )
 	return true;
 }
 
-void OutputFile::addMetadata( const PropertiesMap& dataMap )
+void OutputFile::addMetadata( const PropertyVector& data )
 {
-	for( PropertiesMap::const_iterator it = dataMap.begin(); it != dataMap.end(); ++it )
+	for( PropertyVector::const_iterator it = data.begin(); it != data.end(); ++it )
 	{
 		addMetadata( it->first, it->second );
 	}
@@ -147,6 +147,8 @@ void OutputFile::addMetadata( const std::string& key, const std::string& value )
 
 void OutputFile::setProfile( const ProfileLoader::Profile& profile )
 {
+	LOG_DEBUG( "Set profile of output file with:\n" << profile )
+
 	// check if output format indicated is valid with the filename extension
 	if( ! matchFormat( profile.find( constants::avProfileFormat )->second, _filename ) )
 	{

diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -41,7 +41,7 @@ class AvExport OutputFile : public IOutputFile
 	 * @brief Add metadata to the output file.
 	 * @note Depending on the format, you are not sure to find your metadata after the transcode.
 	 */
-	void addMetadata( const PropertiesMap& dataMap );
+	void addMetadata( const PropertyVector& data );
 	void addMetadata( const std::string& key, const std::string& value );
 
 	IOutputStream& getStream( const size_t streamId );

diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.cpp b/src/AvTranscoder/mediaProperty/AttachementProperties.cpp
diff --git a/src/AvTranscoder/mediaProperty/AttachementProperties.hpp b/src/AvTranscoder/mediaProperty/AttachementProperties.hpp
@@ -1,33 +1,17 @@
 #ifndef _AV_TRANSCODER_MEDIA_PROPERTY_ATTACHEMENT_PROPERTIES_HPP
 #define _AV_TRANSCODER_MEDIA_PROPERTY_ATTACHEMENT_PROPERTIES_HPP
 
-#include <AvTranscoder/common.hpp>
-#include <AvTranscoder/mediaProperty/util.hpp>
-#include <AvTranscoder/file/FormatContext.hpp>
+#include <AvTranscoder/mediaProperty/StreamProperties.hpp>
 
 namespace avtranscoder
 {
 
-class AvExport AttachementProperties
+class AvExport AttachementProperties: public StreamProperties
 {
 public:
-	AttachementProperties( const FormatContext& formatContext, const size_t index );
-
-	size_t getStreamIndex() const { return _streamIndex; }
-	size_t getStreamId() const;
-	PropertiesMap& getMetadatas() { return _metadatas; }
-
-#ifndef SWIG
-	const AVFormatContext& getAVFormatContext() { return *_formatContext; }
-#endif
-
-	PropertiesMap getPropertiesAsMap() const;  ///< Return all attachement properties as a map (name of property: value)
-
-private:
-	const AVFormatContext* _formatContext;  ///< Has link (no ownership)
-
-	size_t _streamIndex;
-	PropertiesMap _metadatas;
+	AttachementProperties( const FormatContext& formatContext, const size_t index )
+	    : StreamProperties( formatContext, index )
+	{}
 };
 
 }

diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -14,10 +14,7 @@ namespace avtranscoder
 {
 
 AudioProperties::AudioProperties( const FormatContext& formatContext, const size_t index )
-	: _formatContext( &formatContext.getAVFormatContext() )
-	, _codecContext( NULL )
-	, _codec( NULL )
-	, _streamIndex( index )
+	: StreamProperties( formatContext, index )
 {
 	if( _formatContext )
 		_codecContext = _formatContext->streams[index]->codec;
@@ -202,33 +199,34 @@ double AudioProperties::getDuration() const
 	return duration;
 }
 
-PropertiesMap AudioProperties::getPropertiesAsMap() const
-{
-	PropertiesMap dataMap;
-
-	addProperty( dataMap, "streamId", &AudioProperties::getStreamId );
-	addProperty( dataMap, "codecId", &AudioProperties::getCodecId );
-	addProperty( dataMap, "codecName", &AudioProperties::getCodecName );
-	addProperty( dataMap, "codecLongName", &AudioProperties::getCodecLongName );
-	addProperty( dataMap, "sampleFormatName", &AudioProperties::getSampleFormatName );
-	addProperty( dataMap, "sampleFormatLongName", &AudioProperties::getSampleFormatLongName );
-	addProperty( dataMap, "sampleRate", &AudioProperties::getSampleRate );
-	addProperty( dataMap, "bitRate", &AudioProperties::getBitRate );
-	addProperty( dataMap, "nbSamples", &AudioProperties::getNbSamples );
-	addProperty( dataMap, "channels", &AudioProperties::getChannels );
-	addProperty( dataMap, "channelLayout", &AudioProperties::getChannelLayout );
-	addProperty( dataMap, "channelName", &AudioProperties::getChannelName );
-	addProperty( dataMap, "channelDescription", &AudioProperties::getChannelDescription );
-	addProperty( dataMap, "ticksPerFrame", &AudioProperties::getTicksPerFrame );
-	addProperty( dataMap, "timeBase", &AudioProperties::getTimeBase );
-	addProperty( dataMap, "duration", &AudioProperties::getDuration );
+PropertyVector AudioProperties::getPropertiesAsVector() const
+{
+	PropertyVector data;
+
+	addProperty( data, "streamId", &AudioProperties::getStreamId );
+	detail::add( data, "streamIndex", getStreamIndex() );
+	addProperty( data, "codecId", &AudioProperties::getCodecId );
+	addProperty( data, "codecName", &AudioProperties::getCodecName );
+	addProperty( data, "codecLongName", &AudioProperties::getCodecLongName );
+	addProperty( data, "sampleFormatName", &AudioProperties::getSampleFormatName );
+	addProperty( data, "sampleFormatLongName", &AudioProperties::getSampleFormatLongName );
+	addProperty( data, "sampleRate", &AudioProperties::getSampleRate );
+	addProperty( data, "bitRate", &AudioProperties::getBitRate );
+	addProperty( data, "nbSamples", &AudioProperties::getNbSamples );
+	addProperty( data, "channels", &AudioProperties::getChannels );
+	addProperty( data, "channelLayout", &AudioProperties::getChannelLayout );
+	addProperty( data, "channelName", &AudioProperties::getChannelName );
+	addProperty( data, "channelDescription", &AudioProperties::getChannelDescription );
+	addProperty( data, "ticksPerFrame", &AudioProperties::getTicksPerFrame );
+	addProperty( data, "timeBase", &AudioProperties::getTimeBase );
+	addProperty( data, "duration", &AudioProperties::getDuration );
 
 	for( size_t metadataIndex = 0; metadataIndex < _metadatas.size(); ++metadataIndex )
 	{
-		detail::add( dataMap, _metadatas.at( metadataIndex ).first, _metadatas.at( metadataIndex ).second );
+		detail::add( data, _metadatas.at( metadataIndex ).first, _metadatas.at( metadataIndex ).second );
 	}
 
-	return dataMap;
+	return data;
 }
 
 }
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.hpp b/src/AvTranscoder/mediaProperty/AudioProperties.hpp
@@ -1,16 +1,14 @@
 #ifndef _AV_TRANSCODER_MEDIA_PROPERTY_AUDIO_PROPERTIES_HPP
 #define _AV_TRANSCODER_MEDIA_PROPERTY_AUDIO_PROPERTIES_HPP
 
-#include <AvTranscoder/common.hpp>
-#include <AvTranscoder/mediaProperty/util.hpp>
-#include <AvTranscoder/file/FormatContext.hpp>
+#include <AvTranscoder/mediaProperty/StreamProperties.hpp>
 
 #include <string>
 
 namespace avtranscoder
 {
 
-class AvExport AudioProperties
+class AvExport AudioProperties : public StreamProperties
 {
 public:
 	AudioProperties( const FormatContext& formatContext, const size_t index );
@@ -23,7 +21,6 @@ class AvExport AudioProperties
 	std::string getChannelName() const;
 	std::string getChannelDescription() const;
 
-	size_t getStreamIndex() const { return _streamIndex; }
 	size_t getStreamId() const;
 	size_t getCodecId() const;
 	size_t getSampleRate() const;
@@ -35,38 +32,31 @@ class AvExport AudioProperties
 	Rational getTimeBase() const;
 	double getDuration() const;
 
-	PropertiesMap& getMetadatas() { return _metadatas; }
-
 #ifndef SWIG
-	const AVFormatContext& getAVFormatContext() { return *_formatContext; }
 	AVCodecContext& getAVCodecContext() { return *_codecContext; }
 #endif
 
-	PropertiesMap getPropertiesAsMap() const;  ///< Return all audio properties as a map (name of property: value)
+	PropertyVector getPropertiesAsVector() const;
 
 private:
 #ifndef SWIG
 	template<typename T>
-	void addProperty( PropertiesMap& dataMap, const std::string& key, T (AudioProperties::*getter)(void) const ) const
+	void addProperty( PropertyVector& data, const std::string& key, T (AudioProperties::*getter)(void) const ) const
 	{
 		try
 		{
-		    detail::add( dataMap, key, (this->*getter)() );
+		    detail::add( data, key, (this->*getter)() );
 		}
 		catch( const std::exception& e )
 		{
-		    detail::add( dataMap, key, e.what() );
+		    detail::add( data, key, e.what() );
 		}
 	}
 #endif
 
 private:
-	const AVFormatContext* _formatContext;  ///< Has link (no ownership)
 	AVCodecContext* _codecContext;  ///< Has link (no ownership)
 	AVCodec* _codec; ///< Has link (no ownership)
-
-	size_t _streamIndex;
-	PropertiesMap _metadatas;
 };
 
 }