Video/AudioEncoder: update message of exceptions

Clement Champetier · Clement Champetier · commit 60f0c02e5f18 · 2015-02-04T10:53:05.000+01:00
diff --git a/src/AvTranscoder/encoder/AudioEncoder.cpp b/src/AvTranscoder/encoder/AudioEncoder.cpp
@@ -46,20 +46,20 @@ bool AudioEncoder::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )
 	frame->channel_layout = avCodecContext.channel_layout;
 	
 	// we calculate the size of the samples buffer in bytes
-	int buffer_size = av_samples_get_buffer_size( NULL, avCodecContext.channels, frame->nb_samples, avCodecContext.sample_fmt, 0 );
-	if( buffer_size < 0 )
+	int bufferSize = av_samples_get_buffer_size( NULL, avCodecContext.channels, frame->nb_samples, avCodecContext.sample_fmt, 0 );
+	if( bufferSize < 0 )
 	{
 		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) );
+		av_strerror( bufferSize, err, sizeof(err) );
+		throw std::runtime_error( "Encode audio frame error: buffer size < 0 - " + std::string(err) );
 	}
 
-	int retvalue = avcodec_fill_audio_frame( frame, avCodecContext.channels, avCodecContext.sample_fmt, sourceAudioFrame.getData(), buffer_size, 0 );
+	int retvalue = avcodec_fill_audio_frame( frame, avCodecContext.channels, avCodecContext.sample_fmt, sourceAudioFrame.getData(), bufferSize, 0 );
 	if( retvalue < 0 )
 	{
 		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 ) );
+		throw std::runtime_error( "Encode audio frame error: avcodec fill audio frame - " + std::string( err ) );
 	}
 	
 	AVPacket& packet = codedFrame.getAVPacket();
@@ -84,15 +84,15 @@ bool AudioEncoder::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )
 	{
 		char err[AV_ERROR_MAX_STRING_SIZE];
 		av_strerror( ret, err, sizeof(err) );
-		throw std::runtime_error( "EncodeFrame error: avcodec encode audio frame - " + std::string( err ) );
+		throw std::runtime_error( "Encode audio frame error: avcodec encode audio frame - " + std::string( err ) );
 	}
 #else
 	int ret = avcodec_encode_audio( &avCodecContext, packet.data, packet.size, frame );
 	if( ret < 0 )
 	{
 		char err[AV_ERROR_MAX_STRING_SIZE];
 		av_strerror( ret, err, sizeof(err) );
-		throw std::runtime_error( "EncodeFrame error: avcodec encode audio frame - " + std::string( err ) );
+		throw std::runtime_error( "Encode audio frame error: avcodec encode audio frame - " + std::string( err ) );
 	}
 #endif
 	
@@ -124,7 +124,7 @@ bool AudioEncoder::encodeFrame( Frame& codedFrame )
 	{
 		char err[AV_ERROR_MAX_STRING_SIZE];
 		av_strerror( ret, err, sizeof(err) );
-		throw std::runtime_error( "EncodeFrame error: avcodec encode last audio frame - " + std::string( err ) );
+		throw std::runtime_error( "Encode audio frame error: avcodec encode last audio frame - " + std::string( err ) );
 	}
 	return ret == 0 && gotPacket == 1;
 
@@ -134,7 +134,7 @@ bool AudioEncoder::encodeFrame( Frame& codedFrame )
 	{
 		char err[AV_ERROR_MAX_STRING_SIZE];
 		av_strerror( ret, err, sizeof(err) );
-		throw std::runtime_error( "EncodeFrame error: avcodec encode last audio frame - " + std::string( err ) );
+		throw std::runtime_error( "Encode audio frame error: avcodec encode last audio frame - " + std::string( err ) );
 	}
 	return ret == 0;
 
diff --git a/src/AvTranscoder/encoder/VideoEncoder.cpp b/src/AvTranscoder/encoder/VideoEncoder.cpp
@@ -70,15 +70,15 @@ bool VideoEncoder::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )
 	{
 		char err[AV_ERROR_MAX_STRING_SIZE];
 		av_strerror( ret, err, sizeof(err) );
-		throw std::runtime_error( "EncodeFrame error: avcodec encode video frame - " + std::string( err ) );
+		throw std::runtime_error( "Encode video frame error: avcodec encode video frame - " + std::string( err ) );
 	}
 #else
 	int ret = avcodec_encode_video( &avCodecContext, packet.data, packet.size, frame );
 	if( ret < 0 )
 	{
 		char err[AV_ERROR_MAX_STRING_SIZE];
 		av_strerror( ret, err, sizeof(err) );
-		throw std::runtime_error( "EncodeFrame error: avcodec encode video frame - " + std::string( err ) );
+		throw std::runtime_error( "Encode video frame error: avcodec encode video frame - " + std::string( err ) );
 	}
 #endif
 
