Skip to content

Commit 95c4bec

Browse files
cchampetcchampet
committed
Merge branch 'develop' of https://github.com/avTranscoder/avTranscoder into dev_audioReaderChannelIndex
2 parents f2cc0ca + 54043f7 commit 95c4bec

File tree

143 files changed

+8634
-8218
lines changed

Some content is hidden

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

143 files changed

+8634
-8218
lines changed

‎.travis.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,22 +65,22 @@ before_script:
6565
- cd ${TRAVIS_BUILD_DIR}
6666

6767
# install coverage tools
68-
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.install.coverage.sh; fi
68+
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.install.coverage.sh; fi
6969

7070
# install avtranscoder dependencies
71-
- if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis.linux.install.deps.sh; fi
72-
- if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis.osx.install.deps.sh; fi
71+
- if [ ${TRAVIS_OS_NAME} = "linux" ]; then ./tools/travis/linux.install.deps.sh; fi
72+
- if [ ${TRAVIS_OS_NAME} = "osx" ]; then ./tools/travis/osx.install.deps.sh; fi
7373

7474
script:
7575
# build
76-
- ./tools/travis.build.sh
76+
- ./tools/travis/build.sh
7777

7878
# launch tests
79-
- if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi
79+
- if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./tools/travis/python.nosetests.sh; fi
8080

8181
after_success:
8282
# generate coverage for coveralls
83-
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.generate.coverage.sh; fi
83+
- if [ ${ENABLE_COVERAGE} ]; then ./tools/travis/gcc.generate.coverage.sh; fi
8484

8585
before_deploy:
8686
# copy libbz2, external dependency of libavformat

