Remove some left-over JSON bits.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index 8e7d685805264213925102da1fd27968d9c0a5b8..d4b4fa1c02984f8690c42bd264434b5266cff52e 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -25,67 +25,63 @@
 #include <string>
 #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 "subtitle_decoder.h"
+#include "ffmpeg.h"
 
-struct AVFilterGraph;
-struct AVCodecContext;
-struct AVFilterContext;
-struct AVFormatContext;
-struct AVFrame;
-struct AVBufferContext;
-struct AVCodec;
-class Job;
-class FilmState;
-class Options;
-class Image;
-class Log;
+class Film;
+class FilterGraph;
+class ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
  */
-class FFmpegDecoder : public Decoder
+class FFmpegDecoder : public VideoDecoder, public AudioDecoder, public SubtitleDecoder, public FFmpeg
 {
 public:
-       FFmpegDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
+       FFmpegDecoder (boost::shared_ptr<const Film>, boost::shared_ptr<const FFmpegContent>, bool video, bool audio);
        ~FFmpegDecoder ();
 
-       /* Methods to query our input video */
-       int length_in_frames () const;
-       int decoding_frames () const;
-       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;
+       void pass ();
+       void seek (VideoContent::Frame, bool);
+       bool done () const;
 
 private:
+       friend class ::ffmpeg_pts_offset_test;
+
+       static double compute_pts_offset (double, double, float);
+
+       void flush ();
 
-       bool do_pass ();
-       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;
-
-       void setup_general ();
-       void setup_video ();
-       void setup_audio ();
-
-       AVFormatContext* _format_context;
-       int _video_stream;
-       int _audio_stream;
-       AVFrame* _frame;
+       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);
+
+       AVCodecContext* _subtitle_codec_context; ///< may be 0 if there is no subtitle
+       AVCodec* _subtitle_codec;                ///< may be 0 if there is no subtitle
        
-       AVCodecContext* _video_codec_context;
-       AVCodec* _video_codec;
-       AVCodecContext* _audio_codec_context;
-       AVCodec* _audio_codec;
+       std::list<boost::shared_ptr<FilterGraph> > _filter_graphs;
+       boost::mutex _filter_graphs_mutex;
+
+       bool _decode_video;
+       bool _decode_audio;
 
-       AVPacket _packet;
+       double _pts_offset;
+       bool _just_sought;
 };