AudioProperties: all getters throw exception when can't access data

Clement Champetier · Clement Champetier · commit 9fbb444ab0ae · 2015-03-17T14:37:16.000+01:00
diff --git a/src/AvTranscoder/mediaProperty/AudioProperties.cpp b/src/AvTranscoder/mediaProperty/AudioProperties.cpp
@@ -38,33 +38,34 @@ size_t AudioProperties::getStreamId() const
 
 std::string AudioProperties::getCodecName() const
 {
-	if( _codec && _codec->name )
-		return std::string( _codec->name );
-	return "unknown codec";
+	if( ! _codec || ! _codec->name )
+		throw std::runtime_error( "unknown codec name" );
+	return std::string( _codec->name );
 }
 
 std::string AudioProperties::getCodecLongName() const
 {
-	if( _codec && _codec->long_name )
-		return std::string( _codec->long_name );
-	return "unknown codec";
+	if( ! _codec || ! _codec->long_name )
+		throw std::runtime_error( "unknown codec long name" );
+	return std::string( _codec->long_name );
 }
 
 std::string AudioProperties::getSampleFormatName() const
 {
 	if( ! _codecContext )
-		return "unknown codec context";
+		throw std::runtime_error( "unknown codec context" );
 
 	const char* fmtName = av_get_sample_fmt_name( _codecContext->sample_fmt );
-	if( fmtName )
-		return std::string( fmtName );
-	return "unknown sample format";
+	if( ! fmtName )
+		throw std::runtime_error( "unknown sample format" );
+
+	return std::string( fmtName );
 }
 
 std::string AudioProperties::getSampleFormatLongName() const
 {
 	if( ! _codecContext )
-		return "unknown codec context";
+		throw std::runtime_error( "unknown codec context" );
 
 	switch( _codecContext->sample_fmt )
 	{
@@ -99,7 +100,7 @@ std::string AudioProperties::getSampleFormatLongName() const
 std::string AudioProperties::getChannelLayout() const
 {
 	if( ! _codecContext )
-		return "unknown codec context";
+		throw std::runtime_error( "unknown codec context" );
 
 	char buf1[1024];
 	av_get_channel_layout_string( buf1, sizeof( buf1 ), -1, _codecContext->channel_layout );
@@ -109,26 +110,27 @@ std::string AudioProperties::getChannelLayout() const
 std::string AudioProperties::getChannelName() const
 {
 	if( ! _codecContext )
-		return "unknown codec context";
+		throw std::runtime_error( "unknown codec context" );
 
 	const char* channelName = av_get_channel_name( _codecContext->channel_layout );
-	if( channelName )
-		return std::string( channelName );
-	return "unknown channel name";
+	if( ! channelName )
+		throw std::runtime_error( "unknown channel name" );
+
+	return std::string( channelName );
 }
 
 std::string AudioProperties::getChannelDescription() const
 {
 	if( ! _codecContext )
-		return "unknown codec context";
+		throw std::runtime_error( "unknown codec context" );
 
-#ifdef FF_RESAMPLE_LIBRARY
+#ifdef AVTRANSCODER_FFMPEG_DEPENDENCY
 	const char* channelDescription = av_get_channel_description( _codecContext->channel_layout );
-	if( channelDescription )
-		return std::string( channelDescription );
-	return "unknown channel description";
+	if( ! channelDescription )
+		throw std::runtime_error( "unknown channel description" );
+	return std::string( channelDescription );
 #else
-	return "can't access channel description";
+	throw std::runtime_error( "can't access channel description" );
 #endif
 }
 
