avTranscoder · MarcAntoine-Arnaud · Jul 29, 2015 · Jul 14, 2015 · Jul 16, 2015 · Jul 16, 2015
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,3 @@
-env:
-  global:
-     - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build-avtranscoder
-     - AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install-avtranscoder
-     - DEPENDENCY_INSTALL=${TRAVIS_BUILD_DIR}/install-dependency
-     - CI_NODE_TOTAL=2
-  matrix:
-    - DEPENDENCY_MODE=libav
-    - DEPENDENCY_MODE=ffmpeg
-
 language: cpp
 
 os:
@@ -18,6 +8,21 @@ compiler:
   - gcc
   - clang
 
+env:
+  global:
+     - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build-avtranscoder
+     - AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install-avtranscoder
+     - DEPENDENCY_INSTALL=${TRAVIS_BUILD_DIR}/install-dependency
+     - CI_NODE_TOTAL=2
+  matrix:
+    - DEPENDENCY_MODE=libav  ENABLE_COVERAGE=true
+    - DEPENDENCY_MODE=libav  ENABLE_COVERAGE=false
+    - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true
+    - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=false
+
+# This results in a 2×2×2x2 build matrix.
+# Where the variables are: os / compiler / DEPENDENCY_MODE / ENABLE_COVERAGE
+
 before_script:
   - env | sort  
   - date -u
@@ -26,7 +31,7 @@ before_script:
   - cd ${TRAVIS_BUILD_DIR}
 
   # install coverage tools
-  - ./tools/travis.gcc.install.coverage.sh
+  - if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.install.coverage.sh; fi
 
   # install avtranscoder dependencies
   - if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi
@@ -36,7 +41,7 @@ script:
   # build
   - mkdir -p ${AVTRANSCODER_BUILD}
   - cd ${AVTRANSCODER_BUILD}
-  - cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL} -DCMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL} -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=True
+  - cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL} -DCMAKE_PREFIX_PATH=${DEPENDENCY_INSTALL} -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=${ENABLE_COVERAGE}
   - make -j${CI_NODE_TOTAL}
   - make install
 
@@ -47,21 +52,19 @@ after_success:
   - cd ${TRAVIS_BUILD_DIR}
 
   # generate coverage for coveralls
-  - if [ ${CC} = "gcc" ]; then ./tools/travis.gcc.generate.coverage.sh; fi
+  - if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.generate.coverage.sh; fi
 
 before_deploy:
   # create archive
   - cd ${TRAVIS_BUILD_DIR}
   - tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL}
 
 deploy:
-  # if the commit is tagged, deploy using github release service
   provider: releases
   api_key:
     secure: ${GITHUB_RELEASE_API_KEY}
   file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz
   skip_cleanup: true
   on:
-    tags: true
-    condition: ${TRAVIS_OS_NAME} = "linux"
-
+    branch: master
+    condition: ${ENABLE_COVERAGE} = false
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 "7")
+set(AVTRANSCODER_VERSION_MICRO "8")
 set(AVTRANSCODER_VERSION ${AVTRANSCODER_VERSION_MAJOR}.${AVTRANSCODER_VERSION_MINOR}.${AVTRANSCODER_VERSION_MICRO})
 
 # Define AvTranscoder versions
@@ -14,7 +14,7 @@ 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/ressource")
+add_definitions(-DAVTRANSCODER_DEFAULT_AVPROFILES="${CMAKE_INSTALL_PREFIX}/share/avprofiles")
 
 # Diplay commands being ran by CMake
 set(CMAKE_VERBOSE_MAKEFILE OFF)
@@ -33,6 +33,7 @@ endif()
 
 # CPP flag to create code coverage report
 if(AVTRANSCODER_COVERAGE)
+	message("Add coverage build option.")
 	set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
 endif()
 

diff --git a/app/pyProcessor/CMakeLists.txt b/app/pyProcessor/CMakeLists.txt
@@ -4,5 +4,5 @@
 install(
 	FILES "pyprocessor.py"
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-	DESTINATION "share/python"
+	DESTINATION "bin/python"
 )
