Skip to content

Clean use of av_strerror #13

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Dec 3, 2014
Merged

Clean use of av_strerror #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions src/AvTranscoder/essenceStream/AvInputAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@ void AvInputAudio::setup()
msg += avCodec->long_name;
msg += " (";
msg += avCodec->name;
msg += ")";
msg += ") ";
avcodec_close( avCodecContext );

char err[250];
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( ret, err, sizeof(err) );
msg += err;

av_strerror( ret, err, 250 );
std::cout << err << std::endl;
throw std::runtime_error( msg );
}

Expand Down Expand Up @@ -173,12 +173,10 @@ bool AvInputAudio::decodeNextFrame()
packet.size = data.getSize();

int ret = avcodec_decode_audio4( _codec->getAVCodecContext(), _frame, &got_frame, &packet );

if( ret < 0 )
{
char err[250];
av_strerror( ret, err, 250 );

char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( ret, err, sizeof(err) );
throw std::runtime_error( "an error occured during audio decoding" + std::string( err ) );
}

Expand Down
5 changes: 2 additions & 3 deletions src/AvTranscoder/essenceStream/AvInputVideo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,8 @@ bool AvInputVideo::decodeNextFrame()
int ret = avcodec_decode_video2( _codec->getAVCodecContext(), _frame, &got_frame, &packet );
if( ret < 0 )
{
char err[250];
av_strerror( ret, err, 250);

char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( ret, err, sizeof(err) );
throw std::runtime_error( "an error occured during video decoding - " + std::string(err) );
}
av_free_packet( &packet );
Expand Down
14 changes: 6 additions & 8 deletions src/AvTranscoder/essenceStream/AvOutputAudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ void AvOutputAudio::setup()
int ret = avcodec_open2( codecContext, _codec.getAVCodec(), NULL );
if( ret < 0 )
{
char err[250];
av_strerror( ret, err, 250);
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( ret, err, sizeof(err) );
std::string msg = "could not open audio encoder: ";
msg += err;
throw std::runtime_error( msg );
Expand Down Expand Up @@ -69,18 +69,16 @@ bool AvOutputAudio::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )
int buffer_size = av_samples_get_buffer_size( NULL, codecContext->channels, frame->nb_samples, codecContext->sample_fmt, 0 );
if( buffer_size < 0 )
{
char err[250];
av_strerror( buffer_size, err, 250 );

char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( buffer_size, err, sizeof(err) );
throw std::runtime_error( "EncodeFrame error: buffer size < 0 - " + std::string(err) );
}

int retvalue = avcodec_fill_audio_frame( frame, codecContext->channels, codecContext->sample_fmt, sourceAudioFrame.getPtr(), buffer_size, 0 );
if( retvalue < 0 )
{
char err[250];
av_strerror( retvalue, err, 250);

char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( retvalue, err, sizeof(err) );
throw std::runtime_error( "EncodeFrame error: avcodec fill audio frame - " + std::string( err ) );
}

Expand Down
4 changes: 2 additions & 2 deletions src/AvTranscoder/essenceStream/AvOutputVideo.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ void AvOutputVideo::setup( )
int ret = avcodec_open2( codecContext, _codec.getAVCodec(), NULL );
if( ret < 0 )
{
char err[250];
av_strerror( ret, err, 250);
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( ret, err, sizeof(err) );
std::string msg = "could not open video encoder: ";
msg += err;
throw std::runtime_error( msg );
Expand Down
12 changes: 6 additions & 6 deletions src/AvTranscoder/file/OutputFile.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,8 @@ bool OutputFile::beginWrap( )
int ret = avformat_write_header( _formatContext, NULL );
if( ret != 0 )
{
char err[250];
av_strerror( ret, err, 250);
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( ret, err, sizeof(err) );
std::string msg = "could not write header: ";
msg += err;
throw std::runtime_error( msg );
Expand Down Expand Up @@ -170,8 +170,8 @@ IOutputStream::EWrappingStatus OutputFile::wrap( const CodedData& data, const si

if( ret != 0 )
{
char err[250];
av_strerror( ret, err, 250);
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( ret, err, sizeof(err) );
std::string msg = "error when writting packet in stream: ";
msg += err;
// throw std::runtime_error( msg );
Expand Down Expand Up @@ -229,8 +229,8 @@ void OutputFile::addMetadata( const std::string& key, const std::string& value )
int ret = av_dict_set( &_formatContext->metadata, key.c_str(), value.c_str(), 0 );
if( ret < 0 )
{
char err[250];
av_strerror( ret, err, 250 );
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( ret, err, sizeof(err) );
std::cout << err << std::endl;
}
}
Expand Down
14 changes: 7 additions & 7 deletions src/AvTranscoder/option/Option.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ void Option::setFlag( const std::string& flag, const bool enable )
if( error )
{
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
av_strerror( error, err, sizeof(err) );
throw std::runtime_error( "unknown key " + getName() + ": " + err );
}

Expand All @@ -111,7 +111,7 @@ void Option::setFlag( const std::string& flag, const bool enable )
if( error )
{
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
av_strerror( error, err, sizeof(err) );
throw std::runtime_error( "setting " + getName() + " parameter to " + flag + ": " + err );
}
}
Expand All @@ -122,7 +122,7 @@ void Option::setBool( const bool value )
if( error )
{
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
av_strerror( error, err, sizeof(err) );
throw std::runtime_error( "setting " + getName() + " parameter to " + ( value ? "true" : "false" ) + ": " + err );
}
}
Expand All @@ -135,7 +135,7 @@ void Option::setInt( const int value )
std::ostringstream os;
os << value;
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
av_strerror( error, err, sizeof(err) );
throw std::runtime_error( "setting " + getName() + " parameter to " + os.str() + ": " + err );
}
}
Expand All @@ -151,7 +151,7 @@ void Option::setRatio( const int num, const int den )
std::ostringstream os;
os << num << "/" << den;
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
av_strerror( error, err, sizeof(err) );
throw std::runtime_error( "setting " + getName() + " parameter to " + os.str() + ": " + err );
}
}
Expand All @@ -164,7 +164,7 @@ void Option::setDouble( const double value )
std::ostringstream os;
os << value;
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
av_strerror( error, err, sizeof(err) );
throw std::runtime_error( "setting " + getName() + " parameter to " + os.str() + ": " + err );
}
}
Expand All @@ -175,7 +175,7 @@ void Option::setString( const std::string& value )
if( error )
{
char err[AV_ERROR_MAX_STRING_SIZE];
av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
av_strerror( error, err, sizeof(err) );
throw std::runtime_error( "setting " + getName() + " parameter to " + value + ": " + err );
}
}
Expand Down