Skip to content

Commit 6574e59

Browse files
MarcAntoine-ArnaudMarcAntoine-Arnaud
committed
Merge pull request #142 from mikrosimage/master
MIK fork: up to v0.5.8
2 parents d473e82 + 3e8aebb commit 6574e59

31 files changed

+36
-30
lines changed

‎.travis.yml

Lines changed: 20 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,3 @@
1-
env:
2-
global:
3-
- AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build-avtranscoder
4-
- AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install-avtranscoder
5-
- DEPENDENCY_INSTALL=${TRAVIS_BUILD_DIR}/install-dependency
6-
- CI_NODE_TOTAL=2
7-
matrix:
8-
- DEPENDENCY_MODE=libav
9-
- DEPENDENCY_MODE=ffmpeg
10-
111
language: cpp
122

133
os:
@@ -18,6 +8,21 @@ compiler:
188
- gcc
199
- clang
2010

11+
env:
12+
global:
13+
- AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build-avtranscoder
14+
- AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install-avtranscoder
15+
- DEPENDENCY_INSTALL=${TRAVIS_BUILD_DIR}/install-dependency
16+
- CI_NODE_TOTAL=2
17+
matrix:
18+
- DEPENDENCY_MODE=libav ENABLE_COVERAGE=true
19+
- DEPENDENCY_MODE=libav ENABLE_COVERAGE=false
20+
- DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true
21+
- DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=false
22+
23+
# This results in a 2×2×2x2 build matrix.
24+
# Where the variables are: os / compiler / DEPENDENCY_MODE / ENABLE_COVERAGE
25+
2126
before_script:
2227
- env | sort
2328
- date -u
@@ -26,7 +31,7 @@ before_script:
2631
- cd ${TRAVIS_BUILD_DIR}
2732

2833
# install coverage tools
29-
- ./tools/travis.gcc.install.coverage.sh
34+
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.install.coverage.sh; fi
3035

3136
# install avtranscoder dependencies
3237
- if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi
@@ -36,7 +41,7 @@ script:
3641
# build
3742
- mkdir -p ${AVTRANSCODER_BUILD}
3843
- cd ${AVTRANSCODER_BUILD}
39-
- 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
44+
- 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}
4045
- make -j${CI_NODE_TOTAL}
4146
- make install
4247

@@ -47,21 +52,19 @@ after_success:
4752
- cd ${TRAVIS_BUILD_DIR}
4853

4954
# generate coverage for coveralls
50-
- if [ ${CC} = "gcc" ]; then ./tools/travis.gcc.generate.coverage.sh; fi
55+
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.generate.coverage.sh; fi
5156

5257
before_deploy:
5358
# create archive
5459
- cd ${TRAVIS_BUILD_DIR}
5560
- tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL}
5661

5762
deploy:
58-
# if the commit is tagged, deploy using github release service
5963
provider: releases
6064
api_key:
6165
secure: ${GITHUB_RELEASE_API_KEY}
6266
file: avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz
6367
skip_cleanup: true
6468
on:
65-
tags: true
66-
condition: ${TRAVIS_OS_NAME} = "linux"
67-
69+
branch: master
70+
condition: ${ENABLE_COVERAGE} = false

‎CMakeLists.txt

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ project(AvTranscoder)
55
# Set AvTranscoder versions
66
set(AVTRANSCODER_VERSION_MAJOR "0")
77
set(AVTRANSCODER_VERSION_MINOR "5")
8-
set(AVTRANSCODER_VERSION_MICRO "7")
8+
set(AVTRANSCODER_VERSION_MICRO "8")
99
set(AVTRANSCODER_VERSION ${AVTRANSCODER_VERSION_MAJOR}.${AVTRANSCODER_VERSION_MINOR}.${AVTRANSCODER_VERSION_MICRO})
1010

1111
# Define AvTranscoder versions
@@ -14,7 +14,7 @@ add_definitions(-DAVTRANSCODER_VERSION_MINOR=${AVTRANSCODER_VERSION_MINOR})
1414
add_definitions(-DAVTRANSCODER_VERSION_MICRO=${AVTRANSCODER_VERSION_MICRO})
1515

1616
# Define AvTranscoder default path to profiles
17-
add_definitions(-DAVTRANSCODER_DEFAULT_AVPROFILES="${CMAKE_INSTALL_PREFIX}/share/ressource")
17+
add_definitions(-DAVTRANSCODER_DEFAULT_AVPROFILES="${CMAKE_INSTALL_PREFIX}/share/avprofiles")
1818

1919
# Diplay commands being ran by CMake
2020
set(CMAKE_VERBOSE_MAKEFILE OFF)
@@ -33,6 +33,7 @@ endif()
3333

3434
# CPP flag to create code coverage report
3535
if(AVTRANSCODER_COVERAGE)
36+
message("Add coverage build option.")
3637
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
3738
endif()
3839

‎app/pyProcessor/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
install(
55
FILES "pyprocessor.py"
66
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
7-
DESTINATION "share/python"
7+
DESTINATION "bin/python"
88
)

‎app/pyThumbnail/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
install(
55
FILES "pythumbnail.py"
66
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_READ WORLD_EXECUTE
7-
DESTINATION "share/python"
7+
DESTINATION "bin/python"
88
)

‎ressource/a_wave16b48k5_1.prf renamed to ‎avprofiles/a_wave16b48k5_1.prf

File renamed without changes.

‎ressource/a_wave16b48kmono.prf renamed to ‎avprofiles/a_wave16b48kmono.prf

File renamed without changes.

‎ressource/a_wave16b48kstereo.prf renamed to ‎avprofiles/a_wave16b48kstereo.prf

File renamed without changes.

‎ressource/a_wave24b48k5_1.prf renamed to ‎avprofiles/a_wave24b48k5_1.prf

