avTranscoder · cchampet · Feb 16, 2016 · Feb 12, 2016 · Feb 12, 2016 · Feb 12, 2016
diff --git a/.travis.yml b/.travis.yml
@@ -18,14 +18,29 @@ env:
      - AVTRANSCODER_BUILD_PATH=${TRAVIS_BUILD_DIR}/build-avtranscoder
      - AVTRANSCODER_INSTALL=install-avtranscoder
      - AVTRANSCODER_INSTALL_PATH=${TRAVIS_BUILD_DIR}/${AVTRANSCODER_INSTALL}
+
      - DEPENDENCY_INSTALL=install-dependency
      - DEPENDENCY_INSTALL_PATH=${TRAVIS_BUILD_DIR}/${DEPENDENCY_INSTALL}
+
+     - DEPENDENCY_LOG_FILE=${TRAVIS_BUILD_DIR}/build-dependencies-log.txt
+
+     - YASM_VERSION=1.3.0
+     - LAME_VERSION=3.99.5
+     - FAAC_VERSION=1.28
+     - XVID_VERSION=1.3.3
+     - FDKAAC_VERSION=0.1.3
+     - OGG_VERSION=1.3.2
+     - VORBIS_VERSION=1.3.4
+     - VPX_VERSION=1.4.0
   matrix:
     - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
     - DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false
     - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
     - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=false
     - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.5.7 ENABLE_COVERAGE=false
+    - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.6.8 ENABLE_COVERAGE=false
+    - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.7.6 ENABLE_COVERAGE=false
+    - DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.8.6 ENABLE_COVERAGE=false
 
 matrix:
   exclude:
@@ -39,6 +54,12 @@ matrix:
       env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
     - os: osx
       env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
+  allow_failures:
+    # build with libav
+    - env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
+    - env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false
+    # build with ffmpeg-2.8.6
+    - env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.8.6 ENABLE_COVERAGE=false
   fast_finish: true
 
 # This results in a 2×2×2x2 build matrix.
@@ -83,12 +104,16 @@ script:
   - ./tools/travis/build.sh
 
   # launch tests
-  - if [ ${TRAVIS_OS_NAME} = "linux" ] && [ ${DEPENDENCY_NAME} = "ffmpeg" ]; then ./tools/travis/python.nosetests.sh; fi
+  - if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis/python.nosetests.sh; fi
 
 after_success:
   # generate coverage for coveralls
   - if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.generate.coverage.sh; fi
 
+after_failure:
+  - cat ${AVTRANSCODER_BUILD_PATH}/CMakeFiles/CMakeOutput.log
+  - cat ${DEPENDENCY_LOG_FILE}
+
 before_deploy:
   # copy libbz2, external dependency of libavformat
   - if [ ${TRAVIS_OS_NAME} = "linux" ]; then cp /lib/x86_64-linux-gnu/{libbz2.so.1,libbz2.so.1.0,libbz2.so.1.0.4} ${DEPENDENCY_INSTALL_PATH}/lib; fi

diff --git a/INSTALL.md b/INSTALL.md
@@ -4,8 +4,8 @@ AvTranscoder uses CMake as build system.
 
 #### Dependencies
 AvTranscoder can depend on ffmpeg, libav, or any fork of these projects that follow the same API.
