Changes to libdcp.

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

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index d5f4db2916c67e45fb014bb676397579a1cb8ef4..9e9d5125aa02ecb033df751b6b8a872e9a65e53c 100644 (file)
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -20,44 +20,49 @@
 #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>
 
-struct AVFilterGraph;
-struct AVCodecContext;
-struct AVFilterContext;
 struct AVFormatContext;
 struct AVFrame;
-struct AVBufferContext;
-struct AVCodec;
-struct AVStream;
+struct AVIOContext;
 
 class FFmpegContent;
+class Log;
 
 class FFmpeg
 {
 public:
-       FFmpeg (boost::shared_ptr<const FFmpegContent>, bool);
+       FFmpeg (boost::shared_ptr<const FFmpegContent>);
        virtual ~FFmpeg ();
 
        boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
                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
@@ -67,9 +72,11 @@ protected:
        static boost::mutex _mutex;
 
 private:
-       void setup_general (bool);
-       void setup_video ();
-       void setup_audio ();
+       void setup_general ();
+       void setup_decoders ();
+
+       static void ffmpeg_log_callback (void* ptr, int level, const char* fmt, va_list vl);
+       static boost::weak_ptr<Log> _ffmpeg_log;
 };
 
 #endif