OutputEssence: raise exception in setup instead of return false

Clement Champetier · Clement Champetier · commit 398033dcb841 · 2014-07-18T10:43:17.000+02:00
OutputVideo and OutputAudio: raise runtime_error if "could not allocate"
or "could not open" video / audio codec.
diff --git a/src/AvTranscoder/EssenceStream/OutputAudio.cpp b/src/AvTranscoder/EssenceStream/OutputAudio.cpp
@@ -24,20 +24,27 @@ OutputAudio::OutputAudio()
 {
 }
 
-bool OutputAudio::setup()
+void OutputAudio::setup()
 {
 	av_register_all();  // Warning: should be called only once
 
 	AVCodecContext* codecContext( _audioDesc.getCodecContext() );
 
 	if( codecContext == NULL )
-		return false;
+	{
+		throw std::runtime_error( "could not allocate audio codec context" );
+	}
 	
 	// try to open encoder with parameters.
-	if( avcodec_open2( codecContext, _audioDesc.getCodec(), NULL ) < 0 )
-		return false;
-
-	return true;
+	int ret = avcodec_open2( codecContext, _audioDesc.getCodec(), NULL );
+	if( ret < 0 )
+	{
+		char err[250];
+		av_strerror( ret, err, 250);
+		std::string msg = "could not open audio encoder: ";
+		msg += err;
+		throw std::runtime_error( msg );
+	}
 }
 
 bool OutputAudio::encodeFrame( const Frame& sourceFrame, DataStream& codedFrame )
diff --git a/src/AvTranscoder/EssenceStream/OutputAudio.hpp b/src/AvTranscoder/EssenceStream/OutputAudio.hpp
@@ -17,7 +17,7 @@ class OutputAudio : public OutputEssence
 public:
 	OutputAudio();
 	
-	bool setup();
+	void setup();
 
 	/**
 	 * @param[out] codedFrame
diff --git a/src/AvTranscoder/EssenceStream/OutputEssence.hpp b/src/AvTranscoder/EssenceStream/OutputEssence.hpp
@@ -30,9 +30,8 @@ class AvExport OutputEssence
 
 	/**
 	 * @brief Setup the encoder
-	 * @return status of setup
 	 */
-	virtual bool setup() = 0;
+	virtual void setup() = 0;
 
 	/**
 	 * @brief Encode a new frame, and get coded frame
diff --git a/src/AvTranscoder/EssenceStream/OutputVideo.cpp b/src/AvTranscoder/EssenceStream/OutputVideo.cpp
@@ -27,20 +27,27 @@ OutputVideo::OutputVideo( )
 {
 }
 
-bool OutputVideo::setup( )
+void OutputVideo::setup( )
 {
 	av_register_all();  // Warning: should be called only once
 
 	AVCodecContext* codecContext( _videoDesc.getCodecContext() );
 
 	if( codecContext == NULL )
-		return false;
+	{
+		throw std::runtime_error( "could not allocate video codec context" );
+	}
 
 	// try to open encoder with parameters
-	if( avcodec_open2( codecContext, _videoDesc.getCodec(), NULL ) < 0 )
-		return false;
-
-	return true;
+	int ret = avcodec_open2( codecContext, _videoDesc.getCodec(), NULL );
+	if( ret < 0 )
+	{
+		char err[250];
+		av_strerror( ret, err, 250);
+		std::string msg = "could not open video encoder: ";
+		msg += err;
+		throw std::runtime_error( msg );
+	}
 }
 
 
diff --git a/src/AvTranscoder/EssenceStream/OutputVideo.hpp b/src/AvTranscoder/EssenceStream/OutputVideo.hpp
@@ -30,7 +30,7 @@ class AvExport OutputVideo : public OutputEssence
 public:
 	OutputVideo();
 
-	bool setup();
+	void setup();
 
 	//void setVideoDesc( const VideoDesc& videoDesc );
 
