insert throw if cannot openning contexts

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit f6fc8b7ac3cb · 2014-02-21T15:47:33.000+01:00
diff --git a/src/AvTranscoder/DatasStructures/AudioDesc.cpp b/src/AvTranscoder/DatasStructures/AudioDesc.cpp
@@ -52,16 +52,19 @@ void AudioDesc::setAudioCodec( const AVCodecID codecId )
 void AudioDesc::initCodecContext( )
 {
 	if( m_codec == NULL )
-		return;
+	{
+		throw std::runtime_error( "unknown audio codec" );
+	}
 
 	if( ( m_codecContext = avcodec_alloc_context3( m_codec ) ) == NULL )
-		return;
+	{
+		throw std::runtime_error( "unable to create context for audio context" );
+	}
 
 	// Set default codec parameters
 	if( avcodec_get_context_defaults3( m_codecContext, m_codec ) != 0 )
 	{
-		m_codecContext = NULL;
-		return;
+		throw std::runtime_error( "unable to find audio codec default values" );
 	}
 }
 
diff --git a/src/AvTranscoder/DatasStructures/VideoDesc.cpp b/src/AvTranscoder/DatasStructures/VideoDesc.cpp
@@ -94,16 +94,19 @@ std::pair< size_t, size_t > VideoDesc::getTimeBase() const
 void VideoDesc::initCodecContext( )
 {
 	if( m_codec == NULL )
-		return;
+	{
+		throw std::runtime_error( "unknown audio codec" );
+	}
 
 	if( ( m_codecContext = avcodec_alloc_context3( m_codec ) ) == NULL )
-		return;
+	{
+		throw std::runtime_error( "unable to create context for video context" );
+	}
 
 	// Set default codec parameters
 	if( avcodec_get_context_defaults3( m_codecContext, m_codec ) != 0 )
 	{
-		m_codecContext = NULL;
-		return;
+		throw std::runtime_error( "unable to find video codec default values" );
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -52,16 +52,19 @@ void AudioDesc::setAudioCodec( const AVCodecID codecId )`
`52`	`52`	`void AudioDesc::initCodecContext( )`
`53`	`53`	`{`
`54`	`54`	`if( m_codec == NULL )`
`55`		`- return;`
	`55`	`+ {`
	`56`	`+ throw std::runtime_error( "unknown audio codec" );`
	`57`	`+ }`
`56`	`58`
`57`	`59`	`if( ( m_codecContext = avcodec_alloc_context3( m_codec ) ) == NULL )`
`58`		`- return;`
	`60`	`+ {`
	`61`	`+ throw std::runtime_error( "unable to create context for audio context" );`
	`62`	`+ }`
`59`	`63`
`60`	`64`	`// Set default codec parameters`
`61`	`65`	`if( avcodec_get_context_defaults3( m_codecContext, m_codec ) != 0 )`
`62`	`66`	`{`
`63`		`- m_codecContext = NULL;`
`64`		`- return;`
	`67`	`+ throw std::runtime_error( "unable to find audio codec default values" );`
`65`	`68`	`}`
`66`	`69`	`}`
`67`	`70`
Original file line number	Diff line number	Diff line change
`@@ -94,16 +94,19 @@ std::pair< size_t, size_t > VideoDesc::getTimeBase() const`
`94`	`94`	`void VideoDesc::initCodecContext( )`
`95`	`95`	`{`
`96`	`96`	`if( m_codec == NULL )`
`97`		`- return;`
	`97`	`+ {`
	`98`	`+ throw std::runtime_error( "unknown audio codec" );`
	`99`	`+ }`
`98`	`100`
`99`	`101`	`if( ( m_codecContext = avcodec_alloc_context3( m_codec ) ) == NULL )`
`100`		`- return;`
	`102`	`+ {`
	`103`	`+ throw std::runtime_error( "unable to create context for video context" );`
	`104`	`+ }`
`101`	`105`
`102`	`106`	`// Set default codec parameters`
`103`	`107`	`if( avcodec_get_context_defaults3( m_codecContext, m_codec ) != 0 )`
`104`	`108`	`{`
`105`		`- m_codecContext = NULL;`
`106`		`- return;`
	`109`	`+ throw std::runtime_error( "unable to find video codec default values" );`
`107`	`110`	`}`
`108`	`111`	`}`
`109`	`112`