Merge pull request #64 from cchampet/fix_coverity_warnings

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit dcc32da595cc · 2014-08-20T14:31:03.000+02:00
Fix Coverity Scan warnings
diff --git a/src/AvTranscoder/Metadatas/VideoStreamProperties.hpp b/src/AvTranscoder/Metadatas/VideoStreamProperties.hpp
@@ -124,6 +124,7 @@ VideoProperties videoStreamInfo(
 	vp.maxBitRate       = codec_context->rc_max_rate;
 	vp.minBitRate       = codec_context->rc_min_rate;
 	vp.isInterlaced     = false;
+	vp.topFieldFirst    = false;
 
 	vp.ticksPerFrame    = codec_context->ticks_per_frame,
 	vp.width            = codec_context->width,
diff --git a/src/AvTranscoder/common.cpp b/src/AvTranscoder/common.cpp
@@ -27,16 +27,14 @@ void ParamSet::set( const std::string& key, const std::string& flag, const bool
 
 	if( ! flagOpt )
 	{
-		std::cout << flag << std::endl << " : " << flagOpt->default_val.i64 << std::endl;
 		throw std::runtime_error( "unknown flag " + flag );
 	}
 
 	error = av_opt_get_int( _objContext, key.c_str(), AV_OPT_SEARCH_CHILDREN, &optVal );
 	if( error != 0 )
 	{
-		std::string err( "", AV_ERROR_MAX_STRING_SIZE );
-		//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
-		av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
+		char err[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
 		throw std::runtime_error( "unknown key " + key + ": " + err );
 	}
 
@@ -48,9 +46,8 @@ void ParamSet::set( const std::string& key, const std::string& flag, const bool
 	error = av_opt_set_int( _objContext, key.c_str(), optVal, AV_OPT_SEARCH_CHILDREN );
 	if( error != 0 )
 	{
-		std::string err( "", AV_ERROR_MAX_STRING_SIZE );
-		//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
-		av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
+		char err[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
 		throw std::runtime_error( "setting " + key + " parameter to " + flag + ": " + err );
 	}
 }
@@ -60,9 +57,8 @@ void ParamSet::set( const std::string& key, const bool value )
 	int error = av_opt_set_int( _objContext, key.c_str(), value, AV_OPT_SEARCH_CHILDREN );
 	if( error != 0 )
 	{
-		std::string err( "", AV_ERROR_MAX_STRING_SIZE );
-		//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
-		av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
+		char err[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
 		throw std::runtime_error( "setting " + key + " parameter to " + ( value ? "true" : "false" ) + ": " + err );
 	}
 }
@@ -76,9 +72,8 @@ void ParamSet::set( const std::string& key, const int value )
 	{
 		std::ostringstream os;
 		os << value;
-		std::string err( "", AV_ERROR_MAX_STRING_SIZE );
-		//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
-		av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
+		char err[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
 		throw std::runtime_error( "setting " + key + " parameter to " + os.str() + ": " + err );
 	}
 }
@@ -93,9 +88,8 @@ void ParamSet::set( const std::string& key, const int num, const int den )
 	{
 		std::ostringstream os;
 		os << num << "/" << den;
-		std::string err( "", AV_ERROR_MAX_STRING_SIZE );
-		//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
-		av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
+		char err[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
 		throw std::runtime_error( "setting " + key + " parameter to " + os.str() + ": " + err );
 	}
 }
@@ -107,9 +101,8 @@ void ParamSet::set( const std::string& key, const double value )
 	{
 		std::ostringstream os;
 		os << value;
-		std::string err( "", AV_ERROR_MAX_STRING_SIZE );
-		//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
-		av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
+		char err[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
 		throw std::runtime_error( "setting " + key + " parameter to " + os.str() + ": " + err );
 	}
 }
@@ -119,9 +112,8 @@ void ParamSet::set( const std::string& key, const std::string& value )
 	int error = av_opt_set( _objContext, key.c_str(), value.c_str(), AV_OPT_SEARCH_CHILDREN );
 	if( error != 0 )
 	{
-		std::string err( "", AV_ERROR_MAX_STRING_SIZE );
-		//av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );
-		av_strerror( error, const_cast<char*>(err.c_str()), err.size() );
+		char err[AV_ERROR_MAX_STRING_SIZE];
+		av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );
 		throw std::runtime_error( "setting " + key + " parameter to " + value + ": " + err );
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -27,16 +27,14 @@ void ParamSet::set( const std::string& key, const std::string& flag, const bool`
`27`	`27`
`28`	`28`	`if( ! flagOpt )`
`29`	`29`	`{`
`30`		`- std::cout << flag << std::endl << " : " << flagOpt->default_val.i64 << std::endl;`
`31`	`30`	`throw std::runtime_error( "unknown flag " + flag );`
`32`	`31`	`}`
`33`	`32`
`34`	`33`	`error = av_opt_get_int( _objContext, key.c_str(), AV_OPT_SEARCH_CHILDREN, &optVal );`
`35`	`34`	`if( error != 0 )`
`36`	`35`	`{`
`37`		`- std::string err( "", AV_ERROR_MAX_STRING_SIZE );`
`38`		`- //av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );`
`39`		`- av_strerror( error, const_cast<char*>(err.c_str()), err.size() );`
	`36`	`+ char err[AV_ERROR_MAX_STRING_SIZE];`
	`37`	`+ av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );`
`40`	`38`	`throw std::runtime_error( "unknown key " + key + ": " + err );`
`41`	`39`	`}`
`42`	`40`
`@@ -48,9 +46,8 @@ void ParamSet::set( const std::string& key, const std::string& flag, const bool`
`48`	`46`	`error = av_opt_set_int( _objContext, key.c_str(), optVal, AV_OPT_SEARCH_CHILDREN );`
`49`	`47`	`if( error != 0 )`
`50`	`48`	`{`
`51`		`- std::string err( "", AV_ERROR_MAX_STRING_SIZE );`
`52`		`- //av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );`
`53`		`- av_strerror( error, const_cast<char*>(err.c_str()), err.size() );`
	`49`	`+ char err[AV_ERROR_MAX_STRING_SIZE];`
	`50`	`+ av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );`
`54`	`51`	`throw std::runtime_error( "setting " + key + " parameter to " + flag + ": " + err );`
`55`	`52`	`}`
`56`	`53`	`}`
`@@ -60,9 +57,8 @@ void ParamSet::set( const std::string& key, const bool value )`
`60`	`57`	`int error = av_opt_set_int( _objContext, key.c_str(), value, AV_OPT_SEARCH_CHILDREN );`
`61`	`58`	`if( error != 0 )`
`62`	`59`	`{`
`63`		`- std::string err( "", AV_ERROR_MAX_STRING_SIZE );`
`64`		`- //av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );`
`65`		`- av_strerror( error, const_cast<char*>(err.c_str()), err.size() );`
	`60`	`+ char err[AV_ERROR_MAX_STRING_SIZE];`
	`61`	`+ av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );`
`66`	`62`	`throw std::runtime_error( "setting " + key + " parameter to " + ( value ? "true" : "false" ) + ": " + err );`
`67`	`63`	`}`
`68`	`64`	`}`
`@@ -76,9 +72,8 @@ void ParamSet::set( const std::string& key, const int value )`
`76`	`72`	`{`
`77`	`73`	`std::ostringstream os;`
`78`	`74`	`os << value;`
`79`		`- std::string err( "", AV_ERROR_MAX_STRING_SIZE );`
`80`		`- //av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );`
`81`		`- av_strerror( error, const_cast<char*>(err.c_str()), err.size() );`
	`75`	`+ char err[AV_ERROR_MAX_STRING_SIZE];`
	`76`	`+ av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );`
`82`	`77`	`throw std::runtime_error( "setting " + key + " parameter to " + os.str() + ": " + err );`
`83`	`78`	`}`
`84`	`79`	`}`
`@@ -93,9 +88,8 @@ void ParamSet::set( const std::string& key, const int num, const int den )`
`93`	`88`	`{`
`94`	`89`	`std::ostringstream os;`
`95`	`90`	`os << num << "/" << den;`
`96`		`- std::string err( "", AV_ERROR_MAX_STRING_SIZE );`
`97`		`- //av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );`
`98`		`- av_strerror( error, const_cast<char*>(err.c_str()), err.size() );`
	`91`	`+ char err[AV_ERROR_MAX_STRING_SIZE];`
	`92`	`+ av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );`
`99`	`93`	`throw std::runtime_error( "setting " + key + " parameter to " + os.str() + ": " + err );`
`100`	`94`	`}`
`101`	`95`	`}`
`@@ -107,9 +101,8 @@ void ParamSet::set( const std::string& key, const double value )`
`107`	`101`	`{`
`108`	`102`	`std::ostringstream os;`
`109`	`103`	`os << value;`
`110`		`- std::string err( "", AV_ERROR_MAX_STRING_SIZE );`
`111`		`- //av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );`
`112`		`- av_strerror( error, const_cast<char*>(err.c_str()), err.size() );`
	`104`	`+ char err[AV_ERROR_MAX_STRING_SIZE];`
	`105`	`+ av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );`
`113`	`106`	`throw std::runtime_error( "setting " + key + " parameter to " + os.str() + ": " + err );`
`114`	`107`	`}`
`115`	`108`	`}`
`@@ -119,9 +112,8 @@ void ParamSet::set( const std::string& key, const std::string& value )`
`119`	`112`	`int error = av_opt_set( _objContext, key.c_str(), value.c_str(), AV_OPT_SEARCH_CHILDREN );`
`120`	`113`	`if( error != 0 )`
`121`	`114`	`{`
`122`		`- std::string err( "", AV_ERROR_MAX_STRING_SIZE );`
`123`		`- //av_make_error_string( const_cast<char*>(err.c_str()), err.size(), error );`
`124`		`- av_strerror( error, const_cast<char*>(err.c_str()), err.size() );`
	`115`	`+ char err[AV_ERROR_MAX_STRING_SIZE];`
	`116`	`+ av_strerror( error, err, AV_ERROR_MAX_STRING_SIZE );`
`125`	`117`	`throw std::runtime_error( "setting " + key + " parameter to " + value + ": " + err );`
`126`	`118`	`}`
`127`	`119`	`}`