Merge pull request #110 from cchampet/fix_FileProperties

valnoel · valnoel · commit 2b817e69cc1c · 2015-03-04T13:55:47.000+01:00
Fix media properties
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -40,8 +40,7 @@ std::string AudioProperties::getCodecName() const
 {
 	if( _codec && _codec->name )
 		return std::string( _codec->name );
-	else
-		return "unknown codec";
+	return "unknown codec";
 }
 
 std::string AudioProperties::getCodecLongName() const
diff --git a/src/AvTranscoder/mediaProperty/FileProperties.cpp b/src/AvTranscoder/mediaProperty/FileProperties.cpp
@@ -20,22 +20,22 @@ FileProperties::FileProperties( const FormatContext& formatContext )
 
 std::string FileProperties::getFilename() const
 {
-	if( ! _formatContext )
-		throw std::runtime_error( "unknown format context" );
+	if( ! _formatContext || ! _formatContext->filename )
+		return "unknown file name";
 	return _formatContext->filename;
 }
 
 std::string FileProperties::getFormatName() const
 {
-	if( ! _formatContext || ! _formatContext->iformat )
-		throw std::runtime_error( "unknown format context" );
+	if( ! _formatContext || ! _formatContext->iformat || ! _formatContext->iformat->name )
+		return "unknown format name";
 	return _formatContext->iformat->name;
 }
 
 std::string FileProperties::getFormatLongName() const
 {
-	if( ! _formatContext || ! _formatContext->iformat )
-		throw std::runtime_error( "unknown format context" );
+	if( ! _formatContext || ! _formatContext->iformat || ! _formatContext->iformat->long_name )
+		return "unknown format long name";
 	return _formatContext->iformat->long_name;
 }
 
diff --git a/src/AvTranscoder/mediaProperty/VideoProperties.cpp b/src/AvTranscoder/mediaProperty/VideoProperties.cpp
@@ -84,7 +84,7 @@ std::string VideoProperties::getProfileName() const
 
 		if( _codecContext->profile != -99 )
 		{
-			const char* profile;
+			const char* profile = NULL;
 			if( ( profile = av_get_profile_name( _codec, _codecContext->profile ) ) != NULL )
 				return std::string( profile );
 		}

Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,7 @@ std::string AudioProperties::getCodecName() const`
`40`	`40`	`{`
`41`	`41`	`if( _codec && _codec->name )`
`42`	`42`	`return std::string( _codec->name );`
`43`		`- else`
`44`		`- return "unknown codec";`
	`43`	`+ return "unknown codec";`
`45`	`44`	`}`
`46`	`45`
`47`	`46`	`std::string AudioProperties::getCodecLongName() const`
Original file line number	Diff line number	Diff line change
`@@ -20,22 +20,22 @@ FileProperties::FileProperties( const FormatContext& formatContext )`
`20`	`20`
`21`	`21`	`std::string FileProperties::getFilename() const`
`22`	`22`	`{`
`23`		`- if( ! _formatContext )`
`24`		`- throw std::runtime_error( "unknown format context" );`
	`23`	`+ if( ! _formatContext \|\| ! _formatContext->filename )`
	`24`	`+ return "unknown file name";`
`25`	`25`	`return _formatContext->filename;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`std::string FileProperties::getFormatName() const`
`29`	`29`	`{`
`30`		`- if( ! _formatContext \|\| ! _formatContext->iformat )`
`31`		`- throw std::runtime_error( "unknown format context" );`
	`30`	`+ if( ! _formatContext \|\| ! _formatContext->iformat \|\| ! _formatContext->iformat->name )`
	`31`	`+ return "unknown format name";`
`32`	`32`	`return _formatContext->iformat->name;`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`std::string FileProperties::getFormatLongName() const`
`36`	`36`	`{`
`37`		`- if( ! _formatContext \|\| ! _formatContext->iformat )`
`38`		`- throw std::runtime_error( "unknown format context" );`
	`37`	`+ if( ! _formatContext \|\| ! _formatContext->iformat \|\| ! _formatContext->iformat->long_name )`
	`38`	`+ return "unknown format long name";`
`39`	`39`	`return _formatContext->iformat->long_name;`
`40`	`40`	`}`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ std::string VideoProperties::getProfileName() const`
`84`	`84`
`85`	`85`	`if( _codecContext->profile != -99 )`
`86`	`86`	`{`
`87`		`- const char* profile;`
	`87`	`+ const char* profile = NULL;`
`88`	`88`	`if( ( profile = av_get_profile_name( _codec, _codecContext->profile ) ) != NULL )`
`89`	`89`	`return std::string( profile );`
`90`	`90`	`}`