X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_decoder.h;h=65f36a00461b9115ca67fea8e7ee60c60a944ef8;hb=c247a1b81b78164acf84f4b003062fab25e64b53;hp=0c89b973dfbb9b47c237cd2e9ade391327758fd9;hpb=d40ebb82f62ab3d826e43e8d1187be9b768e535f;p=dcpomatic.git diff --git a/src/lib/ffmpeg_decoder.h b/src/lib/ffmpeg_decoder.h index 0c89b973d..65f36a004 100644 --- a/src/lib/ffmpeg_decoder.h +++ b/src/lib/ffmpeg_decoder.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - 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 . */ @@ -21,128 +22,61 @@ * @brief A decoder using FFmpeg to decode content. */ -#include -#include -#include -#include -#include -#include +#include "util.h" +#include "decoder.h" +#include "ffmpeg.h" extern "C" { #include -#include } -#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 create (std::string t, boost::optional v); +#include +#include +#include -private: - friend class stream_test; - - FFmpegAudioStream (std::string t, boost::optional v); - - std::string _name; - int _id; -}; +class Log; +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 VideoDecoder, public AudioDecoder +class FFmpegDecoder : public FFmpeg, public Decoder { public: - FFmpegDecoder (boost::shared_ptr, DecodeOptions); - ~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); - void set_subtitle_stream (boost::shared_ptr); + FFmpegDecoder (boost::shared_ptr film, boost::shared_ptr, bool fast); - bool seek (double); - bool seek_to_last (); - void seek_forward (); - void seek_back (); + bool pass (); + void seek (dcpomatic::ContentTime time, bool); private: + friend struct ::ffmpeg_pts_offset_test; - 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 (boost::shared_ptr stream) const; + int bytes_per_audio_sample (boost::shared_ptr stream) const; + bool decode_video_packet (); void decode_audio_packet (); + void decode_subtitle_packet (); - void maybe_add_subtitle (); - boost::shared_ptr deinterleave_audio (uint8_t** data, int size); - - void film_changed (Film::Property); + void decode_bitmap_subtitle (AVSubtitleRect const * rect, dcpomatic::ContentTime from); + void decode_ass_subtitle (std::string ass, dcpomatic::ContentTime from); - std::string stream_name (AVStream* s) const; + void maybe_add_subtitle (); + boost::shared_ptr deinterleave_audio (boost::shared_ptr stream) const; - AVFormatContext* _format_context; - int _video_stream; - - AVFrame* _frame; + std::list > _filter_graphs; + boost::mutex _filter_graphs_mutex; - 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 + dcpomatic::ContentTime _pts_offset; + boost::optional _current_subtitle_to; + /** true if we have a subtitle which has not had emit_stop called for it yet */ + bool _have_current_subtitle; - AVPacket _packet; + boost::shared_ptr _black_image; - std::list > _filter_graphs; - boost::mutex _filter_graphs_mutex; + std::vector > _next_time; };