Skip to content

Commit 0e21fe3

Browse files
cchampetcchampet
committed
Merge pull request #224 from cchampet/travis_buildThirdParties
* Travis: build ffmpeg with its third parties * Travis: check pyTest with ffmpeg 2.6/2.7/2.8 * Appveyor: store artifacts and deploy to github release when tag on master * Add newline at end of files
2 parents 234d96a + c3cdbac commit 0e21fe3

27 files changed

+246
-66
lines changed

‎.travis.yml

Lines changed: 26 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,29 @@ env:
1818
- AVTRANSCODER_BUILD_PATH=${TRAVIS_BUILD_DIR}/build-avtranscoder
1919
- AVTRANSCODER_INSTALL=install-avtranscoder
2020
- AVTRANSCODER_INSTALL_PATH=${TRAVIS_BUILD_DIR}/${AVTRANSCODER_INSTALL}
21+
2122
- DEPENDENCY_INSTALL=install-dependency
2223
- DEPENDENCY_INSTALL_PATH=${TRAVIS_BUILD_DIR}/${DEPENDENCY_INSTALL}
24+
25+
- DEPENDENCY_LOG_FILE=${TRAVIS_BUILD_DIR}/build-dependencies-log.txt
26+
27+
- YASM_VERSION=1.3.0
28+
- LAME_VERSION=3.99.5
29+
- FAAC_VERSION=1.28
30+
- XVID_VERSION=1.3.3
31+
- FDKAAC_VERSION=0.1.3
32+
- OGG_VERSION=1.3.2
33+
- VORBIS_VERSION=1.3.4
34+
- VPX_VERSION=1.4.0
2335
matrix:
2436
- DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
2537
- DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false
2638
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
2739
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=false
2840
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.5.7 ENABLE_COVERAGE=false
41+
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.6.8 ENABLE_COVERAGE=false
42+
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.7.6 ENABLE_COVERAGE=false
43+
- DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.8.6 ENABLE_COVERAGE=false
2944

3045
matrix:
3146
exclude:
@@ -39,6 +54,12 @@ matrix:
3954
env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
4055
- os: osx
4156
env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.4.2 ENABLE_COVERAGE=true
57+
allow_failures:
58+
# build with libav
59+
- env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=true
60+
- env: DEPENDENCY_NAME=libav DEPENDENCY_VERSION=11.3 ENABLE_COVERAGE=false
61+
# build with ffmpeg-2.8.6
62+
- env: DEPENDENCY_NAME=ffmpeg DEPENDENCY_VERSION=2.8.6 ENABLE_COVERAGE=false
4263
fast_finish: true
4364

4465
# This results in a 2×2×2x2 build matrix.
@@ -83,12 +104,16 @@ script:
83104
- ./tools/travis/build.sh
84105

85106
# launch tests
86-
- if [ ${TRAVIS_OS_NAME} = "linux" ] && [ ${DEPENDENCY_NAME} = "ffmpeg" ]; then ./tools/travis/python.nosetests.sh; fi
107+
- if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis/python.nosetests.sh; fi
87108

88109
after_success:
89110
# generate coverage for coveralls
90111
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.generate.coverage.sh; fi
91112

113+
after_failure:
114+
- cat ${AVTRANSCODER_BUILD_PATH}/CMakeFiles/CMakeOutput.log
115+
- cat ${DEPENDENCY_LOG_FILE}
116+
92117
before_deploy:
93118
# copy libbz2, external dependency of libavformat
94119
- 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

‎INSTALL.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ AvTranscoder uses CMake as build system.
44

55
#### Dependencies
66
AvTranscoder can depend on ffmpeg, libav, or any fork of these projects that follow the same API.
7-
* Recommended ffmpeg versions: 2.4.2, 2.4.5, 2.5.7
8-
* Recommended libav versions: 11.3
7+
* Tested ffmpeg versions: 2.4.2, 2.4.5, 2.5.7, 2.6.8, 2.7.6
8+
* Recommended libav versions: none
99

