Skip to content

Commit 63bd981

Browse files
MarcAntoine-ArnaudMarcAntoine-Arnaud
committed
Merge branch 'master' of github.com:avTranscoder/avTranscoder into avmaster
2 parents bc1198e + bc424b3 commit 63bd981

32 files changed

+348
-374
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/avTranscoder/avTranscoder.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,12 @@ void transcodeVideo( const char* inputfilename, const char* outputFilename )
2626

2727
// init video decoders
2828
InputVideo inputVideo( input.getStream( 0 ) );
29-
Image sourceImage( input.getStream( 0 ).getVideoDesc().getImageDesc() );
29+
ImageDesc imageDesc = input.getStream( 0 ).getVideoDesc().getImageDesc();
30+
Image sourceImage( imageDesc );
3031

3132
// init video encoder
3233
OutputVideo outputVideo;
33-
outputVideo.setProfile( profile.getProfile( "xdcamhd422" ) );
34+
outputVideo.setProfile( profile.getProfile( "xdcamhd422" ), imageDesc );
3435
Image imageToEncode( outputVideo.getVideoDesc().getImageDesc() );
3536

3637
DataStream codedImage;

‎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

‎app/presetChecker/presetChecker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@ int main( int argc, char** argv )
2525
if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeVideo )
2626
{
2727
avtranscoder::OutputVideo outputVideo;
28-
outputVideo.setProfile( profile );
28+
outputVideo.setProfile( profile, outputVideo.getVideoDesc().getImageDesc() );
2929
}
3030

3131
if( profile.find( avtranscoder::Profile::avProfileType )->second == avtranscoder::Profile::avProfileTypeAudio )
3232
{
3333
avtranscoder::OutputAudio outputAudio;
34-
outputAudio.setProfile( profile );
34+
outputAudio.setProfile( profile, outputAudio.getAudioDesc().getFrameDesc() );
3535
}
3636

3737
}

‎src/AvTranscoder/DatasStructures/AudioDesc.cpp

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ extern "C" {
1717
#include <iostream>
1818
#include <stdexcept>
1919
#include <sstream>
20+
#include <cassert>
2021

2122
namespace avtranscoder
2223
{
@@ -36,6 +37,13 @@ AudioDesc::AudioDesc( const AVCodecID codecId )
3637
setAudioCodec( codecId );
3738
}
3839

40+
AudioDesc::AudioDesc( const AudioDesc& audioDesc )
41+
: m_codec( NULL )
42+
, m_codecContext( NULL )
43+
{
44+
setAudioCodec( audioDesc.getAudioCodecId() );
45+
}
46+
3947
void AudioDesc::setAudioCodec( const std::string& codecName )
4048
{
4149
avcodec_register_all(); // Warning: should be called only once
@@ -186,32 +194,38 @@ void AudioDesc::set( const std::string& key, const std::string& value )
186194

187195
std::string AudioDesc::getAudioCodec() const
188196
{
197+
assert( m_codecContext != NULL );
189198
return m_codecContext->codec_name;
190199
}
191200

192201
AVCodecID AudioDesc::getAudioCodecId() const
193202
{
203+
assert( m_codecContext != NULL );
194204
return m_codecContext->codec_id;
195205
}
196206

197207

198208
const size_t AudioDesc::getSampleRate() const
199209
{
210+
assert( m_codecContext != NULL );
200211
return m_codecContext->sample_rate;
201212
}
202213

203214
const size_t AudioDesc::getChannels() const
204215
{
216+
assert( m_codecContext != NULL );
205217
return m_codecContext->channels;
206218
}
207219

208220
const AVSampleFormat AudioDesc::getSampleFormat() const
209221
{
222+
assert( m_codecContext != NULL );
210223
return m_codecContext->sample_fmt;
211224
}
212225

213226
AudioFrameDesc AudioDesc::getFrameDesc() const
214227
{
228+
assert( m_codecContext != NULL );
215229
AudioFrameDesc audioFrameDesc;
216230

217231
audioFrameDesc.setChannels( m_codecContext->channels );

‎src/AvTranscoder/DatasStructures/AudioDesc.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ class AvExport AudioDesc
2525
public:
2626
AudioDesc( const std::string& codecName = "" );
2727
AudioDesc( const AVCodecID codecId );
28+
29+
AudioDesc( const AudioDesc& audioDesc );
2830

2931
void setAudioCodec( const std::string& codecName );
3032
void setAudioCodec( const AVCodecID codecId );

‎src/AvTranscoder/DatasStructures/VideoDesc.cpp

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ extern "C" {
1616
#include <iostream>
1717
#include <stdexcept>
1818
#include <sstream>
19+
#include <cassert>
1920

2021
namespace avtranscoder
2122
{
@@ -76,16 +77,19 @@ void VideoDesc::setTimeBase( const size_t num, const size_t den, const size_t ti
7677

7778
std::string VideoDesc::getVideoCodec() const
7879
{
80+
assert( m_codecContext != NULL );
7981
return m_codecContext->codec_name;
8082
}
8183

8284
AVCodecID VideoDesc::getVideoCodecId() const
8385
{
86+
assert( m_codecContext != NULL );
8487
return m_codecContext->codec_id;
8588
}
8689

8790
std::pair< size_t, size_t > VideoDesc::getTimeBase() const
8891
{
92+
assert( m_codecContext != NULL );
8993
std::pair< size_t, size_t > timeBase;
9094
timeBase.first = m_codecContext->time_base.num;
9195
timeBase.second = m_codecContext->time_base.den;
@@ -221,6 +225,7 @@ void VideoDesc::set( const std::string& key, const std::string& value )
221225

222226
ImageDesc VideoDesc::getImageDesc() const
223227
{
228+
assert( m_codecContext != NULL );
224229
ImageDesc imageDesc;
225230
Pixel pixel( m_codecContext->pix_fmt );
226231

0 commit comments

Comments
 (0)