Merge master.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index be178dbfbfc1d57232c89223e2f2ca62f0a90e36..2cda8f89d5b6263db0600454369d7732cd893c1f 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -29,118 +29,57 @@
 #include <boost/thread/mutex.hpp>
 extern "C" {
 #include <libavcodec/avcodec.h>
-#include <libpostproc/postprocess.h>
 }
 #include "util.h"
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
+#include "subtitle_decoder.h"
+#include "ffmpeg.h"
 
-struct AVFilterGraph;
-struct AVCodecContext;
-struct AVFilterContext;
-struct AVFormatContext;
-struct AVFrame;
-struct AVBufferContext;
-struct AVCodec;
-struct AVStream;
-class Job;
-class Options;
-class Image;
 class Log;
-class FFmpegContent;
-class Film;
+class FilterGraph;
+class ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
  */
-class FFmpegDecoder : public VideoDecoder, public AudioDecoder
+class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
 {
 public:
-       FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio);
+       FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
        ~FFmpegDecoder ();
 
-       /* Decoder */
-
-       void pass ();
-       void seek (Time);
-       void seek_back ();
-       void seek_forward ();
-       Time position () const;
-       bool done () const;
-
-       /* VideoDecoder */
-
-       float video_frame_rate () const;
-       libdcp::Size video_size () const;
-       ContentVideoFrame video_length () const;
-
-       /* FFmpegDecoder */
-
-       std::vector<boost::shared_ptr<FFmpegSubtitleStream> > subtitle_streams () const {
-               return _subtitle_streams;
-       }
-       
-       std::vector<boost::shared_ptr<FFmpegAudioStream> > audio_streams () const {
-               return _audio_streams;
-       }
-
-       boost::shared_ptr<const FFmpegContent> ffmpeg_content () const {
-               return _ffmpeg_content;
-       }
-
 private:
+       friend class ::ffmpeg_pts_offset_test;
 
-       /* No copy construction */
-       FFmpegDecoder (FFmpegDecoder const &);
-       FFmpegDecoder& operator= (FFmpegDecoder const &);
+       void seek (ContentTime time, bool);
+       bool pass ();
+       void flush ();
+
+       void setup_subtitle ();
 
-       PixelFormat pixel_format () const;
        AVSampleFormat audio_sample_format () const;
        int bytes_per_audio_sample () const;
-       void do_seek (Time, bool, bool);
-
-       void setup_general ();
-       void setup_video ();
-       void setup_audio ();
-       void setup_subtitle ();
 
        bool decode_video_packet ();
        void decode_audio_packet ();
+       void decode_subtitle_packet ();
 
        void maybe_add_subtitle ();
        boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t** data, int size);
 
-       std::string stream_name (AVStream* s) const;
-
-       boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
-
-       AVFormatContext* _format_context;
-       int _video_stream;
-       
-       AVFrame* _frame;
+       bool seek_overrun_finished (ContentTime, boost::optional<ContentTime>, boost::optional<ContentTime>) const;
+       bool seek_final_finished (int, int) const;
+       int minimal_run (boost::function<bool (boost::optional<ContentTime>, boost::optional<ContentTime>, int)>);
+       void seek_and_flush (ContentTime);
 
-       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
+       boost::shared_ptr<Log> _log;
        AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
-       AVCodec* _subtitle_codec;                ///< may be 0 if there is no subtitle
-
-       AVPacket _packet;
-
+       AVCodec* _subtitle_codec;                ///< may be 0 if there is no subtitle
+       
        std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
        boost::mutex _filter_graphs_mutex;
 
-        std::vector<boost::shared_ptr<FFmpegSubtitleStream> > _subtitle_streams;
-        std::vector<boost::shared_ptr<FFmpegAudioStream> > _audio_streams;
-
-       bool _decode_video;
-       bool _decode_audio;
-
-       /* It would appear (though not completely verified) that one must have
-          a mutex around calls to avcodec_open* and avcodec_close... and here
-          it is.
-       */
-       static boost::mutex _mutex;
+       ContentTime _pts_offset;
 };