1010
#### To build
1111
```

‎README.md

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
# avTranscoder
22

3-
C++ API for Libav / FFmpeg
3+
C++ API for FFmpeg / Libav
44

5-
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.
5+
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.
66

77
[![Build Status](https://travis-ci.org/avTranscoder/avTranscoder.svg?branch=develop)](https://travis-ci.org/avTranscoder/avTranscoder)
88
[![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
1313
[![Stories in Progress](https://badge.waffle.io/avTranscoder/avTranscoder.svg?label=2 - Working&title=In Progress)](http://waffle.io/avTranscoder/avTranscoder)
1414
Click on the badge above to have a big picture view of what's in progress and how you can help.
1515

16+
:warning: The latest avTranscoder API does not fit with libav.
17+
1618
#### What you need to know
1719
* C++ library
1820
* Java and Python bindings generated with SWIG

‎appveyor.yml

Lines changed: 23 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ platform:
77

88
environment:
99
FFMPEG_VERSION: 2.4.5
10+
DEPENDENCY_INSTALL_PATH: C:\ProgramData\ffmpeg-2.4.5
11+
AVTRANSCODER_INSTALL_PATH: C:\projects\avtranscoder\build\install
1012

1113
matrix:
1214
fast_finish: true
@@ -33,23 +35,24 @@ on_failure:
3335
- type "C:\ProgramData\chocolatey\logs\chocolatey.log"
3436
- type "C:\projects\avtranscoder\build\CMakeFiles\CMakeOutput.log"
3537

36-
#on_success:
37-
# - create archives
38-
39-
#artifacts:
40-
# - path: C:\ProgramData\ffmpeg-2.2.11
41-
# name: ffmpeg
42-
# type: zip
43-
44-
# - path: C:\projects\avtranscoder\build
45-
# name: avtranscoder
46-
# type: zip
47-
48-
#deploy:
49-
# - provider: GitHub
50-
# artifact: ffmpeg,avtranscoder
51-
# auth_token:
52-
# secure: <your encrypted token>
53-
# on:
54-
# branch: master
55-
# appveyor_repo_tag: true
38+
on_success:
39+
- 7z a ffmpeg.zip %DEPENDENCY_INSTALL_PATH%
40+
- 7z a avtranscoder.zip %AVTRANSCODER_INSTALL_PATH%
41+
42+
artifacts:
43+
- path: ffmpeg.zip
44+
name: ffmpeg
45+
type: zip
46+
47+
- path: avtranscoder.zip
48+
name: avtranscoder
49+
type: zip
50+
51+
deploy:
52+
- provider: GitHub
53+
artifact: ffmpeg,avtranscoder
54+
auth_token:
55+
secure: sApasbQe2i7Uu+XNhlkXg+F6zI0VNHUjhq5QfK6/+NSs4lX/9BwhkLvibQc6bmMv
56+
on:
57+
branch: master
58+
appveyor_repo_tag: true

‎src/AvTranscoder/codec/AudioCodec.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ class AvExport AudioCodec : public ICodec
2020
};
2121
}
2222

23-
#endif
23+
#endif

‎src/AvTranscoder/codec/DataCodec.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,4 @@ class AvExport DataCodec : public ICodec
1515
};
1616
}
1717

18-
#endif
18+
#endif

‎src/AvTranscoder/codec/VideoCodec.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,4 @@ class AvExport VideoCodec : public ICodec
2020
};
2121
}
2222

23-
#endif
23+
#endif

‎src/AvTranscoder/decoder/AudioGenerator.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ class AvExport AudioGenerator : public IDecoder
2727
};
2828
}
2929

30-
#endif
30+
#endif

‎src/AvTranscoder/encoder/AudioEncoder.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,4 +29,4 @@ class AvExport AudioEncoder : public IEncoder
2929
};
3030
}
3131

32-
#endif
32+
#endif

‎src/AvTranscoder/encoder/IEncoder.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,4 +44,4 @@ class AvExport IEncoder
4444
};
4545
}
4646

47-
#endif
47+
#endif

0 commit comments

Comments
 (0)