Merge master.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 0c89b973dfbb9b47c237cd2e9ade391327758fd9..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,120 +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 "film.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 FFmpegAudioStream : public AudioStream
-{
-public:
-       FFmpegAudioStream (std::string n, int i, int s, int64_t c)
-               : AudioStream (s, c)
-               , _name (n)
-               , _id (i)
-       {}
-
-       std::string to_string () const;
-
-       std::string name () const {
-               return _name;
-       }
-
-       int id () const {
-               return _id;
-       }
-
-       static boost::shared_ptr<FFmpegAudioStream> create (std::string t, boost::optional<int> v);
+#include "subtitle_decoder.h"
+#include "ffmpeg.h"
 
-private:
-       friend class stream_test;
-       
-       FFmpegAudioStream (std::string t, boost::optional<int> v);
-       
-       std::string _name;
-       int _id;
-};
+class Log;
+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<Film>, DecodeOptions);
+       FFmpegDecoder (boost::shared_ptr<const FFmpegContent>, boost::shared_ptr<Log>);
        ~FFmpegDecoder ();
 
-       float frames_per_second () const;
-       libdcp::Size native_size () const;
-       SourceFrame length () const;
-       int time_base_numerator () const;
-       int time_base_denominator () const;
-       int sample_aspect_ratio_numerator () const;
-       int sample_aspect_ratio_denominator () const;
-
-       void set_audio_stream (boost::shared_ptr<AudioStream>);
-       void set_subtitle_stream (boost::shared_ptr<SubtitleStream>);
-
-       bool seek (double);
-       bool seek_to_last ();
-       void seek_forward ();
-       void seek_back ();
-
 private:
+       friend class ::ffmpeg_pts_offset_test;
 
+       void seek (ContentTime time, bool);
        bool pass ();
-       bool do_seek (double p, bool, bool);
-       PixelFormat pixel_format () const;
-       AVSampleFormat audio_sample_format () const;
-       int bytes_per_audio_sample () const;
-
-       void filter_and_emit_video ();
+       void flush ();
 
-       void setup_general ();
-       void setup_video ();
-       void setup_audio ();
        void setup_subtitle ();
 
+       AVSampleFormat audio_sample_format () const;
+       int bytes_per_audio_sample () const;
+
+       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);
+       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);
 
-       std::string stream_name (AVStream* s) const;
-
-       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
+       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;
+
+       ContentTime _pts_offset;
 };