Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commitd473e82

Browse files
Merge pull request#141 from mikrosimage/release/v0.5.7
MIK fork: up to v0.5.7
2 parents5815088 +35e8681 commitd473e82

File tree

66 files changed

+856
-451
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+856
-451
lines changed

‎.travis.yml

Lines changed: 30 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
env:
22
global:
3-
-AVTRANSCODER_BUILD=${TRAVIS_BUILD_DIR}/build
4-
-AVTRANSCODER_INSTALL=${TRAVIS_BUILD_DIR}/install
5-
-J='-j3'
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
67
matrix:
78
-DEPENDENCY_MODE=libav
89
-DEPENDENCY_MODE=ffmpeg
@@ -28,21 +29,39 @@ before_script:
2829
-./tools/travis.gcc.install.coverage.sh
2930

3031
# install avtranscoder dependencies
31-
-if ["${TRAVIS_OS_NAME}" = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi
32-
-if ["${TRAVIS_OS_NAME}" = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi
32+
-if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi
33+
-if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi
3334

3435
script:
35-
#Build
36+
#build
3637
-mkdir -p ${AVTRANSCODER_BUILD}
3738
-cd ${AVTRANSCODER_BUILD}
38-
-cmake .. -DCMAKE_INSTALL_PREFIX=${AVTRANSCODER_INSTALL} -DCMAKE_BUILD_TYPE=Release -DAVTRANSCODER_PYTHON_VERSION_OF_BINDING=2.7 -DAVTRANSCODER_COVERAGE=True
39-
-make $J install
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
40+
-make -j${CI_NODE_TOTAL}
41+
-make install
4042

41-
#Launch tests
42-
-if ["${DEPENDENCY_MODE}" = "ffmpeg" ]; then ./../tools/travis.python.nosetests.sh; fi
43+
#launch tests
44+
-if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./../tools/travis.python.nosetests.sh; fi
4345

4446
after_success:
4547
-cd ${TRAVIS_BUILD_DIR}
4648

4749
# generate coverage for coveralls
48-
-if [ "${CC}" = "gcc" ]; then ./tools/travis.gcc.generate.coverage.sh; fi
50+
-if [ ${CC} = "gcc" ]; then ./tools/travis.gcc.generate.coverage.sh; fi
51+
52+
before_deploy:
53+
# create archive
54+
-cd ${TRAVIS_BUILD_DIR}
55+
-tar -cvzf avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz ${DEPENDENCY_INSTALL} ${AVTRANSCODER_INSTALL}
56+
57+
deploy:
58+
# if the commit is tagged, deploy using github release service
59+
provider:releases
60+
api_key:
61+
secure:${GITHUB_RELEASE_API_KEY}
62+
file:avtranscoder-${TRAVIS_OS_NAME}-${CC}-${DEPENDENCY_MODE}.tgz
63+
skip_cleanup:true
64+
on:
65+
tags:true
66+
condition:${TRAVIS_OS_NAME} = "linux"
67+

‎CMakeLists.txt

Lines changed: 4 additions & 1 deletion
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"6")
8+
set(AVTRANSCODER_VERSION_MICRO"7")
99
set(AVTRANSCODER_VERSION${AVTRANSCODER_VERSION_MAJOR}.${AVTRANSCODER_VERSION_MINOR}.${AVTRANSCODER_VERSION_MICRO})
1010

1111
# Define AvTranscoder versions
@@ -19,6 +19,9 @@ add_definitions(-DAVTRANSCODER_DEFAULT_AVPROFILES="${CMAKE_INSTALL_PREFIX}/share
1919
# Diplay commands being ran by CMake
2020
set(CMAKE_VERBOSE_MAKEFILEOFF)
2121

22+
# The install rule does not depend on all, i.e. everything will not be built before installing
23+
set(CMAKE_SKIP_INSTALL_ALL_DEPENDENCYTRUE)
24+
2225
# CPP flags on debug / release mode
2326
if(MSVC)
2427
set(CMAKE_CXX_FLAGS_DEBUG"${CMAKE_CXX_FLAGS_DEBUG} /MTd")

‎README.md

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -21,35 +21,7 @@ See [**COPYING.md**](COPYING.md)
2121
See[**INSTALL.md**](INSTALL.md)
2222

2323
####How to use
24-
Check out applications contained in the project to see examples of how to use the library in C++, Java or Python.
25-
26-
To encode, avTranscoder manipulates profiles.
27-
A profile is a text file which discribes, with a set of key-value, what we want as output for the format, the video, or the audio.
28-
You can create your own profiles and export a variable called```AVPROFILES``` to indicate the path to them.
29-
30-
The minimum format profile is:
31-
```
32-
avProfileName=profileName
33-
avProfileLongName=profileLongName
34-
avProfileType=avProfileTypeFormat
35-
format=formatName
36-
```
37-
38-
The minimum video profile is:
39-
```
40-
avProfileName=profileName
41-
avProfileLongName=profileLongName
42-
avProfileType=avProfileTypeVideo
43-
codec=codecName
44-
```
45-
46-
The minimum audio profile is:
47-
```
48-
avProfileName=profileName
49-
avProfileLongName=profileLongName
50-
avProfileType=avProfileTypeAudio
51-
codec=codecName
52-
```
24+
See[**USAGE.md**](USAGE.md)
5325

5426
####Tests
5527

‎USAGE.md

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
#How to use avTranscoder
2+
3+
Check out applications contained in the project to see examples of how to use the library in C++, Java or Python.
4+
5+
####In C++
6+
Set environment:
7+
```
8+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/path/to/ffmpeg/lib:/path/to/avtranscoder/lib
9+
export PATH=$PATH:/path/to/avtranscoder/bin
10+
```
11+
12+
####In Java
13+
Add argument to the JVM:
14+
```
15+
-Djava.library.path=/path/to/avtranscoder/lib/java
16+
```
17+
Set environment:
18+
```
19+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/path/to/ffmpeg/lib
20+
```
21+
22+
####In Python
23+
Set environment:
24+
```
25+
export PYTHONPATH=$PYTHONPATH:/path/to/avtranscoder/lib/python<version>/site-packages/
26+
export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/path/to/ffmpeg/lib
27+
```
28+
29+
####Use profiles
30+
To wrap/unwrap/encode/decode, avTranscoder manipulates profiles.
31+
A profile is a set of key-value given as parameters to the InputFile(unwrap), the OutputFile(wrap), the Video/AudioDecoder(decode) or the Video/AudioEncoder(encode).
32+
There are two ways to manipulate profiles:
33+
* create profiles inside your code, by instanciate```Map``` structures.
34+
* create profiles outside your code, by create text files.
35+
To indicate the path to the text files, export environment variable:
36+
```
37+
export AVPROFILES=/path/to/profiles
38+
```
39+
40+
The minimum format profile (wrap/unwrap) is:
41+
```
42+
avProfileName=profileName
43+
avProfileLongName=profileLongName
44+
avProfileType=avProfileTypeFormat
45+
format=formatName
46+
```
47+
48+
The minimum video profile (encode/decode) is:
49+
```
50+
avProfileName=profileName
51+
avProfileLongName=profileLongName
52+
avProfileType=avProfileTypeVideo
53+
codec=codecName
54+
```
55+
56+
The minimum audio profile (encode/decode) is:
57+
```
58+
avProfileName=profileName
59+
avProfileLongName=profileLongName
60+
avProfileType=avProfileTypeAudio
61+
codec=codecName
62+
```

‎app/avInfo/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ install(
2020
FILES${BINARY_FILES}
2121
PERMISSIONSOWNER_EXECUTEOWNER_WRITEOWNER_READGROUP_EXECUTEGROUP_READWORLD_READWORLD_EXECUTE
2222
DESTINATION"bin/"
23+
OPTIONAL
2324
)
2425

2526
install(

‎app/avMeta/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ install(
2020
FILES${BINARY_FILES}
2121
PERMISSIONSOWNER_EXECUTEOWNER_WRITEOWNER_READGROUP_EXECUTEGROUP_READWORLD_READWORLD_EXECUTE
2222
DESTINATION"bin/"
23+
OPTIONAL
2324
)
2425

2526
install(

‎app/avPlay/AvReader.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ AvReader::AvReader( const std::string& filename )
1717
_inputFile.activateStream( _videoStream );
1818

1919
_inputVideo =newavtranscoder::VideoDecoder( _inputFile.getStream( _videoStream ) );
20-
_inputVideo->setup();
20+
_inputVideo->setupDecoder();
2121

2222
_sourceImage =newavtranscoder::VideoFrame( _inputFile.getStream( _videoStream ).getVideoCodec().getVideoFrameDesc() );
2323

‎app/avPlay/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ install(
4242
FILES${BINARY_FILES}
4343
PERMISSIONSOWNER_EXECUTEOWNER_WRITEOWNER_READGROUP_EXECUTEGROUP_READWORLD_READWORLD_EXECUTE
4444
DESTINATION"bin/"
45+
OPTIONAL
4546
)
4647

4748
install(

‎app/avProcessor/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ install(
2020
FILES${BINARY_FILES}
2121
PERMISSIONSOWNER_EXECUTEOWNER_WRITEOWNER_READGROUP_EXECUTEGROUP_READWORLD_READWORLD_EXECUTE
2222
DESTINATION"bin/"
23+
OPTIONAL
2324
)
2425

2526
install(

‎app/pyProcessor/pyprocessor.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
importsys
1+
#!/usr/bin/env python
2+
23
importargparse# python2.7+
34

45
frompyAvTranscoderimportavtranscoderasav

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp