More noncopyable.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index cd37d20c6de6cabc53545690a060bedc71720fee..fa318e56828eb9140555c6c6ea72a48b7eab0c57 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -35,113 +35,52 @@ extern "C" {
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
-#include "film.h"
-#include "ffmpeg_content.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;
+#include "subtitle_decoder.h"
+#include "ffmpeg.h"
+
+class Film;
+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, bool subtitles, bool video_sync);
+       FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio);
        ~FFmpegDecoder ();
 
-       float video_frame_rate () const;
-       libdcp::Size native_size () const;
-       ContentVideoFrame video_length () const;
-       int time_base_numerator () const;
-       int time_base_denominator () const;
-       int sample_aspect_ratio_numerator () const;
-       int sample_aspect_ratio_denominator () const;
-
-       std::vector<FFmpegSubtitleStream> subtitle_streams () const {
-               return _subtitle_streams;
-       }
-       
-       std::vector<FFmpegAudioStream> audio_streams () const {
-               return _audio_streams;
-       }
-
-       bool seek (double);
-       bool seek_to_last ();
-       bool pass ();
+       void pass ();
+       void seek (VideoContent::Frame, bool);
+       bool done () const;
 
 private:
+       friend class ::ffmpeg_pts_offset_test;
 
-       /* No copy construction */
-       FFmpegDecoder (FFmpegDecoder const &);
-       FFmpegDecoder& operator= (FFmpegDecoder const &);
+       static double compute_pts_offset (double, double, float);
+
+       void setup_subtitle ();
 
-       bool do_seek (double p, bool);
-       PixelFormat pixel_format () const;
        AVSampleFormat audio_sample_format () const;
        int bytes_per_audio_sample () const;
 
-       void out_with_sync ();
-       void filter_and_emit_video (AVFrame *);
-       double frame_time () const;
-
-       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);
 
-       void film_changed (Film::Property);
-
-       std::string stream_name (AVStream* s) const;
-
-       boost::shared_ptr<const FFmpegContent> _ffmpeg_content;
-
-       AVFormatContext* _format_context;
-       int _video_stream;
-       
-       AVFrame* _frame;
-
-       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
        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;
-
-       boost::optional<double> _first_video;
-       boost::optional<double> _first_audio;
-
+       
        std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
        boost::mutex _filter_graphs_mutex;
 
-        std::vector<FFmpegSubtitleStream> _subtitle_streams;
-        std::vector<FFmpegAudioStream> _audio_streams;
-
        bool _decode_video;
        bool _decode_audio;
-       bool _decode_subtitles;
-       bool _video_sync;
-
-       /* 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;
+
+       double _video_pts_offset;
+       double _audio_pts_offset;
+       bool _just_sought;
 };