InputFile/OutputFile: add log and return empty if format parameters are unknown

Clement Champetier · Clement Champetier · commit 1b0f75f03fd0 · 2015-06-04T16:49:54.000+02:00
diff --git a/src/AvTranscoder/file/InputFile.cpp b/src/AvTranscoder/file/InputFile.cpp
@@ -120,14 +120,20 @@ InputStream& InputFile::getStream( size_t index )
 std::string InputFile::getFormatName() const
 {
 	if( _formatContext.getAVInputFormat().name == NULL )
-		return "unknown";
+	{
+		LOG_WARN("Unknown demuxer format name of '" << _filename << "'.")
+		return "";
+	}
 	return std::string(_formatContext.getAVInputFormat().name);
 }
 
 std::string InputFile::getFormatLongName() const
 {
 	if( _formatContext.getAVInputFormat().long_name == NULL )
-		return "unknown";
+	{
+		LOG_WARN("Unknown demuxer format long name of '" << _filename << "'.")
+		return "";
+	}
 	return std::string(_formatContext.getAVInputFormat().long_name);
 }
 
@@ -138,7 +144,10 @@ std::string InputFile::getFormatMimeType() const
 	return "not available";
 #else
 	if( _formatContext.getAVInputFormat().mime_type == NULL )
-		return "unknown";
+	{
+		LOG_WARN("Unknown demuxer format mime type of '" << _filename << "'.")
+		return "";
+	}
 	return std::string(_formatContext.getAVInputFormat().mime_type);
 #endif
 }
diff --git a/src/AvTranscoder/file/InputFile.hpp b/src/AvTranscoder/file/InputFile.hpp
@@ -78,17 +78,17 @@ class AvExport InputFile
 	std::string getFilename() const { return _filename; }
 
 	/**
-	 * @brief A comma separated list of short names for the format, or unknown.
+	 * @brief A comma separated list of short names for the format, or empty if unknown.
 	 */
 	std::string getFormatName() const;
 
 	/**
-	 * @brief Descriptive name for the format, meant to be more human-readable than name, or unknown.
+	 * @brief Descriptive name for the format, meant to be more human-readable than name, or empty if unknown.
 	 */
 	std::string getFormatLongName() const;
 
 	/**
-	 * @brief Comma-separated list of mime types, or unknown.
+	 * @brief Comma-separated list of mime types, or empty if unknown.
 	 */
 	std::string getFormatMimeType() const;
 
diff --git a/src/AvTranscoder/file/OutputFile.cpp b/src/AvTranscoder/file/OutputFile.cpp
@@ -88,21 +88,30 @@ IOutputStream& OutputFile::getStream( const size_t streamId )
 std::string OutputFile::getFormatName() const
 {
 	if( _formatContext.getAVOutputFormat().name == NULL )
-		return "unknown";
+	{
+		LOG_WARN("Unknown muxer format name of '" << _filename << "'.")
+		return "";
+	}
 	return std::string(_formatContext.getAVOutputFormat().name);
 }
 
 std::string OutputFile::getFormatLongName() const
 {
 	if( _formatContext.getAVOutputFormat().long_name == NULL )
-		return "unknown";
+	{
+		LOG_WARN("Unknown muxer format long name of '" << _filename << "'.")
+		return "";
+	}
 	return std::string(_formatContext.getAVOutputFormat().long_name);
 }
 
 std::string OutputFile::getFormatMimeType() const
 {
 	if( _formatContext.getAVOutputFormat().mime_type == NULL )
-		return "unknown";
+	{
+		LOG_WARN("Unknown muxer format mime type of '" << _filename << "'.")
+		return "";
+	}
 	return std::string(_formatContext.getAVOutputFormat().mime_type);
 }
 
diff --git a/src/AvTranscoder/file/OutputFile.hpp b/src/AvTranscoder/file/OutputFile.hpp
@@ -57,17 +57,17 @@ class AvExport OutputFile : public IOutputFile
 	std::string getFilename() const { return _filename; }
 
 	/**
-	 * @brief A comma separated list of short names for the format, or unknown.
+	 * @brief A comma separated list of short names for the format, or empty if unknown.
 	 */
 	std::string getFormatName() const;
 
 	/**
-	 * @brief Descriptive name for the format, meant to be more human-readable than name, or unknown.
+	 * @brief Descriptive name for the format, meant to be more human-readable than name, or empty if unknown.
 	 */
 	std::string getFormatLongName() const;
 
 	/**
-	 * @brief Comma-separated list of mime types, or unknown.
+	 * @brief Comma-separated list of mime types, or empty if unknown.
 	 */
 	std::string getFormatMimeType() const;
 

Original file line number	Diff line number	Diff line change
`@@ -88,21 +88,30 @@ IOutputStream& OutputFile::getStream( const size_t streamId )`
`88`	`88`	`std::string OutputFile::getFormatName() const`
`89`	`89`	`{`
`90`	`90`	`if( _formatContext.getAVOutputFormat().name == NULL )`
`91`		`- return "unknown";`
	`91`	`+ {`
	`92`	`+ LOG_WARN("Unknown muxer format name of '" << _filename << "'.")`
	`93`	`+ return "";`
	`94`	`+ }`
`92`	`95`	`return std::string(_formatContext.getAVOutputFormat().name);`
`93`	`96`	`}`
`94`	`97`
`95`	`98`	`std::string OutputFile::getFormatLongName() const`
`96`	`99`	`{`
`97`	`100`	`if( _formatContext.getAVOutputFormat().long_name == NULL )`
`98`		`- return "unknown";`
	`101`	`+ {`
	`102`	`+ LOG_WARN("Unknown muxer format long name of '" << _filename << "'.")`
	`103`	`+ return "";`
	`104`	`+ }`
`99`	`105`	`return std::string(_formatContext.getAVOutputFormat().long_name);`
`100`	`106`	`}`
`101`	`107`
`102`	`108`	`std::string OutputFile::getFormatMimeType() const`
`103`	`109`	`{`
`104`	`110`	`if( _formatContext.getAVOutputFormat().mime_type == NULL )`
`105`		`- return "unknown";`
	`111`	`+ {`
	`112`	`+ LOG_WARN("Unknown muxer format mime type of '" << _filename << "'.")`
	`113`	`+ return "";`
	`114`	`+ }`
`106`	`115`	`return std::string(_formatContext.getAVOutputFormat().mime_type);`
`107`	`116`	`}`
`108`	`117`