@@ -110,7 +110,7 @@ bool VideoEncoder::encodeFrame( Frame& codedFrame )
 	{
 		char err[AV_ERROR_MAX_STRING_SIZE];
 		av_strerror( ret, err, sizeof(err) );
-		throw std::runtime_error( "EncodeFrame error: avcodec encode last video frame - " + std::string( err ) );
+		throw std::runtime_error( "Encode video frame error: avcodec encode last video frame - " + std::string( err ) );
 	}
 	return ret == 0 && gotPacket == 1;
 #else
@@ -119,7 +119,7 @@ bool VideoEncoder::encodeFrame( Frame& codedFrame )
 	{
 		char err[AV_ERROR_MAX_STRING_SIZE];
 		av_strerror( ret, err, sizeof(err) );
-		throw std::runtime_error( "EncodeFrame error: avcodec encode last video frame - " + std::string( err ) );
+		throw std::runtime_error( "Encode video frame error: avcodec encode last video frame - " + std::string( err ) );
 	}
 	return ret == 0;
 #endif

Original file line number	Diff line number	Diff line change
`@@ -46,20 +46,20 @@ bool AudioEncoder::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )`
`46`	`46`	`frame->channel_layout = avCodecContext.channel_layout;`
`47`	`47`
`48`	`48`	`// we calculate the size of the samples buffer in bytes`
`49`		`- int buffer_size = av_samples_get_buffer_size( NULL, avCodecContext.channels, frame->nb_samples, avCodecContext.sample_fmt, 0 );`
`50`		`- if( buffer_size < 0 )`
	`49`	`+ int bufferSize = av_samples_get_buffer_size( NULL, avCodecContext.channels, frame->nb_samples, avCodecContext.sample_fmt, 0 );`
	`50`	`+ if( bufferSize < 0 )`
`51`	`51`	`{`
`52`	`52`	`char err[AV_ERROR_MAX_STRING_SIZE];`
`53`		`- av_strerror( buffer_size, err, sizeof(err) );`
`54`		`- throw std::runtime_error( "EncodeFrame error: buffer size < 0 - " + std::string(err) );`
	`53`	`+ av_strerror( bufferSize, err, sizeof(err) );`
	`54`	`+ throw std::runtime_error( "Encode audio frame error: buffer size < 0 - " + std::string(err) );`
`55`	`55`	`}`
`56`	`56`
`57`		`- int retvalue = avcodec_fill_audio_frame( frame, avCodecContext.channels, avCodecContext.sample_fmt, sourceAudioFrame.getData(), buffer_size, 0 );`
	`57`	`+ int retvalue = avcodec_fill_audio_frame( frame, avCodecContext.channels, avCodecContext.sample_fmt, sourceAudioFrame.getData(), bufferSize, 0 );`
`58`	`58`	`if( retvalue < 0 )`
`59`	`59`	`{`
`60`	`60`	`char err[AV_ERROR_MAX_STRING_SIZE];`
`61`	`61`	`av_strerror( retvalue, err, sizeof(err) );`
`62`		`- throw std::runtime_error( "EncodeFrame error: avcodec fill audio frame - " + std::string( err ) );`
	`62`	`+ throw std::runtime_error( "Encode audio frame error: avcodec fill audio frame - " + std::string( err ) );`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`AVPacket& packet = codedFrame.getAVPacket();`
`@@ -84,15 +84,15 @@ bool AudioEncoder::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )`
`84`	`84`	`{`
`85`	`85`	`char err[AV_ERROR_MAX_STRING_SIZE];`
`86`	`86`	`av_strerror( ret, err, sizeof(err) );`
`87`		`- throw std::runtime_error( "EncodeFrame error: avcodec encode audio frame - " + std::string( err ) );`
	`87`	`+ throw std::runtime_error( "Encode audio frame error: avcodec encode audio frame - " + std::string( err ) );`
