Skip to content

Commit f7ca0f4

Browse files
MarcAntoine-ArnaudMarcAntoine-Arnaud
committed
Merge pull request #16 from MarcAntoine-Arnaud/master
Adding EssenceTransformation and some minor changes
2 parents 6c08905 + 1337383 commit f7ca0f4

15 files changed

+186
-262
lines changed

‎app/SConscript

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -66,19 +66,6 @@ avprocessor = env.Program(
6666
],
6767
)
6868

69-
audioRewrapper = env.Program(
70-
'audioWrap',
71-
Glob( 'audioRewrapper/*.cpp' ),
72-
LIBS = [
73-
sAvTranscoder,
74-
'avutil',
75-
'avformat',
76-
'avcodec',
77-
'swscale',
78-
resampleLibraryName,
79-
]
80-
)
81-
8269
if platform.system() != 'Windows':
8370
avplayer = env.Program(
8471
'avplayer',
@@ -128,9 +115,7 @@ avprofiles = env.Program(
128115
)
129116

130117
env.Depends( avmeta, sAvTranscoder )
131-
env.Depends( audioRewrapper, sAvTranscoder )
132118

133119
env.Alias( "install", env.Install(os.path.join( installPrefix, "bin" ), avmeta ) )
134120
env.Alias( "install", env.Install(os.path.join( installPrefix, "bin" ), avprocessor ) )
135121
env.Alias( "install", env.Install(os.path.join( installPrefix, "bin" ), avtransform ) )
136-
env.Alias( "install", env.Install(os.path.join( installPrefix, "bin" ), audioRewrapper ) )

‎app/audioRewrapper/audioRewrapper.cpp

Lines changed: 0 additions & 151 deletions
This file was deleted.

‎app/avInfo/avInfo.cpp

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,15 @@
66

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

11-
for( avtranscoder::AvVersions::iterator libVersion = versions.begin(); libVersion != versions.end(); ++libVersion )
11+
for( avtranscoder::Libraries::iterator library = libs.begin(); library != libs.end(); ++library )
1212
{
13-
std::cout << std::left << std::setw( 15 ) << (*libVersion).first;
14-
std::cout << std::left << std::setw( 30 ) << avtranscoder::getLicence();
15-
16-
std::stringstream completeVersion;
17-
for( std::vector<size_t>::iterator version = (*libVersion).second.begin(); version != (*libVersion).second.end(); ++version )
18-
{
19-
completeVersion << *version << ".";
20-
}
21-
std::cout << completeVersion.str() << std::endl;
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).getLicence();
17+
std::cout << std::endl;
2218
}
2319

2420
// std::cout << "avinfo" << std::endl;

‎app/optionChecker/optionChecker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ void displayOptions( avtranscoder::OptionLoader::OptionArray& options )
6060
}
6161
}
6262

