avTranscoder · MarcAntoine-Arnaud · Apr 30, 2015 · Apr 21, 2015 · Apr 21, 2015 · Apr 21, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -1,4 +1,8 @@
 env:
+  global:
+     - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build
+     - AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install
+     - J='-j3'
   matrix:
     - DEPENDENCY_MODE=libav
     - DEPENDENCY_MODE=ffmpeg
@@ -18,19 +22,27 @@ before_script:
   - date -u
   - uname -a
 
-  - chmod +x tools/travis.linux.install.deps.sh
-  - chmod +x tools/travis.osx.install.deps.sh
-
+  - cd ${TRAVIS_BUILD_DIR}
+
+  # install coverage tools
+  - ./tools/travis.gcc.install.coverage.sh
+
+  # install avtranscoder dependencies
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi
   - if [ "${TRAVIS_OS_NAME}" = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi
 
 script:
   # Build
-  - mkdir build
-  - cd build
-  - cmake .. -DCMAKE_INSTALL_PREFIX=`pwd`/dist
-  - make install
+  - mkdir -p ${AVTRANSCODER_BUILD}
+  - cd ${AVTRANSCODER_BUILD}
+  - cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL} -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=True
+  - make $J install
+
   # Launch tests
-  - cd ..
-  - chmod +x tools/travis.python.nosetests.sh
-  - if [ "${TRAVIS_OS_NAME}" = "linux" && "${DEPENDENCY_MODE}" = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi
+  - if [ "${DEPENDENCY_MODE}" = "ffmpeg" ]; then ./../tools/travis.python.nosetests.sh; fi
+
+after_success:
+  - cd ${TRAVIS_BUILD_DIR}
+
+  # generate coverage for coveralls
+  - if [ "${CC}" = "gcc" ]; then ./tools/travis.gcc.generate.coverage.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 "5")
+set(AVTRANSCODER_VERSION_MICRO "6")
 set(AVTRANSCODER_VERSION ${AVTRANSCODER_VERSION_MAJOR}.${AVTRANSCODER_VERSION_MINOR}.${AVTRANSCODER_VERSION_MICRO})
 
 # Define AvTranscoder versions
@@ -28,6 +28,10 @@ else()
 	set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fPIC -O3")
 endif()
 
+# CPP flag to create code coverage report
+if(AVTRANSCODER_COVERAGE)
+	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
+endif()
 
 add_subdirectory(src)
 

diff --git a/INSTALL.md b/INSTALL.md
@@ -45,18 +45,29 @@ cmake .. -DCMAKE_INSTALL_PREFIX=/path/to/install
 ```
 cmake .. -DCMAKE_BUILD_TYPE=Release/Debug
 ```
+###### To build python binding with a specific python version
+```
+cmake .. -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7
+```
 
 #### Mac OSX using homebrew
 
 ###### Install homebrew
 http://brew.sh/
 
 ###### Install avTranscoder
+Last stable version:
 ```
 brew tap cbenhagen/video
 brew install avtranscoder
 ```
 
+From develop branch:
+```
+brew tap cbenhagen/video
+brew install avtranscoder --devel
+```
+
 ###### Use homebrew to install only dependencies
 ```
 brew deps avtranscoder

diff --git a/README.md b/README.md
@@ -4,6 +4,10 @@ C++ API for Libav / FFmpeg
 
 Based on Libav/FFmpeg libraries to support various video and audio formats, avTranscoder provides the high level API to re-wrap or transcode media easily.
 
+[![Build Status](https://travis-ci.org/avTranscoder/avTranscoder.svg?branch=master)](https://travis-ci.org/avTranscoder/avTranscoder)
+[![Coverage Status](https://coveralls.io/repos/avTranscoder/avTranscoder/badge.svg)](https://coveralls.io/r/avTranscoder/avTranscoder)
+<a href="https://scan.coverity.com/projects/2626"><img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/2626/badge.svg"/></a>
+
 #### What you need to know
 * C++ library
 * Java and Python bindings generated with SWIG
@@ -47,20 +51,6 @@ avProfileType=avProfileTypeAudio
 codec=codecName
 ```
 
