Setup output streams for audio

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit 5f3d7ee4f89a · 2014-03-25T04:24:43.000-04:00
diff --git a/src/AvTranscoder/OutputFile.cpp b/src/AvTranscoder/OutputFile.cpp
@@ -86,24 +86,25 @@ void OutputFile::addVideoStream( const VideoDesc& videoDesc )
 	}
 }
 
-bool OutputFile::addAudioStream( )
+void OutputFile::addAudioStream( const AudioDesc& audioDesc )
 {
-	if( formatContext == NULL )
-		return false;
-
-	av_register_all();  // Warning: should be called only once
-	AVCodec*  codec  = NULL;
-	AVStream* stream = NULL;
-
-	if( ( codec = avcodec_find_encoder_by_name( "wav" ) ) == NULL )
-		return false;
+	assert( formatContext != NULL );
 
-	if( ( stream = avformat_new_stream( formatContext, codec ) ) == NULL )
-		return false;
+	if( ( stream = avformat_new_stream( formatContext, audioDesc.getCodec() ) ) == NULL )
+	{
+		throw std::runtime_error( "unable to add new audio stream" );
+	}
 
-	//stream->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+	stream->codec->sample_rate = audioDesc.getCodecContext()->sample_rate;
+	stream->codec->channels = audioDesc.getCodecContext()->channels;
+	stream->codec->bit_rate = audioDesc.getCodecContext()->bit_rate;
+	stream->codec->sample_fmt = audioDesc.getCodecContext()->sample_fmt;
 
-	return true;
+	// to move in endSetup
+	if( avformat_write_header( formatContext, NULL ) != 0 )
+	{
+		throw std::runtime_error( "could not write header" );
+	}
 }
 
 bool OutputFile::wrap( const DataStream& data, const size_t streamId )
diff --git a/src/AvTranscoder/OutputFile.hpp b/src/AvTranscoder/OutputFile.hpp
@@ -4,6 +4,7 @@
 #include "DatasStructures/Image.hpp"
 #include "DatasStructures/DataStreamDesc.hpp"
 #include "DatasStructures/VideoDesc.hpp"
+#include "DatasStructures/AudioDesc.hpp"
 
 #include <string>
 #include <vector>
@@ -25,8 +26,7 @@ class AvExport OutputFile
 	bool setup();
 
 	void addVideoStream( const VideoDesc& videoDesc );
-
-	bool addAudioStream( );
+	void addAudioStream( const AudioDesc& audioDesc );
 
 	bool wrap( const DataStream& data, const size_t streamId );
 
