Runs.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index a4a9246f0bb16189dd4f30ea63fb79752fa5bff1..a0900d89f8a9a413e9cb7d3f009c439ddcfc5adc 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -26,6 +26,7 @@
 #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>
@@ -34,6 +35,8 @@ extern "C" {
 #include "decoder.h"
 #include "video_decoder.h"
 #include "audio_decoder.h"
+#include "film.h"
+#include "ffmpeg_content.h"
 
 struct AVFilterGraph;
 struct AVCodecContext;
@@ -54,38 +57,56 @@ class Log;
 class FFmpegDecoder : public VideoDecoder, public AudioDecoder
 {
 public:
-       FFmpegDecoder (boost::shared_ptr<Film>, boost::shared_ptr<const Options>, Job *);
+       FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<FFmpegContent>, DecodeOptions);
        ~FFmpegDecoder ();
 
        float frames_per_second () const;
-       Size native_size () 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;
 
-       void set_audio_stream (boost::optional<AudioStream>);
-       void set_subtitle_stream (boost::optional<SubtitleStream>);
+       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 ();
 
 private:
 
-       bool pass ();
+       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 ();
 
+       void decode_audio_packet ();
+
        void maybe_add_subtitle ();
-       boost::shared_ptr<AudioBuffers> deinterleave_audio (uint8_t* data, int size);
+       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<FFmpegContent> _ffmpeg_content;
+
        AVFormatContext* _format_context;
        int _video_stream;
        
@@ -104,4 +125,8 @@ private:
        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;
 };