diff --git a/app/pyThumbnail/CMakeLists.txt b/app/pyThumbnail/CMakeLists.txt
@@ -4,5 +4,5 @@
 install(
 	FILES "pythumbnail.py"
 	PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
-	DESTINATION "share/python"
+	DESTINATION "bin/python"
 )
diff --git a/ressource/a_wave16b48k5_1.prf → avprofiles/a_wave16b48k5_1.prf b/ressource/a_wave16b48k5_1.prf → avprofiles/a_wave16b48k5_1.prf
diff --git a/ressource/a_wave16b48kmono.prf → avprofiles/a_wave16b48kmono.prf b/ressource/a_wave16b48kmono.prf → avprofiles/a_wave16b48kmono.prf
diff --git a/ressource/a_wave16b48kstereo.prf → avprofiles/a_wave16b48kstereo.prf b/ressource/a_wave16b48kstereo.prf → avprofiles/a_wave16b48kstereo.prf
diff --git a/ressource/a_wave24b48k5_1.prf → avprofiles/a_wave24b48k5_1.prf b/ressource/a_wave24b48k5_1.prf → avprofiles/a_wave24b48k5_1.prf
diff --git a/ressource/a_wave24b48kmono.prf → avprofiles/a_wave24b48kmono.prf b/ressource/a_wave24b48kmono.prf → avprofiles/a_wave24b48kmono.prf
diff --git a/ressource/a_wave24b48kstereo.prf → avprofiles/a_wave24b48kstereo.prf b/ressource/a_wave24b48kstereo.prf → avprofiles/a_wave24b48kstereo.prf
diff --git a/ressource/f_avi.prf → avprofiles/f_avi.prf b/ressource/f_avi.prf → avprofiles/f_avi.prf
diff --git a/ressource/f_dv.prf → avprofiles/f_dv.prf b/ressource/f_dv.prf → avprofiles/f_dv.prf
diff --git a/ressource/f_mkv.prf → avprofiles/f_mkv.prf b/ressource/f_mkv.prf → avprofiles/f_mkv.prf
diff --git a/ressource/f_vob.prf → avprofiles/f_vob.prf b/ressource/f_vob.prf → avprofiles/f_vob.prf
diff --git a/ressource/v_dnxhd120.prf → avprofiles/v_dnxhd120.prf b/ressource/v_dnxhd120.prf → avprofiles/v_dnxhd120.prf
diff --git a/ressource/v_dnxhd175x.prf → avprofiles/v_dnxhd175x.prf b/ressource/v_dnxhd175x.prf → avprofiles/v_dnxhd175x.prf
diff --git a/ressource/v_dnxhd185.prf → avprofiles/v_dnxhd185.prf b/ressource/v_dnxhd185.prf → avprofiles/v_dnxhd185.prf
diff --git a/ressource/v_dnxhd185x.prf → avprofiles/v_dnxhd185x.prf b/ressource/v_dnxhd185x.prf → avprofiles/v_dnxhd185x.prf
diff --git a/ressource/v_dnxhd36.prf → avprofiles/v_dnxhd36.prf b/ressource/v_dnxhd36.prf → avprofiles/v_dnxhd36.prf
diff --git a/ressource/v_dvcpro25.prf → avprofiles/v_dvcpro25.prf b/ressource/v_dvcpro25.prf → avprofiles/v_dvcpro25.prf
diff --git a/ressource/v_dvcpro50.prf → avprofiles/v_dvcpro50.prf b/ressource/v_dvcpro50.prf → avprofiles/v_dvcpro50.prf
diff --git a/ressource/v_h264_hq.prf → avprofiles/v_h264_hq.prf b/ressource/v_h264_hq.prf → avprofiles/v_h264_hq.prf
diff --git a/ressource/v_h264_lq.prf → avprofiles/v_h264_lq.prf b/ressource/v_h264_lq.prf → avprofiles/v_h264_lq.prf
diff --git a/ressource/v_mjpeg.prf → avprofiles/v_mjpeg.prf b/ressource/v_mjpeg.prf → avprofiles/v_mjpeg.prf
diff --git a/ressource/v_mpeg2.prf → avprofiles/v_mpeg2.prf b/ressource/v_mpeg2.prf → avprofiles/v_mpeg2.prf
diff --git a/ressource/v_proresHQ.prf → avprofiles/v_proresHQ.prf b/ressource/v_proresHQ.prf → avprofiles/v_proresHQ.prf
diff --git a/ressource/v_proresProxy.prf → avprofiles/v_proresProxy.prf b/ressource/v_proresProxy.prf → avprofiles/v_proresProxy.prf
diff --git a/ressource/v_rawYuv.prf → avprofiles/v_rawYuv.prf b/ressource/v_rawYuv.prf → avprofiles/v_rawYuv.prf
diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp
@@ -82,7 +82,11 @@ void ICodec::openCodec()
 std::string ICodec::getCodecName() const
 {
 	assert( _avCodecContext != NULL );
-	return avcodec_descriptor_get( _avCodecContext->codec_id )->name;
+	const AVCodecDescriptor * desc = avcodec_descriptor_get( _avCodecContext->codec_id );
+	if( ! desc )
+                throw std::runtime_error( "Codec Descriptor is not available." );
+
+	return desc->name;
 }
 
 AVCodecID ICodec::getCodecId() const

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -52,9 +52,9 @@ install(
 install(TARGETS avtranscoder-static DESTINATION lib/ OPTIONAL)
 install(TARGETS avtranscoder-shared DESTINATION lib/ OPTIONAL)
 
-### Install AvTranscoder ressource
+### Install AvTranscoder avprofiles
 install(
-	DIRECTORY "${PROJECT_SOURCE_DIR}/ressource"
+	DIRECTORY "${PROJECT_SOURCE_DIR}/avprofiles"
 	DESTINATION "share"
 	FILES_MATCHING
 	PATTERN "*.prf"
@@ -106,14 +106,15 @@ if(SWIG_FOUND)
 
 			# Install python interface
 			set(AVTRANSCODER_PYTHON_BINDING_FILE "${CMAKE_SWIG_OUTDIR}/avtranscoder.py")
-			set(AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR "lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/pyAvTranscoder/")
+			string(SUBSTRING ${PYTHONLIBS_VERSION_STRING} 0 3 PYTHON_VERSION)
+			set(AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR "lib/python${PYTHON_VERSION}/site-packages/pyAvTranscoder/")
 			install(
 				FILES ${AVTRANSCODER_PYTHON_BINDING_FILE} ${AVTRANSCODER_PYTHON_INIT_FILE}
 				DESTINATION ${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}
 				OPTIONAL
 			)
 			# Install python lib and __init__.py files
-			install(TARGETS ${SWIG_MODULE_avtranscoder-py_REAL_NAME} DESTINATION "lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/pyAvTranscoder/" OPTIONAL)
+			install(TARGETS ${SWIG_MODULE_avtranscoder-py_REAL_NAME} DESTINATION ${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR} OPTIONAL)
 			install(CODE "file(WRITE ${CMAKE_INSTALL_PREFIX}/${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}/__init__.py)")
 		else()
 			message("PYTHON not found, will not build python binding.")

diff --git a/tools/travis.python.nosetests.sh b/tools/travis.python.nosetests.sh
@@ -2,10 +2,7 @@
 
 # Get avtranscoder library
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${DEPENDENCY_INSTALL}/lib
-export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7.6/site-packages/:$PYTHONPATH
-
-# Get avtranscoder profiles
-export AVPROFILES=${AVTRANSCODER_INSTALL}/share/ressource
+export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7/site-packages/:$PYTHONPATH
 
 # Get assets
 git clone https://github.com/avTranscoder/avTranscoder-data.git