File renamed without changes.

‎ressource/a_wave24b48kmono.prf renamed to ‎avprofiles/a_wave24b48kmono.prf

File renamed without changes.

‎ressource/a_wave24b48kstereo.prf renamed to ‎avprofiles/a_wave24b48kstereo.prf

File renamed without changes.

‎ressource/f_avi.prf renamed to ‎avprofiles/f_avi.prf

File renamed without changes.

‎ressource/f_dv.prf renamed to ‎avprofiles/f_dv.prf

File renamed without changes.

‎ressource/f_mkv.prf renamed to ‎avprofiles/f_mkv.prf

File renamed without changes.

‎ressource/f_vob.prf renamed to ‎avprofiles/f_vob.prf

File renamed without changes.

‎ressource/v_dnxhd120.prf renamed to ‎avprofiles/v_dnxhd120.prf

File renamed without changes.

‎ressource/v_dnxhd175x.prf renamed to ‎avprofiles/v_dnxhd175x.prf

File renamed without changes.

‎ressource/v_dnxhd185.prf renamed to ‎avprofiles/v_dnxhd185.prf

File renamed without changes.

‎ressource/v_dnxhd185x.prf renamed to ‎avprofiles/v_dnxhd185x.prf

File renamed without changes.

‎ressource/v_dnxhd36.prf renamed to ‎avprofiles/v_dnxhd36.prf

File renamed without changes.

‎ressource/v_dvcpro25.prf renamed to ‎avprofiles/v_dvcpro25.prf

File renamed without changes.

‎ressource/v_dvcpro50.prf renamed to ‎avprofiles/v_dvcpro50.prf

File renamed without changes.

‎ressource/v_h264_hq.prf renamed to ‎avprofiles/v_h264_hq.prf

File renamed without changes.

‎ressource/v_h264_lq.prf renamed to ‎avprofiles/v_h264_lq.prf

File renamed without changes.

‎ressource/v_mjpeg.prf renamed to ‎avprofiles/v_mjpeg.prf

File renamed without changes.

‎ressource/v_mpeg2.prf renamed to ‎avprofiles/v_mpeg2.prf

File renamed without changes.

‎ressource/v_proresHQ.prf renamed to ‎avprofiles/v_proresHQ.prf

File renamed without changes.

‎ressource/v_proresProxy.prf renamed to ‎avprofiles/v_proresProxy.prf

File renamed without changes.

‎ressource/v_rawYuv.prf renamed to ‎avprofiles/v_rawYuv.prf

File renamed without changes.

‎src/AvTranscoder/codec/ICodec.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,11 @@ void ICodec::openCodec()
8282
std::string ICodec::getCodecName() const
8383
{
8484
assert( _avCodecContext != NULL );
85-
return avcodec_descriptor_get( _avCodecContext->codec_id )->name;
85+
const AVCodecDescriptor * desc = avcodec_descriptor_get( _avCodecContext->codec_id );
86+
if( ! desc )
87+
throw std::runtime_error( "Codec Descriptor is not available." );
88+
89+
return desc->name;
8690
}
8791

8892
AVCodecID ICodec::getCodecId() const

‎src/CMakeLists.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ install(
5252
install(TARGETS avtranscoder-static DESTINATION lib/ OPTIONAL)
5353
install(TARGETS avtranscoder-shared DESTINATION lib/ OPTIONAL)
5454

55-
### Install AvTranscoder ressource
55+
### Install AvTranscoder avprofiles
5656
install(
57-
DIRECTORY "${PROJECT_SOURCE_DIR}/ressource"
57+
DIRECTORY "${PROJECT_SOURCE_DIR}/avprofiles"
5858
DESTINATION "share"
5959
FILES_MATCHING
6060
PATTERN "*.prf"
@@ -106,14 +106,15 @@ if(SWIG_FOUND)
106106

107107
# Install python interface
108108
set(AVTRANSCODER_PYTHON_BINDING_FILE "${CMAKE_SWIG_OUTDIR}/avtranscoder.py")
109-
set(AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR "lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/pyAvTranscoder/")
109+
string(SUBSTRING ${PYTHONLIBS_VERSION_STRING} 0 3 PYTHON_VERSION)
110+
set(AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR "lib/python${PYTHON_VERSION}/site-packages/pyAvTranscoder/")
110111
install(
111112
FILES ${AVTRANSCODER_PYTHON_BINDING_FILE} ${AVTRANSCODER_PYTHON_INIT_FILE}
112113
DESTINATION ${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}
113114
OPTIONAL
114115
)
115116
# Install python lib and __init__.py files
116-
install(TARGETS ${SWIG_MODULE_avtranscoder-py_REAL_NAME} DESTINATION "lib/python${PYTHONLIBS_VERSION_STRING}/site-packages/pyAvTranscoder/" OPTIONAL)
117+
install(TARGETS ${SWIG_MODULE_avtranscoder-py_REAL_NAME} DESTINATION ${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR} OPTIONAL)
117118
install(CODE "file(WRITE ${CMAKE_INSTALL_PREFIX}/${AVTRANSCODER_PYTHON_MODULE_OUTPUT_DIR}/__init__.py)")
118119
else()
119120
message("PYTHON not found, will not build python binding.")

‎tools/travis.python.nosetests.sh

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22

33
# Get avtranscoder library
44
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${DEPENDENCY_INSTALL}/lib
5-
export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7.6/site-packages/:$PYTHONPATH
6-
7-
# Get avtranscoder profiles
8-
export AVPROFILES=${AVTRANSCODER_INSTALL}/share/ressource
5+
export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7/site-packages/:$PYTHONPATH
96

107
# Get assets
118
git clone https://github.com/avTranscoder/avTranscoder-data.git

0 commit comments

Comments
 (0)