‎README.md

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ Based on Libav/FFmpeg libraries to support various video and audio formats, avTr
77
[![Build Status](https://travis-ci.org/avTranscoder/avTranscoder.svg?branch=develop)](https://travis-ci.org/avTranscoder/avTranscoder)
88
[![Coverage Status](https://coveralls.io/repos/avTranscoder/avTranscoder/badge.svg)](https://coveralls.io/r/avTranscoder/avTranscoder)
99
<a href="https://scan.coverity.com/projects/2626"><img alt="Coverity Scan Build Status" src="https://scan.coverity.com/projects/2626/badge.svg"/></a>
10+
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/avTranscoder/avtranscoder/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
11+
12+
[![Stories in Progress](https://badge.waffle.io/avTranscoder/avTranscoder.svg?label=2 - Working&title=In Progress)](http://waffle.io/avTranscoder/avTranscoder)
13+
Click on the badge above to have a big picture view of what's in progress and how you can help.
1014

1115
#### What you need to know
1216
* C++ library
@@ -47,8 +51,3 @@ Note: for continuous integration, we launch tests with media files contained in
4751

4852
###### Build openSUSE
4953
comming soon
50-
51-
52-
53-
[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/avTranscoder/avtranscoder/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
54-

‎app/avInfo/avInfo.cpp

Lines changed: 24 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -4,31 +4,32 @@
44

55
#include <AvTranscoder/Library.hpp>
66

7-
int main( int argc, char** argv )
7+
int main(int argc, char** argv)
88
{
9-
avtranscoder::Libraries libs( avtranscoder::getLibraries() );
9+
avtranscoder::Libraries libs(avtranscoder::getLibraries());
1010

11-
for( avtranscoder::Libraries::iterator library = libs.begin(); library != libs.end(); ++library )
12-
{
13-
std::cout << std::left;
14-
std::cout << std::setw( 15 ) << (*library).getName();
15-
std::cout << std::setw( 10 ) << (*library).getStringVersion();
16-
std::cout << std::setw( 30 ) << (*library).getLicense();
17-
std::cout << std::endl;
18-
}
11+
for(avtranscoder::Libraries::iterator library = libs.begin(); library != libs.end(); ++library)
12+
{
13+
std::cout << std::left;
14+
std::cout << std::setw(15) << (*library).getName();
15+
std::cout << std::setw(10) << (*library).getStringVersion();
16+
std::cout << std::setw(30) << (*library).getLicense();
17+
std::cout << std::endl;
18+
}
1919

20-
avtranscoder::preloadCodecsAndFormats();
20+
avtranscoder::preloadCodecsAndFormats();
2121

22-
std::vector<std::string> inputExtension = avtranscoder::getInputExtensions();
23-
std::vector<std::string> outputExtension = avtranscoder::getOutputExtensions();
24-
25-
std::cout << "Supported input extensions: " << inputExtension.size() << std::endl;
26-
for( std::vector<std::string>::iterator it = inputExtension.begin(); it != inputExtension.end(); ++it )
27-
std::cout << *it << ", ";;
28-
29-
std::cout << std::endl << std::endl << "Supported output extensions: " << outputExtension.size() << std::endl;
30-
for( std::vector<std::string>::iterator it = outputExtension.begin(); it != outputExtension.end(); ++it )
31-
std::cout << *it << ", ";
32-
std::cout << std::endl;
33-
return 0;
22+
std::vector<std::string> inputExtension = avtranscoder::getInputExtensions();
23+
std::vector<std::string> outputExtension = avtranscoder::getOutputExtensions();
24+
25+
std::cout << "Supported input extensions: " << inputExtension.size() << std::endl;
26+
for(std::vector<std::string>::iterator it = inputExtension.begin(); it != inputExtension.end(); ++it)
27+
std::cout << *it << ", ";
28+
;
29+
30+
std::cout << std::endl << std::endl << "Supported output extensions: " << outputExtension.size() << std::endl;
31+
for(std::vector<std::string>::iterator it = outputExtension.begin(); it != outputExtension.end(); ++it)
32+
std::cout << *it << ", ";
33+
std::cout << std::endl;
34+
return 0;
3435
}

‎app/avMeta/avMeta.cpp

Lines changed: 45 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,56 @@
11
#include <AvTranscoder/file/InputFile.hpp>
2-
#include <AvTranscoder/mediaProperty/print.hpp>
2+
#include <AvTranscoder/properties/print.hpp>
33

44
#include <AvTranscoder/progress/NoDisplayProgress.hpp>
55

66
#include <iostream>
77

8-
int main( int argc, char** argv )
8+
int main(int argc, char** argv)
99
{
10-
if( argc != 2 )
11-
{
12-
std::cout << "avmeta require a media filename" << std::endl;
13-
return( -1 );
14-
}
10+
bool toJson = false;
1511

16-
avtranscoder::preloadCodecsAndFormats();
12+
std::string help;
13+
help += "Usage\n";
14+
help += "\tavmeta INPUT_FILE [--json][--help]\n";
15+
help += "Command line options\n";
16+
help += "\t--json: print properties as json\n";
1717

18-
// analyse inputFile
19-
avtranscoder::InputFile input( argv[1] );
20-
avtranscoder::NoDisplayProgress p;
21-
input.analyse( p, avtranscoder::eAnalyseLevelFirstGop );
18+
if(argc < 2)
19+
{
20+
std::cout << help << std::endl;
21+
return (1);
22+
}
2223

23-
// display file properties
24-
std::cout << input;
24+
// List command line arguments
25+
std::vector<std::string> arguments;
26+
for(int argument = 1; argument < argc; ++argument)
27+
{
28+
arguments.push_back(argv[argument]);
29+
}
30+
for(size_t argument = 0; argument < arguments.size(); ++argument)
31+
{
32+
if(arguments.at(argument) == "--help")
33+
{
34+
std::cout << help << std::endl;
35+
return 0;
36+
}
37+
else if(arguments.at(argument) == "--json")
38+
{
39+
toJson = true;
40+
}
41+
}
42+
43+
avtranscoder::preloadCodecsAndFormats();
44+
avtranscoder::Logger::setLogLevel(AV_LOG_QUIET);
45+
46+
// analyse inputFile
47+
avtranscoder::InputFile input(argv[1]);
48+
avtranscoder::NoDisplayProgress p;
49+
input.analyse(p, avtranscoder::eAnalyseLevelFirstGop);
50+
51+
// display file properties
52+
if(toJson)
53+
std::cout << input.getProperties().allPropertiesAsJson() << std::endl;
54+
else
55+
std::cout << input;
2556
}

0 commit comments

Comments
 (0)
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