-* Recommended ffmpeg versions: 2.4.2, 2.4.5, 2.5.7
-* Recommended libav versions: 11.3
+* Tested ffmpeg versions: 2.4.2, 2.4.5, 2.5.7, 2.6.8, 2.7.6
+* Recommended libav versions: none
 
 #### To build
 ```

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 # avTranscoder
 
-C++ API for Libav / FFmpeg
+C++ API for FFmpeg / Libav
 
-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.
+Based on FFmpeg/Libav 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=develop)](https://travis-ci.org/avTranscoder/avTranscoder)
 [![Build status](https://ci.appveyor.com/api/projects/status/6urf0otyhtj8xuny?svg=true)](https://ci.appveyor.com/project/cchampet/avtranscoder)
@@ -13,6 +13,8 @@ Based on Libav/FFmpeg libraries to support various video and audio formats, avTr
 [![Stories in Progress](https://badge.waffle.io/avTranscoder/avTranscoder.svg?label=2 - Working&title=In Progress)](http://waffle.io/avTranscoder/avTranscoder)   
 Click on the badge above to have a big picture view of what's in progress and how you can help.  
 
+:warning: The latest avTranscoder API does not fit with libav.
+
 #### What you need to know
 * C++ library
 * Java and Python bindings generated with SWIG

diff --git a/appveyor.yml b/appveyor.yml
@@ -7,6 +7,8 @@ platform:
 
 environment:
   FFMPEG_VERSION: 2.4.5
+  DEPENDENCY_INSTALL_PATH: C:\ProgramData\ffmpeg-2.4.5
+  AVTRANSCODER_INSTALL_PATH: C:\projects\avtranscoder\build\install
 
 matrix:
   fast_finish: true
@@ -33,23 +35,24 @@ on_failure:
   - type "C:\ProgramData\chocolatey\logs\chocolatey.log"
   - type "C:\projects\avtranscoder\build\CMakeFiles\CMakeOutput.log"
 
-#on_success:
-#  - create archives
-
-#artifacts:
-#  - path: C:\ProgramData\ffmpeg-2.2.11
-#    name: ffmpeg
-#    type: zip
-
-#  - path: C:\projects\avtranscoder\build
-#    name: avtranscoder
-#    type: zip
-
-#deploy:
-#  - provider: GitHub
-#    artifact: ffmpeg,avtranscoder
-#    auth_token:
-#    secure: <your encrypted token>
-#    on:
-#      branch: master
-#      appveyor_repo_tag: true
+on_success:
+  - 7z a ffmpeg.zip %DEPENDENCY_INSTALL_PATH%
+  - 7z a avtranscoder.zip %AVTRANSCODER_INSTALL_PATH%
+
+artifacts:
+  - path: ffmpeg.zip
+    name: ffmpeg
+    type: zip
+
+  - path: avtranscoder.zip
+    name: avtranscoder
+    type: zip
+
+deploy:
+  - provider: GitHub
+    artifact: ffmpeg,avtranscoder
+    auth_token:
+    secure: sApasbQe2i7Uu+XNhlkXg+F6zI0VNHUjhq5QfK6/+NSs4lX/9BwhkLvibQc6bmMv
+    on:
+      branch: master
+      appveyor_repo_tag: true
diff --git a/src/AvTranscoder/codec/AudioCodec.hpp b/src/AvTranscoder/codec/AudioCodec.hpp
@@ -20,4 +20,4 @@ class AvExport AudioCodec : public ICodec
 };
 }
 
-#endif
+#endif
diff --git a/src/AvTranscoder/codec/DataCodec.hpp b/src/AvTranscoder/codec/DataCodec.hpp
@@ -15,4 +15,4 @@ class AvExport DataCodec : public ICodec
 };
 }
 
-#endif
+#endif
diff --git a/src/AvTranscoder/codec/VideoCodec.hpp b/src/AvTranscoder/codec/VideoCodec.hpp
@@ -20,4 +20,4 @@ class AvExport VideoCodec : public ICodec
 };
 }
 
-#endif
+#endif
diff --git a/src/AvTranscoder/decoder/AudioGenerator.hpp b/src/AvTranscoder/decoder/AudioGenerator.hpp
@@ -27,4 +27,4 @@ class AvExport AudioGenerator : public IDecoder
 };
 }
 
-#endif
+#endif
diff --git a/src/AvTranscoder/encoder/AudioEncoder.hpp b/src/AvTranscoder/encoder/AudioEncoder.hpp
@@ -29,4 +29,4 @@ class AvExport AudioEncoder : public IEncoder
 };
 }
 
-#endif
+#endif
diff --git a/src/AvTranscoder/encoder/IEncoder.hpp b/src/AvTranscoder/encoder/IEncoder.hpp
@@ -44,4 +44,4 @@ class AvExport IEncoder
 };
 }
 
-#endif
+#endif
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -170,4 +170,4 @@ bool VideoEncoder::encodeFrame(CodedData& codedFrame)
     return ret == 0;
 #endif
 }
-}
+}
diff --git a/src/AvTranscoder/encoder/VideoEncoder.hpp b/src/AvTranscoder/encoder/VideoEncoder.hpp
@@ -29,4 +29,4 @@ class AvExport VideoEncoder : public IEncoder
 };
 }
 
-#endif
+#endif
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -250,4 +250,4 @@ std::ostream& operator<<(std::ostream& flux, const InputFile& input)
 
     return flux;
 }
-}
+}
diff --git a/src/AvTranscoder/progress/IProgress.hpp b/src/AvTranscoder/progress/IProgress.hpp
@@ -35,4 +35,4 @@ class AvExport IProgress
 };
 }
 
-#endif
+#endif
diff --git a/src/AvTranscoder/progress/NoDisplayProgress.hpp b/src/AvTranscoder/progress/NoDisplayProgress.hpp
@@ -18,4 +18,4 @@ class AvExport NoDisplayProgress : public IProgress
 };
 }
 
-#endif
+#endif
diff --git a/src/AvTranscoder/stream/IInputStream.hpp b/src/AvTranscoder/stream/IInputStream.hpp
@@ -59,4 +59,4 @@ class AvExport IInputStream
 };
 }
 
-#endif
+#endif
diff --git a/src/AvTranscoder/stream/IOutputStream.hpp b/src/AvTranscoder/stream/IOutputStream.hpp
@@ -44,4 +44,4 @@ class AvExport IOutputStream
 };
 }
 
-#endif
+#endif
diff --git a/src/AvTranscoder/stream/InputStream.hpp b/src/AvTranscoder/stream/InputStream.hpp
@@ -47,4 +47,4 @@ class AvExport InputStream : public IInputStream
 };
 }
 
-#endif
+#endif
diff --git a/test/pyTest/testOutputFile.py b/test/pyTest/testOutputFile.py
@@ -14,7 +14,6 @@ def testCreateOutputFileWithExtension():
 
     assert_equals( ouputFile.getFilename(), outputFileName )
     assert_equals( ouputFile.getFormatName(), formatName )
-    assert_equals( ouputFile.getFormatLongName(), formatLongName )
 
 
 @raises(IOError)
@@ -38,7 +37,6 @@ def testCreateOutputFileWithoutExtensionWithFormat():
 
     assert_equals( ouputFile.getFilename(), outputFileName )
     assert_equals( ouputFile.getFormatName(), formatName )
-    assert_equals( ouputFile.getFormatLongName(), formatLongName )
 
 
 def testCreateOutputFileWithoutExtensionWithMimeType():
@@ -68,5 +66,4 @@ def testCreateOutputFileWithoutExtensionWithInconsistentFormatAndMimeType():
 
     assert_equals( ouputFile.getFilename(), outputFileName )
     assert_equals( ouputFile.getFormatName(), formatName )
-    assert_equals( ouputFile.getFormatLongName(), formatLongName )
 
diff --git a/test/pyTest/testSetFrame.py b/test/pyTest/testSetFrame.py
@@ -49,7 +49,6 @@ def testSetVideoFrame():
     dst_videoStream = dst_properties.getVideoProperties()[0]
 
     assert_equals( "mpeg2video", dst_videoStream.getCodecName() )
-    assert_equals( "MPEG-2 video", dst_videoStream.getCodecLongName() )
     assert_equals( 1920, dst_videoStream.getWidth() )
     assert_equals( 1080, dst_videoStream.getHeight() )
     assert_equals( 16, dst_videoStream.getDar().num )
@@ -102,7 +101,6 @@ def testSetAudioFrame():
     dst_audioStream = dst_properties.getAudioProperties()[0]
 
     assert_equals( "pcm_s24le", dst_audioStream.getCodecName() )
-    assert_equals( "PCM signed 24-bit little-endian", dst_audioStream.getCodecLongName() )
     assert_equals( "s32", dst_audioStream.getSampleFormatName() )
     assert_equals( "signed 32 bits", dst_audioStream.getSampleFormatLongName() )
     assert_equals( 48000, dst_audioStream.getSampleRate() )

diff --git a/test/pyTest/testTranscoderRewrap.py b/test/pyTest/testTranscoderRewrap.py
@@ -20,7 +20,6 @@ def checkFormat(src_properties, dst_properties):
     Check the values of the given format headers.
     """
     assert_equals( src_properties.getFormatName(), dst_properties.getFormatName() )
-    assert_equals( src_properties.getFormatLongName(), dst_properties.getFormatLongName() )
     assert_equals( src_properties.getStartTime(), dst_properties.getStartTime() )
     assert_equals( src_properties.getDuration(), dst_properties.getDuration() )
     assert_greater_equal( src_properties.getBitRate(), dst_properties.getBitRate() )

diff --git a/test/pyTest/testTranscoderTranscodeAudioMov.py b/test/pyTest/testTranscoderTranscodeAudioMov.py
@@ -47,7 +47,6 @@ def testTranscodeMovVariableNbSamplesPerFrame():
     dst_audioStream = dst_properties.getAudioProperties()[0]
 
     assert_equals( "pcm_s24le", dst_audioStream.getCodecName() )
-    assert_equals( "PCM signed 24-bit little-endian", dst_audioStream.getCodecLongName() )
 
 
 def testTranscodeMovExtractChannels():

diff --git a/test/pyTest/testTranscoderTranscodeAudioWave.py b/test/pyTest/testTranscoderTranscodeAudioWave.py
@@ -38,7 +38,6 @@ def testTranscodeWave24b48k5_1():
     dst_audioStream = dst_properties.getAudioProperties()[0]
 
     assert_equals( "pcm_s24le", dst_audioStream.getCodecName() )
-    assert_equals( "PCM signed 24-bit little-endian", dst_audioStream.getCodecLongName() )
     assert_equals( "s32", dst_audioStream.getSampleFormatName() )
     assert_equals( "signed 32 bits", dst_audioStream.getSampleFormatLongName() )
     assert_equals( 48000, dst_audioStream.getSampleRate() )
@@ -72,7 +71,6 @@ def testTranscodeWave24b48kstereo():
     dst_audioStream = dst_properties.getAudioProperties()[0]
 
     assert_equals( "pcm_s24le", dst_audioStream.getCodecName() )
-    assert_equals( "PCM signed 24-bit little-endian", dst_audioStream.getCodecLongName() )
     assert_equals( "s32", dst_audioStream.getSampleFormatName() )
     assert_equals( "signed 32 bits", dst_audioStream.getSampleFormatLongName() )
     assert_equals( 48000, dst_audioStream.getSampleRate() )
@@ -106,7 +104,6 @@ def testTranscodeWave24b48kmono():
     dst_audioStream = dst_properties.getAudioProperties()[0]
 
     assert_equals( "pcm_s24le", dst_audioStream.getCodecName() )
-    assert_equals( "PCM signed 24-bit little-endian", dst_audioStream.getCodecLongName() )
     assert_equals( "s32", dst_audioStream.getSampleFormatName() )
     assert_equals( "signed 32 bits", dst_audioStream.getSampleFormatLongName() )
     assert_equals( 48000, dst_audioStream.getSampleRate() )
@@ -140,7 +137,6 @@ def testTranscodeWave16b48kmono():
     dst_audioStream = dst_properties.getAudioProperties()[0]
 
     assert_equals( "pcm_s16le", dst_audioStream.getCodecName() )
-    assert_equals( "PCM signed 16-bit little-endian", dst_audioStream.getCodecLongName() )
     assert_equals( "s16", dst_audioStream.getSampleFormatName() )
     assert_equals( "signed 16 bits", dst_audioStream.getSampleFormatLongName() )
     assert_equals( 48000, dst_audioStream.getSampleRate() )

diff --git a/test/pyTest/testTranscoderTranscodeVideo.py b/test/pyTest/testTranscoderTranscodeVideo.py
@@ -39,7 +39,6 @@ def testTranscodeDnxhd120():
     dst_videoStream = dst_properties.getVideoProperties()[0]
 
     assert_equals( "dnxhd", dst_videoStream.getCodecName() )
-    assert_equals( "VC3/DNxHD", dst_videoStream.getCodecLongName() )
     expectedBitRate = 120000000
     deltaBitRate = expectedBitRate * 0.05
     assert_almost_equals( expectedBitRate, dst_videoStream.getBitRate(), delta=deltaBitRate )
@@ -75,7 +74,6 @@ def testTranscodeDnxhd185():
     dst_videoStream = dst_properties.getVideoProperties()[0]
 
     assert_equals( "dnxhd", dst_videoStream.getCodecName() )
-    assert_equals( "VC3/DNxHD", dst_videoStream.getCodecLongName() )
     expectedBitRate = 185000000
     deltaBitRate = expectedBitRate * 0.05
     assert_almost_equals( expectedBitRate, dst_videoStream.getBitRate(), delta=deltaBitRate )
@@ -111,7 +109,6 @@ def testTranscodeDnxhd185x():
     dst_videoStream = dst_properties.getVideoProperties()[0]
 
     assert_equals( "dnxhd", dst_videoStream.getCodecName() )
-    assert_equals( "VC3/DNxHD", dst_videoStream.getCodecLongName() )
     expectedBitRate = 185000000
     deltaBitRate = expectedBitRate * 0.05
     assert_almost_equals( expectedBitRate, dst_videoStream.getBitRate(), delta=deltaBitRate )

diff --git a/tools/appveyor/build.bat b/tools/appveyor/build.bat
@@ -4,7 +4,7 @@ MKDIR build
 cd build
 
 :: Configure
-call cmake.exe .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%CD% -DCMAKE_PREFIX_PATH=C:\ProgramData\ffmpeg-%FFMPEG_VERSION% -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7
+call cmake.exe .. -G "NMake Makefiles" -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%%AVTRANSCODER_INSTALL_PATH%% -DCMAKE_PREFIX_PATH=%DEPENDENCY_INSTALL_PATH% -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7
 
 :: Build & Install
 call nmake /F Makefile

diff --git a/tools/appveyor/python.nosetests.bat b/tools/appveyor/python.nosetests.bat
@@ -3,11 +3,11 @@
 set PWD=C:\projects\avtranscoder
 
 :: Get avtranscoder library
-set PYTHONPATH=%PWD%\build\lib\python2.7\site-packages;%PYTHONPATH%
-set PATH=C:\ProgramData\ffmpeg-%FFMPEG_VERSION%\bin;%PWD%\build\lib;%PATH%
+set PYTHONPATH=%AVTRANSCODER_INSTALL_PATH%\lib\python2.7\site-packages;%PYTHONPATH%
+set PATH=%DEPENDENCY_INSTALL_PATH%\bin;%AVTRANSCODER_INSTALL_PATH%\lib;%PATH%
 
 :: Get avtranscoder profiles
-set AVPROFILES=%PWD%\build\share\avprofiles
+set AVPROFILES=%AVTRANSCODER_INSTALL_PATH%\share\avprofiles
 
 :: Get assets
 git clone https://github.com/avTranscoder/avTranscoder-data.git

diff --git a/tools/travis/build.sh b/tools/travis/build.sh
@@ -1,5 +1,7 @@
 #!/bin/bash
 
+# Exit immediately if a command exits with a non-zero status
+set -e
 # Print commands and their arguments as they are executed.
 set -x
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,4 +20,4 @@ class AvExport AudioCodec : public ICodec @@
     };
     }
-    #endif
+    #endif