63-
int optionChecker( const std::string& inputfilename )
63+
void optionChecker( const std::string& inputfilename )
6464
{
6565
avtranscoder::OptionLoader optionLoader;
6666

‎src/AvTranscoder/Description.cpp

Lines changed: 58 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -16,64 +16,79 @@ extern "C" {
1616
}
1717

1818
#include <cstring>
19-
#include <algorithm> //sort, unique
19+
#include <sstream>
20+
#include <algorithm>
2021

2122
namespace avtranscoder
2223
{
2324

24-
std::map< std::string, std::vector<size_t> > getVersion()
25+
Library::Library( const std::string& name, const std::string& licence, const size_t major, const size_t minor, const size_t release )
26+
: _name( name )
27+
, _licence( licence )
28+
, _major( major )
29+
, _minor( minor )
30+
, _release( release )
2531
{
26-
std::map< std::string, std::vector<size_t> > version;
32+
}
2733

28-
std::vector<size_t> avutilVersion;
29-
avutilVersion.push_back( LIBAVUTIL_VERSION_MAJOR );
30-
avutilVersion.push_back( LIBAVUTIL_VERSION_MINOR );
31-
avutilVersion.push_back( LIBAVUTIL_VERSION_MICRO );
34+
std::string Library::getName()
35+
{
36+
return _name;
37+
}
3238

33-
std::vector<size_t> avformatVersion;
34-
avformatVersion.push_back( LIBAVFORMAT_VERSION_MAJOR );
35-
avformatVersion.push_back( LIBAVFORMAT_VERSION_MINOR );
36-
avformatVersion.push_back( LIBAVFORMAT_VERSION_MICRO );
39+
std::vector<size_t> Library::getVersion()
40+
{
41+
std::vector<size_t> version;
42+
version.push_back( _major );
43+
version.push_back( _minor );
44+
version.push_back( _release );
45+
return version;
46+
}
3747

38-
std::vector<size_t> avcodecVersion;
39-
avcodecVersion.push_back( LIBAVCODEC_VERSION_MAJOR );
40-
avcodecVersion.push_back( LIBAVCODEC_VERSION_MINOR );
41-
avcodecVersion.push_back( LIBAVCODEC_VERSION_MICRO );
48+
std::string Library::getStringVersion()
49+
{
50+
std::stringstream version;
51+
version << _major << ".";
52+
version << _minor << ".";
53+
version << _release;
54+
return version.str();
55+
}
4256

43-
std::vector<size_t> swscaleVersion;
44-
swscaleVersion.push_back( LIBSWSCALE_VERSION_MAJOR );
45-
swscaleVersion.push_back( LIBSWSCALE_VERSION_MINOR );
46-
swscaleVersion.push_back( LIBSWSCALE_VERSION_MICRO );
57+
size_t Library::getMajorVersion()
58+
{
59+
return _major;
60+
}
4761

48-
#ifdef AV_RESAMPLE_LIBRARY
49-
std::vector<size_t> avresampleVersion;
50-
avresampleVersion.push_back( LIBAVRESAMPLE_VERSION_MAJOR );
51-
avresampleVersion.push_back( LIBAVRESAMPLE_VERSION_MINOR );
52-
avresampleVersion.push_back( LIBAVRESAMPLE_VERSION_MICRO );
53-
#else
54-
std::vector<size_t> swresampleVersion;
55-
swresampleVersion.push_back( LIBSWRESAMPLE_VERSION_MAJOR );
56-
swresampleVersion.push_back( LIBSWRESAMPLE_VERSION_MINOR );
57-
swresampleVersion.push_back( LIBSWRESAMPLE_VERSION_MICRO );
58-
#endif
62+
size_t Library::getMinorVersion()
63+
{
64+
return _minor;
65+
}
5966

60-
version[ "avutil" ] = avutilVersion;
61-
version[ "avformat" ] = avformatVersion;
62-
version[ "avcodec" ] = avcodecVersion;
63-
version[ "swscale" ] = swscaleVersion;
64-
#ifdef AV_RESAMPLE_LIBRARY
65-
version[ "avresample" ] = avresampleVersion;
66-
#else
67-
version[ "swresample" ] = swresampleVersion;
68-
#endif
67+
size_t Library::getReleaseVersion()
68+
{
69+
return _release;
70+
}
6971

70-
return version;
72+
std::string Library::getLicence()
73+
{
74+
return _licence;
7175
}
7276

73-
std::string getLicence()
77+
Libraries getLibraries()
7478
{
75-
std::string licence( avutil_license() );
76-
return licence;
79+
Libraries libs;
80+
81+
libs.push_back( Library( "avutil", avutil_license(), LIBAVUTIL_VERSION_MAJOR, LIBAVUTIL_VERSION_MINOR, LIBAVUTIL_VERSION_MICRO ) );
82+
libs.push_back( Library( "avformat", avformat_license(), LIBAVFORMAT_VERSION_MAJOR, LIBAVFORMAT_VERSION_MINOR, LIBAVFORMAT_VERSION_MICRO ) );
83+
libs.push_back( Library( "avcodec", avcodec_license(), LIBAVCODEC_VERSION_MAJOR, LIBAVCODEC_VERSION_MINOR, LIBAVCODEC_VERSION_MICRO ) );
84+
#ifdef AV_RESAMPLE_LIBRARY
85+
libs.push_back( Library( "avresample", avutil_license(), LIBAVRESAMPLE_VERSION_MAJOR, LIBAVRESAMPLE_VERSION_MINOR, LIBAVRESAMPLE_VERSION_MICRO ) );
86+
#else
87+
libs.push_back( Library( "swresample", avutil_license(), LIBSWRESAMPLE_VERSION_MAJOR, LIBSWRESAMPLE_VERSION_MINOR, LIBSWRESAMPLE_VERSION_MICRO ) );
88+
#endif
89+
libs.push_back( Library( "swscale", avutil_license(), LIBSWSCALE_VERSION_MAJOR, LIBSWSCALE_VERSION_MINOR, LIBSWSCALE_VERSION_MICRO ) );
90+
91+
return libs;
7792
}
7893

7994
std::vector<std::string> getInputExtensions()

‎src/AvTranscoder/Description.hpp

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,31 @@
1010
namespace avtranscoder
1111
{
1212

13-
typedef std::map< std::string, std::vector<size_t> > AvVersions;
13+
class Library
14+
{
15+
public:
16+
Library( const std::string& name, const std::string& licence, const size_t major, const size_t minor, const size_t release );
17+
18+
std::string getName();
19+
20+
std::vector<size_t> getVersion();
21+
std::string getStringVersion();
22+
size_t getMajorVersion();
23+
size_t getMinorVersion();
24+
size_t getReleaseVersion();
25+
26+
std::string getLicence();
27+
private:
28+
std::string _name;
29+
std::string _licence;
30+
size_t _major;
31+
size_t _minor;
32+
size_t _release;
33+
};
34+
35+
typedef std::vector< Library > Libraries;
1436

15-
AvVersions getVersion();
16-
std::string getLicence();
37+
Libraries getLibraries();
1738

1839
std::vector<std::string> getInputExtensions();
1940

0 commit comments

Comments
 (0)