From 90cb48bceb35666e98787d198fd3be732827e635 Mon Sep 17 00:00:00 2001 From: Fabien Castan Date: Tue, 14 Jul 2015 19:16:01 +0200 Subject: [PATCH 1/9] Throw if codec is not available --- src/AvTranscoder/codec/ICodec.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/AvTranscoder/codec/ICodec.cpp b/src/AvTranscoder/codec/ICodec.cpp index 7cc51efa..d0a778bf 100644 --- 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 From f47f13feeba916db488e850fbd7644500502ef37 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 20 Jul 2015 18:27:48 +0200 Subject: [PATCH 2/9] Deploy: rename ressource folder to avprofiles --- CMakeLists.txt | 2 +- {ressource => avprofiles}/a_wave16b48k5_1.prf | 0 {ressource => avprofiles}/a_wave16b48kmono.prf | 0 {ressource => avprofiles}/a_wave16b48kstereo.prf | 0 {ressource => avprofiles}/a_wave24b48k5_1.prf | 0 {ressource => avprofiles}/a_wave24b48kmono.prf | 0 {ressource => avprofiles}/a_wave24b48kstereo.prf | 0 {ressource => avprofiles}/f_avi.prf | 0 {ressource => avprofiles}/f_dv.prf | 0 {ressource => avprofiles}/f_mkv.prf | 0 {ressource => avprofiles}/f_vob.prf | 0 {ressource => avprofiles}/v_dnxhd120.prf | 0 {ressource => avprofiles}/v_dnxhd175x.prf | 0 {ressource => avprofiles}/v_dnxhd185.prf | 0 {ressource => avprofiles}/v_dnxhd185x.prf | 0 {ressource => avprofiles}/v_dnxhd36.prf | 0 {ressource => avprofiles}/v_dvcpro25.prf | 0 {ressource => avprofiles}/v_dvcpro50.prf | 0 {ressource => avprofiles}/v_h264_hq.prf | 0 {ressource => avprofiles}/v_h264_lq.prf | 0 {ressource => avprofiles}/v_mjpeg.prf | 0 {ressource => avprofiles}/v_mpeg2.prf | 0 {ressource => avprofiles}/v_proresHQ.prf | 0 {ressource => avprofiles}/v_proresProxy.prf | 0 {ressource => avprofiles}/v_rawYuv.prf | 0 src/CMakeLists.txt | 4 ++-- 26 files changed, 3 insertions(+), 3 deletions(-) rename {ressource => avprofiles}/a_wave16b48k5_1.prf (100%) rename {ressource => avprofiles}/a_wave16b48kmono.prf (100%) rename {ressource => avprofiles}/a_wave16b48kstereo.prf (100%) rename {ressource => avprofiles}/a_wave24b48k5_1.prf (100%) rename {ressource => avprofiles}/a_wave24b48kmono.prf (100%) rename {ressource => avprofiles}/a_wave24b48kstereo.prf (100%) rename {ressource => avprofiles}/f_avi.prf (100%) rename {ressource => avprofiles}/f_dv.prf (100%) rename {ressource => avprofiles}/f_mkv.prf (100%) rename {ressource => avprofiles}/f_vob.prf (100%) rename {ressource => avprofiles}/v_dnxhd120.prf (100%) rename {ressource => avprofiles}/v_dnxhd175x.prf (100%) rename {ressource => avprofiles}/v_dnxhd185.prf (100%) rename {ressource => avprofiles}/v_dnxhd185x.prf (100%) rename {ressource => avprofiles}/v_dnxhd36.prf (100%) rename {ressource => avprofiles}/v_dvcpro25.prf (100%) rename {ressource => avprofiles}/v_dvcpro50.prf (100%) rename {ressource => avprofiles}/v_h264_hq.prf (100%) rename {ressource => avprofiles}/v_h264_lq.prf (100%) rename {ressource => avprofiles}/v_mjpeg.prf (100%) rename {ressource => avprofiles}/v_mpeg2.prf (100%) rename {ressource => avprofiles}/v_proresHQ.prf (100%) rename {ressource => avprofiles}/v_proresProxy.prf (100%) rename {ressource => avprofiles}/v_rawYuv.prf (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66c79f55..17f40963 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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) diff --git a/ressource/a_wave16b48k5_1.prf b/avprofiles/a_wave16b48k5_1.prf similarity index 100% rename from ressource/a_wave16b48k5_1.prf rename to avprofiles/a_wave16b48k5_1.prf diff --git a/ressource/a_wave16b48kmono.prf b/avprofiles/a_wave16b48kmono.prf similarity index 100% rename from ressource/a_wave16b48kmono.prf rename to avprofiles/a_wave16b48kmono.prf diff --git a/ressource/a_wave16b48kstereo.prf b/avprofiles/a_wave16b48kstereo.prf similarity index 100% rename from ressource/a_wave16b48kstereo.prf rename to avprofiles/a_wave16b48kstereo.prf diff --git a/ressource/a_wave24b48k5_1.prf b/avprofiles/a_wave24b48k5_1.prf similarity index 100% rename from ressource/a_wave24b48k5_1.prf rename to avprofiles/a_wave24b48k5_1.prf diff --git a/ressource/a_wave24b48kmono.prf b/avprofiles/a_wave24b48kmono.prf similarity index 100% rename from ressource/a_wave24b48kmono.prf rename to avprofiles/a_wave24b48kmono.prf diff --git a/ressource/a_wave24b48kstereo.prf b/avprofiles/a_wave24b48kstereo.prf similarity index 100% rename from ressource/a_wave24b48kstereo.prf rename to avprofiles/a_wave24b48kstereo.prf diff --git a/ressource/f_avi.prf b/avprofiles/f_avi.prf similarity index 100% rename from ressource/f_avi.prf rename to avprofiles/f_avi.prf diff --git a/ressource/f_dv.prf b/avprofiles/f_dv.prf similarity index 100% rename from ressource/f_dv.prf rename to avprofiles/f_dv.prf diff --git a/ressource/f_mkv.prf b/avprofiles/f_mkv.prf similarity index 100% rename from ressource/f_mkv.prf rename to avprofiles/f_mkv.prf diff --git a/ressource/f_vob.prf b/avprofiles/f_vob.prf similarity index 100% rename from ressource/f_vob.prf rename to avprofiles/f_vob.prf diff --git a/ressource/v_dnxhd120.prf b/avprofiles/v_dnxhd120.prf similarity index 100% rename from ressource/v_dnxhd120.prf rename to avprofiles/v_dnxhd120.prf diff --git a/ressource/v_dnxhd175x.prf b/avprofiles/v_dnxhd175x.prf similarity index 100% rename from ressource/v_dnxhd175x.prf rename to avprofiles/v_dnxhd175x.prf diff --git a/ressource/v_dnxhd185.prf b/avprofiles/v_dnxhd185.prf similarity index 100% rename from ressource/v_dnxhd185.prf rename to avprofiles/v_dnxhd185.prf diff --git a/ressource/v_dnxhd185x.prf b/avprofiles/v_dnxhd185x.prf similarity index 100% rename from ressource/v_dnxhd185x.prf rename to avprofiles/v_dnxhd185x.prf diff --git a/ressource/v_dnxhd36.prf b/avprofiles/v_dnxhd36.prf similarity index 100% rename from ressource/v_dnxhd36.prf rename to avprofiles/v_dnxhd36.prf diff --git a/ressource/v_dvcpro25.prf b/avprofiles/v_dvcpro25.prf similarity index 100% rename from ressource/v_dvcpro25.prf rename to avprofiles/v_dvcpro25.prf diff --git a/ressource/v_dvcpro50.prf b/avprofiles/v_dvcpro50.prf similarity index 100% rename from ressource/v_dvcpro50.prf rename to avprofiles/v_dvcpro50.prf diff --git a/ressource/v_h264_hq.prf b/avprofiles/v_h264_hq.prf similarity index 100% rename from ressource/v_h264_hq.prf rename to avprofiles/v_h264_hq.prf diff --git a/ressource/v_h264_lq.prf b/avprofiles/v_h264_lq.prf similarity index 100% rename from ressource/v_h264_lq.prf rename to avprofiles/v_h264_lq.prf diff --git a/ressource/v_mjpeg.prf b/avprofiles/v_mjpeg.prf similarity index 100% rename from ressource/v_mjpeg.prf rename to avprofiles/v_mjpeg.prf diff --git a/ressource/v_mpeg2.prf b/avprofiles/v_mpeg2.prf similarity index 100% rename from ressource/v_mpeg2.prf rename to avprofiles/v_mpeg2.prf diff --git a/ressource/v_proresHQ.prf b/avprofiles/v_proresHQ.prf similarity index 100% rename from ressource/v_proresHQ.prf rename to avprofiles/v_proresHQ.prf diff --git a/ressource/v_proresProxy.prf b/avprofiles/v_proresProxy.prf similarity index 100% rename from ressource/v_proresProxy.prf rename to avprofiles/v_proresProxy.prf diff --git a/ressource/v_rawYuv.prf b/avprofiles/v_rawYuv.prf similarity index 100% rename from ressource/v_rawYuv.prf rename to avprofiles/v_rawYuv.prf diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 163e80eb..5d195446 100644 --- 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" From 56599347b1ff83ac2276e7e82e1e7c54566799cd Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 20 Jul 2015 18:28:40 +0200 Subject: [PATCH 3/9] Travis: clean script to launch nosetests --- tools/travis.python.nosetests.sh | 3 --- 1 file changed, 3 deletions(-) diff --git a/tools/travis.python.nosetests.sh b/tools/travis.python.nosetests.sh index c1507c4b..5fcaf37d 100755 --- a/tools/travis.python.nosetests.sh +++ b/tools/travis.python.nosetests.sh @@ -4,9 +4,6 @@ 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 - # Get assets git clone https://github.com/avTranscoder/avTranscoder-data.git export AVTRANSCODER_TEST_VIDEO_FILE=`pwd`/avTranscoder-data/video/BigBuckBunny/BigBuckBunny_480p_stereo.avi From 3a55b4fbb93efbf527dbe47c42843ac93d8d156f Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 20 Jul 2015 17:05:03 +0200 Subject: [PATCH 4/9] Travis: add ENABLE_COVERAGE to deploy only when coverage is off --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index eb5b6eb5..42cb4d45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,8 +5,10 @@ env: - DEPENDENCY_INSTALL=${TRAVIS_BUILD_DIR}/install-dependency - CI_NODE_TOTAL=2 matrix: - - DEPENDENCY_MODE=libav - - DEPENDENCY_MODE=ffmpeg + - DEPENDENCY_MODE=libav ENABLE_COVERAGE=true + - DEPENDENCY_MODE=libav ENABLE_COVERAGE=false + - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true + - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=false language: cpp @@ -26,7 +28,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 +38,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,7 +49,7 @@ 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 @@ -55,13 +57,11 @@ before_deploy: - 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 From 822311073a9e9ffac6ac59165abc5574f9a31fdd Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 20 Jul 2015 17:05:39 +0200 Subject: [PATCH 5/9] CMake: add message when activate coverage build option --- CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CMakeLists.txt b/CMakeLists.txt index 66c79f55..5d8e2791 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() From ea61376ced0c5628eb07bb85d8f5ff0213d6eee7 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Mon, 20 Jul 2015 17:08:14 +0200 Subject: [PATCH 6/9] Travis: clean .travis.yml --- .travis.yml | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 42cb4d45..1968bf7c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,3 +1,13 @@ +language: cpp + +os: + - linux + - osx + +compiler: + - gcc + - clang + env: global: - AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build-avtranscoder @@ -10,15 +20,8 @@ env: - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=false -language: cpp - -os: - - linux - - osx - -compiler: - - gcc - - clang +# This results in a 2×2×2x2 build matrix. +# Where the variables are: os / compiler / DEPENDENCY_MODE / ENABLE_COVERAGE before_script: - env | sort From 554e16e0577765588f9be0684977441017ee64e2 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 28 Jul 2015 17:34:18 +0200 Subject: [PATCH 7/9] Up to v0.5.8 --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 01869da7..6ad9230e 100644 --- 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 From 2ca246ac43a788fe2a06091d53da728fe20dbb10 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Tue, 28 Jul 2015 17:59:23 +0200 Subject: [PATCH 8/9] CMake: deploy python apps in bin/python --- app/pyProcessor/CMakeLists.txt | 2 +- app/pyThumbnail/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/pyProcessor/CMakeLists.txt b/app/pyProcessor/CMakeLists.txt index ddda9a5b..1edba996 100644 --- 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 index 8c027cc5..e20d47fd 100644 --- 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" ) From 3e8aebbbb2668987d57eaa4d0fc17bb4f5d1d0b4 Mon Sep 17 00:00:00 2001 From: Clement Champetier Date: Wed, 29 Jul 2015 09:56:35 +0200 Subject: [PATCH 9/9] CMake: update path to install python bindings Python libs should be installed in "lib/python2.7" instead of "lib/python2.7.x". --- src/CMakeLists.txt | 5 +++-- tools/travis.python.nosetests.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 5d195446..116e6976 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -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 index 5fcaf37d..8a2d3b95 100755 --- a/tools/travis.python.nosetests.sh +++ b/tools/travis.python.nosetests.sh @@ -2,7 +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 +export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7/site-packages/:$PYTHONPATH # Get assets git clone https://github.com/avTranscoder/avTranscoder-data.git pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy