Untested merge of master.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 3f96c1632545abacd6599b30853955876dcda98e..174cc39954b9fccc92153ea249cfc421e4458e80 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -26,12 +26,17 @@
 #include <stdint.h>
 #include <boost/shared_ptr.hpp>
 #include <boost/optional.hpp>
+#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"
+#include "ffmpeg_content.h"
 
 struct AVFilterGraph;
 struct AVCodecContext;
@@ -49,52 +54,67 @@ class Log;
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
  */
-class FFmpegDecoder : public Decoder
+class FFmpegDecoder : public VideoDecoder, public AudioDecoder
 {
 public:
-       FFmpegDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *, bool, bool);
+       FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio, bool subtitles);
        ~FFmpegDecoder ();
 
-       /* Methods to query our input video */
-       float frames_per_second () const;
-       Size native_size () const;
-       int audio_channels () const;
-       int audio_sample_rate () const;
-       AVSampleFormat audio_sample_format () const;
-       int64_t audio_channel_layout () const;
-       bool has_subtitles () const;
+       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;
+       }
 
-       std::vector<AudioStream> audio_streams () const;
-       std::vector<SubtitleStream> subtitle_streams () const;
+       bool seek (double);
+       void seek_forward ();
+       void seek_back ();
+       bool pass ();
 
 private:
 
-       bool pass ();
+       /* No copy construction */
+       FFmpegDecoder (FFmpegDecoder const &);
+       FFmpegDecoder& operator= (FFmpegDecoder const &);
+
        PixelFormat pixel_format () const;
-       int time_base_numerator () const;
-       int time_base_denominator () const;
-       int sample_aspect_ratio_numerator () const;
-       int sample_aspect_ratio_denominator () const;
+       AVSampleFormat audio_sample_format () const;
+       int bytes_per_audio_sample () const;
+       bool do_seek (double, bool, bool);
+
+       void filter_and_emit_video ();
 
        void setup_general ();
        void setup_video ();
        void setup_audio ();
        void setup_subtitle ();
 
+       void decode_audio_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;
-       int _audio_stream; ///< may be < 0 if there is no audio
-       int _subtitle_stream; ///< may be < 0 if there is no subtitle
        
        AVFrame* _frame;
 
-       std::vector<AudioStream> _audio_streams;
-       std::vector<SubtitleStream> _subtitle_streams;
-       
        AVCodecContext* _video_codec_context;
        AVCodec* _video_codec;
        AVCodecContext* _audio_codec_context;    ///< may be 0 if there is no audio
@@ -104,6 +124,19 @@ private:
 
        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;
+
+       /* 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;
 };