Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/ffmpeg.h b/src/lib/ffmpeg.h
index dcafe17f759237945fc16f015d9111eb820b522f..b3bc13e5cc222b9033472bfb43df8f3b70693fd7 100644 (file)
--- a/src/lib/ffmpeg.h
+++ b/src/lib/ffmpeg.h
@@ -17,23 +17,24 @@
 
 */
 
-#include <vector>
-#include <boost/shared_ptr.hpp>
-#include <boost/thread/mutex.hpp>
+#ifndef DCPOMATIC_FFMPEG_H
+#define DCPOMATIC_FFMPEG_H
+
+#include "file_group.h"
+#include "ffmpeg_subtitle_period.h"
 extern "C" {
 #include <libavcodec/avcodec.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 FFmpegAudioStream;
+class Log;
 
 class FFmpeg
 {
@@ -45,17 +46,31 @@ public:
                return _ffmpeg_content;
        }
 
+       int avio_read (uint8_t *, int);
+       int64_t avio_seek (int64_t, int);
+
 protected:
+       AVCodecContext* video_codec_context () const;
+       AVCodecContext* subtitle_codec_context () const;
+       ContentTime pts_offset (
+               std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams, boost::optional<ContentTime> first_video, double video_frame_rate
+               ) const;
+
+       static FFmpegSubtitlePeriod subtitle_period (AVSubtitle 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;
-       int _video_stream;
 
-       AVCodecContext* _video_codec_context;
-       AVCodec* _video_codec;
-       AVCodecContext* _audio_codec_context;    ///< may be 0 if there is no audio
-       AVCodec* _audio_codec;                   ///< may be 0 if there is no audio
+       /** Index of video stream within AVFormatContext */
+       int _video_stream;
 
        /* It would appear (though not completely verified) that one must have
           a mutex around calls to avcodec_open* and avcodec_close... and here
@@ -65,6 +80,10 @@ protected:
 
 private:
        void setup_general ();
-       void setup_video ();
-       void setup_audio ();
+       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