Merge branch 'develop' of https://github.com/avTranscoder/avTranscoder into dev_transcoderUseComplexFilterToMapAudio

Clement Champetier · Clement Champetier · commit cc6d03f93892 · 2016-07-21T12:02:38.000+02:00
Conflicts:
	test/pyTest/testSetFrame.py
diff --git a/.gitignore b/.gitignore
@@ -21,3 +21,7 @@ CMakeFiles
 Makefile
 cmake_install.cmake
 install_manifest.txt
+
+# Python
+*.pyc
+
diff --git a/.travis.yml b/.travis.yml
@@ -31,6 +31,7 @@ env:
      - FDKAAC_VERSION=0.1.3
      - OGG_VERSION=1.3.2
      - VORBIS_VERSION=1.3.4
+     - THEORA_VERSION=1.1.1
      - VPX_VERSION=1.4.0
   matrix:
     - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
diff --git a/app/avProcessor/avProcessor.cpp b/app/avProcessor/avProcessor.cpp
@@ -41,7 +41,7 @@ void parseConfigFile(const std::string& configFilename, avtranscoder::Transcoder
 
                 // generated stream
                 if(!filename.length())
-                    transcoder.addGeneratedStream(transcodeProfile);
+                    transcoder.addGenerateStream(transcodeProfile);
                 else
                 {
                     avtranscoder::InputStreamDesc inputDesc(filename, streamIndex, channelIndexArray);
diff --git a/src/AvTranscoder/Library.hpp b/src/AvTranscoder/Library.hpp
@@ -1,7 +1,7 @@
 #ifndef _AV_TRANSCODER_DESCRIPTION_HPP_
 #define _AV_TRANSCODER_DESCRIPTION_HPP_
 
-#include "common.hpp"
+#include <AvTranscoder/common.hpp>
 
 #include <vector>
 #include <string>
diff --git a/src/AvTranscoder/Option.hpp b/src/AvTranscoder/Option.hpp
@@ -50,11 +50,11 @@ class AvExport Option
 
     // flags
     int getFlags() const { return _avOption->flags; }
-    bool isEncodingOpt() const { return (_avOption->flags & AV_OPT_FLAG_ENCODING_PARAM) == AV_OPT_FLAG_ENCODING_PARAM; }
-    bool isDecodingOpt() const { return (_avOption->flags & AV_OPT_FLAG_DECODING_PARAM) == AV_OPT_FLAG_DECODING_PARAM; }
-    bool isAudioOpt() const { return (_avOption->flags & AV_OPT_FLAG_AUDIO_PARAM) == AV_OPT_FLAG_AUDIO_PARAM; }
-    bool isVideoOpt() const { return (_avOption->flags & AV_OPT_FLAG_VIDEO_PARAM) == AV_OPT_FLAG_VIDEO_PARAM; }
-    bool isSubtitleOpt() const { return (_avOption->flags & AV_OPT_FLAG_SUBTITLE_PARAM) == AV_OPT_FLAG_SUBTITLE_PARAM; }
+    bool isEncodingOpt() const { return (getFlags() & AV_OPT_FLAG_ENCODING_PARAM) == AV_OPT_FLAG_ENCODING_PARAM; }
+    bool isDecodingOpt() const { return (getFlags() & AV_OPT_FLAG_DECODING_PARAM) == AV_OPT_FLAG_DECODING_PARAM; }
+    bool isAudioOpt() const { return (getFlags() & AV_OPT_FLAG_AUDIO_PARAM) == AV_OPT_FLAG_AUDIO_PARAM; }
+    bool isVideoOpt() const { return (getFlags() & AV_OPT_FLAG_VIDEO_PARAM) == AV_OPT_FLAG_VIDEO_PARAM; }
+    bool isSubtitleOpt() const { return (getFlags() & AV_OPT_FLAG_SUBTITLE_PARAM) == AV_OPT_FLAG_SUBTITLE_PARAM; }
 
     // get default value
     bool getDefaultBool() const;
diff --git a/src/AvTranscoder/avTranscoder.i b/src/AvTranscoder/avTranscoder.i
@@ -16,20 +16,14 @@
 %include "AvTranscoder/swig/avSeek.i"
 %include "AvTranscoder/swig/avOperator.i"
 
-%{
-#include <AvTranscoder/log.hpp>
-%}
-
+%include "AvTranscoder/log.i"
+%include "AvTranscoder/library.i"
+%include "AvTranscoder/option.i"
+%include "AvTranscoder/util.i"
 %include "AvTranscoder/progress/progress.i"
 %include "AvTranscoder/properties/properties.i"
 %include "AvTranscoder/profile/profile.i"
 %include "AvTranscoder/data/data.i"
-
-%include <AvTranscoder/log.hpp>
-
-%include "AvTranscoder/library.i"
-%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/log.i b/src/AvTranscoder/log.i
@@ -0,0 +1,7 @@
+%{
+#include <AvTranscoder/common.hpp>
+#include <AvTranscoder/log.hpp>
+%}
+
+%include <AvTranscoder/common.hpp>
+%include <AvTranscoder/log.hpp>
diff --git a/src/AvTranscoder/transcoder/Transcoder.cpp b/src/AvTranscoder/transcoder/Transcoder.cpp
@@ -83,13 +83,13 @@ void Transcoder::addStream(const std::vector<InputStreamDesc>& inputStreamDescAr
     addTranscodeStream(inputStreamDescArray, profile, offset);
 }
 
-void Transcoder::addGeneratedStream(const std::string& encodingProfileName)
+void Transcoder::addGenerateStream(const std::string& encodingProfileName)
 {
     const ProfileLoader::Profile& encodingProfile = _profileLoader.getProfile(encodingProfileName);
-    addGeneratedStream(encodingProfile);
+    addGenerateStream(encodingProfile);
 }
 
-void Transcoder::addGeneratedStream(const ProfileLoader::Profile& encodingProfile)
+void Transcoder::addGenerateStream(const ProfileLoader::Profile& encodingProfile)
 {
     // Add profile
     if(!_profileLoader.hasProfile(encodingProfile))
diff --git a/src/AvTranscoder/transcoder/Transcoder.hpp b/src/AvTranscoder/transcoder/Transcoder.hpp
@@ -74,8 +74,8 @@ class AvExport Transcoder
 
     //@{
     // @brief Add a new generated stream to the output file, created from the given encoding profile.
-    void addGeneratedStream(const std::string& encodingProfileName);
-    void addGeneratedStream(const ProfileLoader::Profile& encodingProfile);
+    void addGenerateStream(const std::string& encodingProfileName);
+    void addGenerateStream(const ProfileLoader::Profile& encodingProfile);
     //@}
 
     /**
diff --git a/test/pyTest/testLog.py b/test/pyTest/testLog.py
@@ -0,0 +1,33 @@
+import os
+from nose.tools import *
+
+from pyAvTranscoder import avtranscoder as av
+
+
+def _logMessages(logger):
+    """
+    Local function to log several messages.
+    """
+    logger.log(av.AV_LOG_DEBUG, 'This is a debug message!')
+    logger.log(av.AV_LOG_INFO, 'This is an info message!')
+    logger.log(av.AV_LOG_WARNING, 'This is a warning message!')
+    logger.log(av.AV_LOG_ERROR, 'This is an error message!')
+
+
+def testLogInFile():
+    """
+    Check the behavior of the logger file.
+    """
+    logger = av.Logger()
+    # log several messages in the standard output
+    _logMessages(logger)
+
+    # redirect the output of the logging messages
+    logger.logInFile()
+    # the logger message should exist and be empty
+    assert_equals(os.stat(av.LOG_FILE).st_size, 0)
+
+    # log several messages in the logger file
+    _logMessages(logger)
+    # the logger message should exist and be filled
+    assert_greater(os.stat(av.LOG_FILE).st_size, 0)
diff --git a/test/pyTest/testOffset.py b/test/pyTest/testOffset.py
@@ -15,22 +15,6 @@
 from pyAvTranscoder import avtranscoder as av
 
 
-@raises(RuntimeError)
-def testRewrapVideoPositiveOffsetWithoutGenerator():
-    """
-    Add a positive offset supposed to have a generator.
-    Depending on the codec and the given parameters, the generator could not be instanciate.
-    """
-    inputFileName = os.environ['AVTRANSCODER_TEST_VIDEO_RAW_FILE']
-    outputFileName = "testPositiveOffsetWithoutGenerator.h264"
-    offset = 10
-
-    ouputFile = av.OutputFile( outputFileName )
-    transcoder = av.Transcoder( ouputFile )
-
-    transcoder.addStream( av.InputStreamDesc(inputFileName, 0), "", offset )
-
-
 def testTranscodeAudioPositiveOffset():
     """
     Transcode one audio stream (profile wave24b48kmono) with offset at the beginning of the process.
diff --git a/test/pyTest/testOption.py b/test/pyTest/testOption.py
@@ -0,0 +1,97 @@
+import os
+
+# Check if environment is setup to run the tests
+if os.environ.get('AVTRANSCODER_TEST_AUDIO_WAVE_FILE') is None or \
+    os.environ.get('AVTRANSCODER_TEST_AUDIO_MOV_FILE') is None:
+    from nose.plugins.skip import SkipTest
+    raise SkipTest("Need to define environment variables "
+        "AVTRANSCODER_TEST_AUDIO_WAVE_FILE and "
+        "AVTRANSCODER_TEST_AUDIO_MOV_FILE")
+
+from nose.tools import *
+
+from pyAvTranscoder import avtranscoder as av
+
+
+@raises(IndexError)
+def testAccessOfUnknownAudioCodecOptions():
+    """
+    Check access to an unknown codec option.
+    """
+    optionName = 'a'
+    inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE']
+    inputFile = av.InputFile(inputFileName)
+    audioProperties = inputFile.getProperties().getAudioProperties()[0]
+
+    audioProperties.getCodecOption(optionName)
+    
+
+def testAccessOfKnownCodecOptionInAudioStream():
+    """
+    Check access to a known codec option from an audio stream.
+    """
+    optionName = 'b'
+    inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_WAVE_FILE']
+    inputFile = av.InputFile(inputFileName)
+    audioProperties = inputFile.getProperties().getAudioProperties()[0]
+
+    option = audioProperties.getCodecOption(optionName)
+
+    # common attributes
+    assert_equals(option.getName(), optionName)
+    assert_equals(option.getHelp(), 'set bitrate (in bits/s)')
+    assert_equals(option.getType(), av.eOptionBaseTypeInt)
+    assert_greater(option.getOffset(), 0)
+    assert_equals(option.getMin(), 0.0)
+    assert_greater(option.getMax(), 0.0)
+    assert_greater(option.getMax(), 0.0)
+
+    # flags
+    assert_equals(option.isEncodingOpt(), True)
+    assert_equals(option.isDecodingOpt(), False)
+    assert_equals(option.isAudioOpt(), True)
+    assert_equals(option.isVideoOpt(), True)
+    assert_equals(option.isSubtitleOpt(), False)
+
+    # value
+    assert_equals(option.getInt(), audioProperties.getBitRate())
+    assert_equals(option.getDefaultInt(), 200000)  # see AV_CODEC_DEFAULT_BITRATE
+
+    # childs
+    assert_equals(option.hasChild(), False)
+    assert_equals(len(option.getChilds()), 0)
+
+
+def testAccessOfKnownCodecOptionInVideoStream():
+    """
+    Check access to a known codec option from a video stream.
+    """
+    optionName = 'flags'
+    inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_MOV_FILE']
+    inputFile = av.InputFile(inputFileName)
+    videoProperties = inputFile.getProperties().getVideoProperties()[0]
+
+    option = videoProperties.getCodecOption(optionName)
+
+    # common attributes
+    assert_equals(option.getName(), optionName)
+    assert_equals(option.getUnit(), optionName)
+    assert_equals(option.getType(), av.eOptionBaseTypeGroup)
+
+    # flags
+    assert_equals(option.isEncodingOpt(), True)
+    assert_equals(option.isDecodingOpt(), True)
+    assert_equals(option.isAudioOpt(), True)
+    assert_equals(option.isVideoOpt(), True)
+    assert_equals(option.isSubtitleOpt(), True)
+
+    # value
+    assert_equals(option.getInt(), 0)
+    assert_equals(option.getDefaultInt(), 0)
+
+    # childs
+    assert_equals(option.hasChild(), True)
+    assert_greater(len(option.getChilds()), 0)
+    # check if all the childs have a name
+    for child in option.getChilds():
+        assert_greater(len(child.getName()), 0)
diff --git a/test/pyTest/testSetFrame.py b/test/pyTest/testSetFrame.py
@@ -23,7 +23,7 @@ def testSetVideoFrame():
 
     # create transcoder and add a video stream
     transcoder = av.Transcoder( ouputFile )
-    transcoder.addGeneratedStream( encodingProfile )
+    transcoder.addGenerateStream( encodingProfile )
     videoDecoder = transcoder.getStreamTranscoder( 0 ).getCurrentDecoder()
 
     # start process
@@ -69,7 +69,7 @@ def testSetAudioFrame():
 
     # create transcoder and add a video stream
     transcoder = av.Transcoder( ouputFile )
-    transcoder.addGeneratedStream( "wave24b48kmono" )
+    transcoder.addGenerateStream( "wave24b48kmono" )
     audioDecoder = transcoder.getStreamTranscoder( 0 ).getCurrentDecoder()
 
     # start process
diff --git a/test/pyTest/testTranscoderGenerateStream.py b/test/pyTest/testTranscoderGenerateStream.py
@@ -35,7 +35,7 @@ def testGenerateVideoWithIncompleteProfile():
         av.avProfileIdentificatorHuman : "New video preset",
         av.avProfileType : av.avProfileTypeVideo,
     }
-    transcoder.addGeneratedStream( encodingProfile )
+    transcoder.addGenerateStream( encodingProfile )
 
     transcoder.process()
 
@@ -59,7 +59,7 @@ def testGenerateAudioWithIncompleteProfile():
         av.avProfileIdentificatorHuman : "New audio preset",
         av.avProfileType : av.avProfileTypeAudio,
     }
-    transcoder.addGeneratedStream( encodingProfile )
+    transcoder.addGenerateStream( encodingProfile )
 
     transcoder.process()
 
@@ -73,7 +73,7 @@ def testTranscodeDummyAudio():
     transcoder = av.Transcoder( ouputFile )
 
     # generate an audio stream
-    transcoder.addGeneratedStream( "wave24b48kmono" )
+    transcoder.addGenerateStream( "wave24b48kmono" )
 
     ouputFile.beginWrap()
     transcoder.processFrame()
@@ -89,7 +89,7 @@ def testTranscodeDummyVideo():
     transcoder = av.Transcoder( ouputFile )
 
     # generate a video stream
-    transcoder.addGeneratedStream( "dnxhd120" )
+    transcoder.addGenerateStream( "dnxhd120" )
 
     ouputFile.beginWrap()
     transcoder.processFrame()
diff --git a/test/pyTest/testTranscoderTranscodeAudioMov.py b/test/pyTest/testTranscoderTranscodeAudioMov.py
@@ -52,7 +52,7 @@ def testTranscodeMovVariableNbSamplesPerFrame():
 def testTranscodeMovExtractChannels():
     """
     Transcode the audio stream of a MOV file which contains a video stream.
-    Extract channel one and third of the audio stream (5.1), and create two output streams.
+    Extract first and fourth channels of the audio stream (5.1), and create two output streams.
     The encoding profile will be found from from input.
     """
     inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_MOV_FILE']
@@ -83,7 +83,7 @@ def testTranscodeMovExtractChannels():
 def testTranscodeMovExtractChannelsToOneOutput():
     """
     Transcode the audio stream of a MOV file which contains a video stream.
-    Extract channel one, third and fifth of the audio stream (5.1), and create one output streams.
+    Extract first, third and last channels of the audio stream (5.1), and create one output streams.
     The encoding profile will be found from from input.
     """
     inputFileName = os.environ['AVTRANSCODER_TEST_AUDIO_MOV_FILE']
diff --git a/tools/travis/linux.install.deps.sh b/tools/travis/linux.install.deps.sh
@@ -114,6 +114,19 @@ if  [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
                   make install && \
                   rm -rf ${DIR}
 
+    # libtheora
+    echo ""
+    echo "Building libtheora (${THEORA_VERSION})"
+    DIR=$(mktemp -d libtheoraXXX) && cd ${DIR} && \
+                  curl -O http://downloads.xiph.org/releases/theora/libtheora-${THEORA_VERSION}.tar.bz2 && \
+                  tar xvjf libtheora-${THEORA_VERSION}.tar.bz2 && \
+                  cd libtheora-${THEORA_VERSION} && \
+                  ./configure --prefix="${DEPENDENCY_INSTALL_PATH}" && \
+                  make -k > ${DEPENDENCY_LOG_FILE} 2>&1 && \
+                  make install && \
+                  make check && \
+                  rm -rf ${DIR}
+
     # libvpx
     # https://trac.ffmpeg.org/ticket/4956
     echo ""
@@ -144,7 +157,7 @@ if  [ -z ${TRAVIS_JOB_ID} ] || [ ! -d "${DEPENDENCY_INSTALL_PATH}/lib/" ]; then
     export RELEASE_OPTIONS=--disable-debug
     export DEBUG_OPTIONS=--enable-debug=3\ --disable-optimizations\ --disable-sse\ --disable-stripping
     export LICENSING_OPTIONS=--enable-gpl\ --enable-nonfree
-    export THIRD_PARTIES_OPTIONS=--enable-libfaac\ --enable-libmp3lame\ --enable-libx264\ --enable-libxvid\ --enable-avresample\ --enable-libfdk_aac\ --enable-libvorbis\ --enable-libvpx
+    export THIRD_PARTIES_OPTIONS=--enable-libfaac\ --enable-libmp3lame\ --enable-libx264\ --enable-libxvid\ --enable-avresample\ --enable-libfdk_aac\ --enable-libvorbis\ --enable-libtheora\ --enable-libvpx
 
     if [[ ${DEPENDENCY_NAME} == "ffmpeg" ]]; then
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ void parseConfigFile(const std::string& configFilename, avtranscoder::Transcoder`
`41`	`41`
`42`	`42`	`// generated stream`
`43`	`43`	`if(!filename.length())`
`44`		`- transcoder.addGeneratedStream(transcodeProfile);`
	`44`	`+ transcoder.addGenerateStream(transcodeProfile);`
`45`	`45`	`else`
`46`	`46`	`{`
`47`	`47`	`avtranscoder::InputStreamDesc inputDesc(filename, streamIndex, channelIndexArray);`
Original file line number	Diff line number	Diff line change
`@@ -83,13 +83,13 @@ void Transcoder::addStream(const std::vector<InputStreamDesc>& inputStreamDescAr`
`83`	`83`	`addTranscodeStream(inputStreamDescArray, profile, offset);`
`84`	`84`	`}`
`85`	`85`
`86`		`-void Transcoder::addGeneratedStream(const std::string& encodingProfileName)`
	`86`	`+void Transcoder::addGenerateStream(const std::string& encodingProfileName)`
`87`	`87`	`{`
`88`	`88`	`const ProfileLoader::Profile& encodingProfile = _profileLoader.getProfile(encodingProfileName);`
`89`		`- addGeneratedStream(encodingProfile);`
	`89`	`+ addGenerateStream(encodingProfile);`
`90`	`90`	`}`
`91`	`91`
`92`		`-void Transcoder::addGeneratedStream(const ProfileLoader::Profile& encodingProfile)`
	`92`	`+void Transcoder::addGenerateStream(const ProfileLoader::Profile& encodingProfile)`
`93`	`93`	`{`
`94`	`94`	`// Add profile`
`95`	`95`	`if(!_profileLoader.hasProfile(encodingProfile))`