C++11 tidying.

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

diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h
index d34c22785c5338dff6f43ee97c7d74f27de1600f..d19a9f703bccba457196c5ef288665e009838335 100644 (file)
--- a/src/lib/ffmpeg_decoder.h
+++ b/src/lib/ffmpeg_decoder.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -21,79 +22,64 @@
  *  @brief A decoder using FFmpeg to decode content.
  */
 
-#include <vector>
-#include <string>
-#include <stdint.h>
-#include <boost/shared_ptr.hpp>
+#include "util.h"
+#include "decoder.h"
+#include "ffmpeg.h"
 extern "C" {
 #include <libavcodec/avcodec.h>
-#include <libpostproc/postprocess.h>
 }
-#include "util.h"
-#include "decoder.h"
+#include <boost/thread/mutex.hpp>
+#include <stdint.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 Subtitle;
+class VideoFilterGraph;
+class FFmpegAudioStream;
+class AudioBuffers;
+class Image;
+struct ffmpeg_pts_offset_test;
 
 /** @class FFmpegDecoder
  *  @brief A decoder using FFmpeg to decode content.
  */
-class FFmpegDecoder : public Decoder
+class FFmpegDecoder : public FFmpeg, public Decoder
 {
 public:
-       FFmpegDecoder (boost::shared_ptr<const FilmState>, boost::shared_ptr<const Options>, Job *, Log *, bool, bool);
-       ~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;
-       bool has_subtitles () const;
+       FFmpegDecoder (std::shared_ptr<const Film> film, std::shared_ptr<const FFmpegContent>, bool fast);
+
+       bool pass () override;
+       void seek (dcpomatic::ContentTime time, bool) override;
 
 private:
+       friend struct ::ffmpeg_pts_offset_test;
+
+       bool flush ();
+
+       AVSampleFormat audio_sample_format (std::shared_ptr<FFmpegAudioStream> stream) const;
+       int bytes_per_audio_sample (std::shared_ptr<FFmpegAudioStream> stream) const;
 
-       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;
+       std::shared_ptr<FFmpegAudioStream> audio_stream_from_index (int index) const;
+       std::pair<int, bool> decode_audio_packet (std::shared_ptr<FFmpegAudioStream> stream, AVPacket* packet);
+       void process_audio_frame (std::shared_ptr<FFmpegAudioStream> stream);
 
-       void setup_general ();
-       void setup_video ();
-       void setup_audio ();
-       void setup_subtitle ();
+       bool decode_and_process_video_packet (AVPacket* packet);
+       void decode_and_process_audio_packet (AVPacket* packet);
+       void decode_and_process_subtitle_packet (AVPacket* packet);
+
+       void process_bitmap_subtitle (AVSubtitleRect const * rect, dcpomatic::ContentTime from);
+       void process_ass_subtitle (std::string ass, dcpomatic::ContentTime from);
 
        void maybe_add_subtitle ();
+       std::shared_ptr<AudioBuffers> deinterleave_audio (std::shared_ptr<FFmpegAudioStream> stream) const;
+
+       std::list<std::shared_ptr<VideoFilterGraph> > _filter_graphs;
+       boost::mutex _filter_graphs_mutex;
+
+       dcpomatic::ContentTime _pts_offset;
+       boost::optional<dcpomatic::ContentTime> _current_subtitle_to;
+       /** true if we have a subtitle which has not had emit_stop called for it yet */
+       bool _have_current_subtitle = false;
+
+       std::shared_ptr<Image> _black_image;
 
-       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;
-       
-       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;
+       std::map<std::shared_ptr<FFmpegAudioStream>, boost::optional<dcpomatic::ContentTime>> _next_time;
 };