Skip to content

Commit 23c77b9

Browse files
author
Clement Champetier
committed
Updated style format of src and app folders
1 parent f7293d3 commit 23c77b9

File tree

108 files changed

+7898
-8490
lines changed

Some content is hidden

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

108 files changed

+7898
-8490
lines changed

‎app/avInfo/avInfo.cpp

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

55
#include <AvTranscoder/Library.hpp>
66

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

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

20-
avtranscoder::preloadCodecsAndFormats();
19+
avtranscoder::preloadCodecsAndFormats();
2120

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;
21+
std::vector<std::string> inputExtension = avtranscoder::getInputExtensions();
22+
std::vector<std::string> outputExtension =
23+
avtranscoder::getOutputExtensions();
24+
25+
std::cout << "Supported input extensions: " << inputExtension.size()
26+
<< std::endl;
27+
for (std::vector<std::string>::iterator it = inputExtension.begin();
28+
it != inputExtension.end(); ++it)
29+
std::cout << *it << ", ";
30+
;
31+
32+
std::cout << std::endl
33+
<< std::endl
34+
<< "Supported output extensions: " << outputExtension.size()
35+
<< std::endl;
36+
for (std::vector<std::string>::iterator it = outputExtension.begin();
37+
it != outputExtension.end(); ++it)
38+
std::cout << *it << ", ";
39+
std::cout << std::endl;
40+
return 0;
3441
}

‎app/avMeta/avMeta.cpp

Lines changed: 41 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -5,52 +5,45 @@
55

66
#include <iostream>
77

8-
int main( int argc, char** argv )
9-
{
10-
bool toJson = false;
11-
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";
17-
18-
if( argc < 2 )
19-
{
20-
std::cout << help << std::endl;
21-
return( 1 );
22-
}
23-
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;
8+
int main(int argc, char **argv) {
9+
bool toJson = false;
10+
11+
std::string help;
12+
help += "Usage\n";
13+
help += "\tavmeta INPUT_FILE [--json][--help]\n";
14+
help += "Command line options\n";
15+
help += "\t--json: print properties as json\n";
16+
17+
if (argc < 2) {
18+
std::cout << help << std::endl;
19+
return (1);
20+
}
21+
22+
// List command line arguments
23+
std::vector<std::string> arguments;
24+
for (int argument = 1; argument < argc; ++argument) {
25+
arguments.push_back(argv[argument]);
26+
}
27+
for (size_t argument = 0; argument < arguments.size(); ++argument) {
28+
if (arguments.at(argument) == "--help") {
29+
std::cout << help << std::endl;
30+
return 0;
31+
} else if (arguments.at(argument) == "--json") {
32+
toJson = true;
33+
}
34+
}
35+
36+
avtranscoder::preloadCodecsAndFormats();
37+
avtranscoder::Logger::setLogLevel(AV_LOG_QUIET);
38+
39+
// analyse inputFile
40+
avtranscoder::InputFile input(argv[1]);
41+
avtranscoder::NoDisplayProgress p;
42+
input.analyse(p, avtranscoder::eAnalyseLevelFirstGop);
43+
44+
// display file properties
45+
if (toJson)
46+
std::cout << input.getProperties().allPropertiesAsJson() << std::endl;
47+
else
48+
std::cout << input;
5649
}

0 commit comments

Comments
 (0)