-#### Continuous Integration
-
-###### Drone.io  
-[![Build Status](https://drone.io/github.com/avTranscoder/avTranscoder/status.png)](https://drone.io/github.com/avTranscoder/avTranscoder/latest)
-
-###### Travis
-[![Build Status](https://travis-ci.org/avTranscoder/avTranscoder.svg?branch=master)](https://travis-ci.org/avTranscoder/avTranscoder)
-
-###### Coverity Scan  
-<a href="https://scan.coverity.com/projects/2626">
-  <img alt="Coverity Scan Build Status"
-       src="https://scan.coverity.com/projects/2626/badge.svg"/>
-</a>
-
 #### Tests
 
 ###### nosetests

diff --git a/app/pyThumbnail/pythumbnail.py b/app/pyThumbnail/pythumbnail.py
@@ -12,7 +12,7 @@
 parser.add_argument('inputFileName', help='It could be any media file with at least one video stream (video, image...). Support file without extension.')
 # options
 parser.add_argument("-o", "--outputFile", dest="outputFileName", default="thumbnail.jpg", help="Set the output filename (thumbnail.jpg by default). Must be with jpg extension!")
-parser.add_argument("-t", "--time", dest="time", type=int, default=0, help="Set time (in seconds) of where to seek in the video stream to generate the thumbnail (0 by default).")
+parser.add_argument("-t", "--time", dest="time", type=float, default=0, help="Set time (in seconds) of where to seek in the video stream to generate the thumbnail (0 by default).")
 parser.add_argument("-f", "--frame", dest="frame", type=int, default=0, help="Set time (in frames) of where to seek in the video stream to generate the thumbnail (0 by default). Warning: priority to frame if user indicates both frame and time!")
 parser.add_argument("-w", "--width", dest="width", type=int, default=0, help="Override the width of the thumbnail (same as input by default).")
 parser.add_argument("-he", "--height", dest="height", type=int, default=0, help="Override the height of the thumbnail (same as input by default).")

diff --git a/ressource/v_dnxhd175x.prf b/ressource/v_dnxhd175x.prf
@@ -0,0 +1,10 @@
+avProfileName=dnxhd175x
+avProfileLongName=DNxHD 175Mbps 10bits 1920x1080 25fps
+avProfileType=avProfileTypeVideo
+codec=dnxhd
+width=1920
+height=1080
+pix_fmt=yuv422p10le
+b=175M
+g=1
+r=25
diff --git a/ressource/v_dnxhd36.prf b/ressource/v_dnxhd36.prf
@@ -0,0 +1,10 @@
+avProfileName=dnxhd36
+avProfileLongName=DNxHD 36Mbps 8bits 1920x1080 25fps
+avProfileType=avProfileTypeVideo
+codec=dnxhd
+width=1920
+height=1080
+pix_fmt=yuv422p
+b=36M
+g=1
+r=25
diff --git a/src/AvTranscoder/decoder/AudioGenerator.cpp b/src/AvTranscoder/decoder/AudioGenerator.cpp
@@ -70,7 +70,7 @@ bool AudioGenerator::decodeNextFrame( Frame& frameBuffer )
 
 bool AudioGenerator::decodeNextFrame( Frame& frameBuffer, const size_t subStreamIndex )
 {
-	return false;
+	return decodeNextFrame( frameBuffer );
 }
 
 }
diff --git a/src/AvTranscoder/file/FormatContext.cpp b/src/AvTranscoder/file/FormatContext.cpp
@@ -6,12 +6,13 @@
 namespace avtranscoder
 {
 
-FormatContext::FormatContext( const std::string& filename, int req_flags )
+FormatContext::FormatContext( const std::string& filename, int req_flags, AVDictionary** options )
 	: _avFormatContext( NULL )
+	, _flags( req_flags )
 	, _options()
 	, _isOpen( false )
 {
-	int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, NULL );
+	int ret = avformat_open_input( &_avFormatContext, filename.c_str(), NULL, options );
 	if( ret < 0 )
 	{
 		std::string msg = "unable to open file ";
@@ -21,11 +22,16 @@ FormatContext::FormatContext( const std::string& filename, int req_flags )
 		throw std::ios_base::failure( msg );
 	}
 	_isOpen = true;
+
 	loadOptions( _options, _avFormatContext, req_flags );
+	// when demuxing, priv_data of AVFormatContext is set by avformat_open_input()
+	if( _avFormatContext->iformat->priv_class )
+		loadOptions( _options, _avFormatContext->priv_data, req_flags );
 }
 
 FormatContext::FormatContext( int req_flags )
 	: _avFormatContext( NULL )
+	, _flags( req_flags )
 	, _options()
 	, _isOpen( false )
 {
@@ -85,6 +91,9 @@ void FormatContext::writeHeader( AVDictionary** options )
 	{
 		throw std::runtime_error( "could not write header: " + getDescriptionFromErrorCode( ret ) );
 	}
+	// when muxing, priv_data of AVFormatContext is set by avformat_write_header()
+	if( _avFormatContext->oformat->priv_class )
+		loadOptions( _options, _avFormatContext->priv_data, _flags );
 }
 
 void FormatContext::writeFrame( AVPacket& packet, bool interleaved )
@@ -133,6 +142,17 @@ AVStream& FormatContext::addAVStream( const AVCodec& avCodec )
 	return *stream;
 }
 
+void FormatContext::seek( uint64_t position, const int flag )
+{
+	if( (int)getStartTime() != AV_NOPTS_VALUE )
+		position += getStartTime();
+
+	if( av_seek_frame( _avFormatContext, -1, position, flag ) < 0 )
+	{
+		LOG_ERROR( "Error when seek at " << position << " (in AV_TIME_BASE units) in file" )
+	}
+}
+
 std::vector<Option> FormatContext::getOptions()
 {
 	std::vector<Option> optionsArray;

diff --git a/src/AvTranscoder/file/FormatContext.hpp b/src/AvTranscoder/file/FormatContext.hpp
@@ -21,8 +21,16 @@ class AvExport FormatContext
 	FormatContext& operator=( const FormatContext& formatContext );
 
 public:
-	FormatContext( const std::string& filename, int req_flags = 0 );  ///< Allocate an AVFormatContext by opening an input file
-	FormatContext( int req_flags = 0 );  ///< Allocate an AVFormatContext with default values
+	/**
+	 * @brief Allocate an AVFormatContext by opening an input file
+         */
+	FormatContext( const std::string& filename, int req_flags = 0, AVDictionary** options = NULL );
+
+	/**
+	 * @brief Allocate an AVFormatContext with default values
+         */
+	FormatContext( int req_flags = 0 );
+
 	~FormatContext();
 
 	/**
@@ -43,7 +51,11 @@ class AvExport FormatContext
 	 */
 	void closeRessource();
 
-	void writeHeader( AVDictionary** options = NULL );  ///< Write the stream header to an output media file
+	/**
+	 * @brief Write the stream header to an output media file
+	 * @note Also load options specific to the output format
+	 */
+	void writeHeader( AVDictionary** options = NULL );
 
 	/**
 	 * @brief Write a packet to an output media file
@@ -61,6 +73,14 @@ class AvExport FormatContext
 	void addMetaData( const std::string& key, const std::string& value );
 	AVStream& addAVStream( const AVCodec& avCodec );
 
+	/**
+	 * @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
+	 */
+	void seek( uint64_t position, const int flag );
+
 	size_t getNbStreams() const { return _avFormatContext->nb_streams; }
 	/// Get duration of the program, in seconds
 	size_t getDuration() const { return _avFormatContext->duration; }
@@ -90,6 +110,7 @@ class AvExport FormatContext
 
 private:
 	AVFormatContext* _avFormatContext;  ///< Has ownership
+	const int _flags;  ///< Flags with which the options are loaded (see AV_OPT_FLAG_xxx)
 	OptionMap _options;
 	bool _isOpen;  ///< Is the AVFormatContext open (in constructor with a filename)
 };

diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -7,7 +7,6 @@
 #include <AvTranscoder/mediaProperty/SubtitleProperties.hpp>
 #include <AvTranscoder/mediaProperty/AttachementProperties.hpp>
 #include <AvTranscoder/mediaProperty/UnknownProperties.hpp>
-#include <AvTranscoder/progress/NoDisplayProgress.hpp>
 
 extern "C" {
 #include <libavcodec/avcodec.h>
@@ -29,10 +28,6 @@ InputFile::InputFile( const std::string& filename )
 {
 	_formatContext.findStreamInfo();
 
-	// Analyse header
-	NoDisplayProgress p;
-	analyse( p, eAnalyseLevelHeader );
-
 	// Create streams
 	for( size_t streamIndex = 0; streamIndex < _formatContext.getNbStreams(); ++streamIndex )
 	{
@@ -50,60 +45,7 @@ InputFile::~InputFile()
 
 void InputFile::analyse( IProgress& progress, const EAnalyseLevel level )
 {
-	_properties.clearStreamProperties();
-
-	if( level > eAnalyseLevelHeader )
-		seekAtFrame( 0 );
-
-	for( size_t streamIndex = 0; streamIndex < _formatContext.getNbStreams(); streamIndex++ )
-	{
-		switch( _formatContext.getAVStream( streamIndex ).codec->codec_type )
-		{
-			case AVMEDIA_TYPE_VIDEO:
-			{
-				VideoProperties properties( _formatContext, streamIndex, progress, level );
-				_properties.getVideoProperties().push_back( properties );
-				break;
-			}
-			case AVMEDIA_TYPE_AUDIO:
-			{
-				AudioProperties properties( _formatContext, streamIndex );
-				_properties.getAudioProperties().push_back( properties );
-				break;
-			}
-			case AVMEDIA_TYPE_DATA:
-			{
-				DataProperties properties( _formatContext, streamIndex );
-				_properties.getDataProperties().push_back( properties );
-				break;
-			}
-			case AVMEDIA_TYPE_SUBTITLE:
-			{
-				SubtitleProperties properties( _formatContext, streamIndex );
-				_properties.getSubtitleProperties().push_back( properties );
-				break;
-			}
-			case AVMEDIA_TYPE_ATTACHMENT:
-			{
-				AttachementProperties properties( _formatContext, streamIndex );
-				_properties.getAttachementProperties().push_back( properties );
-				break;
-			}
-			case AVMEDIA_TYPE_UNKNOWN:
-			{
-				UnknownProperties properties( _formatContext, streamIndex );
-				_properties.getUnknownPropertiesProperties().push_back( properties );
-				break;
-			}
-			case AVMEDIA_TYPE_NB:
-			{
-				break;
-			}
-		}
-	}
-
-	if( level > eAnalyseLevelHeader )
-		seekAtFrame( 0 );
+	_properties.extractStreamProperties( progress, level );
 }
 
 FileProperties InputFile::analyseFile( const std::string& filename, IProgress& progress, const EAnalyseLevel level )
@@ -144,29 +86,13 @@ bool InputFile::readNextPacket( CodedData& data, const size_t streamIndex )
 void InputFile::seekAtFrame( const size_t frame )
 {
 	uint64_t position = frame / getFps() * AV_TIME_BASE;
-	seek( position );
+	_formatContext.seek( position, AVSEEK_FLAG_BACKWARD );
 }
 
 void InputFile::seekAtTime( const double time )
 {
 	uint64_t position = time * AV_TIME_BASE;
-	seek( position );
-}
-
-void InputFile::seek( uint64_t position )
-{
-	if( (int)_formatContext.getStartTime() != AV_NOPTS_VALUE )
-		position += _formatContext.getStartTime();
-
-	if( av_seek_frame( &_formatContext.getAVFormatContext(), -1, position, AVSEEK_FLAG_BACKWARD ) < 0 )
-	{
-		LOG_ERROR( "Error when seek at " << position << " (in AV_TIME_BASE units) in file" )
-	}
-
-	for( std::vector<InputStream*>::iterator it = _inputStreams.begin(); it != _inputStreams.end(); ++it )
-	{
-		(*it)->clearBuffering();
-	}
+	_formatContext.seek( position, AVSEEK_FLAG_BACKWARD );
 }
 
 void InputFile::activateStream( const size_t streamIndex, bool activate )