Basic audio support.

1 files changed, 19 insertions, 3 deletions

diff --git a/src/lib/ffmpeg_encoder.h b/src/lib/ffmpeg_encoder.h
index b5715e514..c7929c54f 100644
--- a/src/lib/ffmpeg_encoder.h
+++ b/src/lib/ffmpeg_encoder.h
@@ -52,12 +52,23 @@ private:
 	void audio (boost::shared_ptr<AudioBuffers>, DCPTime);
 	void subtitle (PlayerSubtitles, DCPTimePeriod);
 
-	AVCodecContext* _codec_context;
+	void setup_video ();
+	void setup_audio ();
+
+	void audio_frame (int size);
+
+	AVCodec* _video_codec;
+	AVCodecContext* _video_codec_context;
+	AVCodec* _audio_codec;
+	AVCodecContext* _audio_codec_context;
 	AVFormatContext* _format_context;
 	AVStream* _video_stream;
+	AVStream* _audio_stream;
 	AVPixelFormat _pixel_format;
-	AVDictionary* _options;
-	std::string _codec_name;
+	AVSampleFormat _sample_format;
+	AVDictionary* _video_options;
+	std::string _video_codec_name;
+	std::string _audio_codec_name;
 
 	mutable boost::mutex _mutex;
 	DCPTime _last_time;
@@ -65,6 +76,11 @@ private:
 	EventHistory _history;
 
 	boost::filesystem::path _output;
+
+	boost::shared_ptr<AudioBuffers> _pending_audio;
+
+	static int _video_stream_index;
+	static int _audio_stream_index;
 };
 
 #endif