Handle multiple audio streams in a single piece of content

[dcpomatic.git] / src / lib / ffmpeg.h

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index 4d1a45da3b9c866c48d6757523bfb4d18acf364d..835136c759d8b6004f7b9a6f6c7eecf414eac2ba 100644 (file)
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -20,12 +20,13 @@
 #ifndef DCPOMATIC_FFMPEG_H
 #define DCPOMATIC_FFMPEG_H
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
 extern "C" {
 #include <libavcodec/avcodec.h>
 }
+#include "file_group.h"
+#include <boost/shared_ptr.hpp>
+#include <boost/thread/mutex.hpp>
+#include <vector>
 
 struct AVFilterGraph;
 struct AVCodecContext;
@@ -35,6 +36,7 @@ struct AVFrame;
 struct AVBufferContext;
 struct AVCodec;
 struct AVStream;
+struct AVIOContext;
 
 class FFmpegContent;
 
@@ -48,16 +50,25 @@ public:
                return _ffmpeg_content;
        }
 
+       int avio_read (uint8_t *, int);
+       int64_t avio_seek (int64_t, int);
+
 protected:
        AVCodecContext* video_codec_context () const;
-       AVCodecContext* audio_codec_context () const;
+       AVCodecContext* subtitle_codec_context () const;
        
        boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
 
+       uint8_t* _avio_buffer;
+       int _avio_buffer_size;
+       AVIOContext* _avio_context;
+       FileGroup _file_group;
+       
        AVFormatContext* _format_context;
        AVPacket _packet;
        AVFrame* _frame;
 
+       /** Index of video stream within AVFormatContext */
        int _video_stream;
 
        /* It would appear (though not completely verified) that one must have
@@ -68,8 +79,7 @@ protected:
 
 private:
        void setup_general ();
-       void setup_video ();
-       void setup_audio ();
+       void setup_decoders ();
 };
 
 #endif