`88`	`88`	`}`
`89`	`89`	`#else`
`90`	`90`	`int ret = avcodec_encode_audio( &avCodecContext, packet.data, packet.size, frame );`
`91`	`91`	`if( ret < 0 )`
`92`	`92`	`{`
`93`	`93`	`char err[AV_ERROR_MAX_STRING_SIZE];`
`94`	`94`	`av_strerror( ret, err, sizeof(err) );`
`95`		`- throw std::runtime_error( "EncodeFrame error: avcodec encode audio frame - " + std::string( err ) );`
	`95`	`+ throw std::runtime_error( "Encode audio frame error: avcodec encode audio frame - " + std::string( err ) );`
`96`	`96`	`}`
`97`	`97`	`#endif`
`98`	`98`
`@@ -124,7 +124,7 @@ bool AudioEncoder::encodeFrame( Frame& codedFrame )`
`124`	`124`	`{`
`125`	`125`	`char err[AV_ERROR_MAX_STRING_SIZE];`
`126`	`126`	`av_strerror( ret, err, sizeof(err) );`
`127`		`- throw std::runtime_error( "EncodeFrame error: avcodec encode last audio frame - " + std::string( err ) );`
	`127`	`+ throw std::runtime_error( "Encode audio frame error: avcodec encode last audio frame - " + std::string( err ) );`
`128`	`128`	`}`
`129`	`129`	`return ret == 0 && gotPacket == 1;`
`130`	`130`
`@@ -134,7 +134,7 @@ bool AudioEncoder::encodeFrame( Frame& codedFrame )`
`134`	`134`	`{`
`135`	`135`	`char err[AV_ERROR_MAX_STRING_SIZE];`
`136`	`136`	`av_strerror( ret, err, sizeof(err) );`
`137`		`- throw std::runtime_error( "EncodeFrame error: avcodec encode last audio frame - " + std::string( err ) );`
	`137`	`+ throw std::runtime_error( "Encode audio frame error: avcodec encode last audio frame - " + std::string( err ) );`
`138`	`138`	`}`
`139`	`139`	`return ret == 0;`
`140`	`140`
Original file line number	Diff line number	Diff line change
`@@ -70,15 +70,15 @@ bool VideoEncoder::encodeFrame( const Frame& sourceFrame, Frame& codedFrame )`
`70`	`70`	`{`
`71`	`71`	`char err[AV_ERROR_MAX_STRING_SIZE];`
`72`	`72`	`av_strerror( ret, err, sizeof(err) );`
`73`		`- throw std::runtime_error( "EncodeFrame error: avcodec encode video frame - " + std::string( err ) );`
	`73`	`+ throw std::runtime_error( "Encode video frame error: avcodec encode video frame - " + std::string( err ) );`
`74`	`74`	`}`
`75`	`75`	`#else`
`76`	`76`	`int ret = avcodec_encode_video( &avCodecContext, packet.data, packet.size, frame );`
`77`	`77`	`if( ret < 0 )`
`78`	`78`	`{`
`79`	`79`	`char err[AV_ERROR_MAX_STRING_SIZE];`
`80`	`80`	`av_strerror( ret, err, sizeof(err) );`
`81`		`- throw std::runtime_error( "EncodeFrame error: avcodec encode video frame - " + std::string( err ) );`
	`81`	`+ throw std::runtime_error( "Encode video frame error: avcodec encode video frame - " + std::string( err ) );`
`82`	`82`	`}`
`83`	`83`	`#endif`
`84`	`84`
`@@ -110,7 +110,7 @@ bool VideoEncoder::encodeFrame( Frame& codedFrame )`
`110`	`110`	`{`
`111`	`111`	`char err[AV_ERROR_MAX_STRING_SIZE];`
`112`	`112`	`av_strerror( ret, err, sizeof(err) );`
`113`		`- throw std::runtime_error( "EncodeFrame error: avcodec encode last video frame - " + std::string( err ) );`
	`113`	`+ throw std::runtime_error( "Encode video frame error: avcodec encode last video frame - " + std::string( err ) );`
`114`	`114`	`}`
`115`	`115`	`return ret == 0 && gotPacket == 1;`
`116`	`116`	`#else`
`@@ -119,7 +119,7 @@ bool VideoEncoder::encodeFrame( Frame& codedFrame )`
`119`	`119`	`{`
`120`	`120`	`char err[AV_ERROR_MAX_STRING_SIZE];`
`121`	`121`	`av_strerror( ret, err, sizeof(err) );`
`122`		`- throw std::runtime_error( "EncodeFrame error: avcodec encode last video frame - " + std::string( err ) );`
	`122`	`+ throw std::runtime_error( "Encode video frame error: avcodec encode last video frame - " + std::string( err ) );`
`123`	`123`	`}`
`124`	`124`	`return ret == 0;`
`125`	`125`	`#endif`