X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=e9cb3dacf911577105be1d91ad7e5e5dcf87cc1d;hb=cef07676fb15c9f1c3c3073d22f06ffe95d9c2ce;hp=d93660cd0fa573eb391c0a9f4fdf039f524cc9b6;hpb=79ce26d031d109177ba4b0f637fa2960345a37a3;p=dcpomatic.git diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index d93660cd0..e9cb3dacf 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -20,106 +20,25 @@ #ifndef DCPOMATIC_FFMPEG_CONTENT_H #define DCPOMATIC_FFMPEG_CONTENT_H -#include #include "video_content.h" #include "audio_content.h" #include "subtitle_content.h" -#include "audio_mapping.h" struct AVFormatContext; struct AVStream; class Filter; -class ffmpeg_pts_offset_test; - -class FFmpegStream -{ -public: - FFmpegStream (std::string n, int i) - : name (n) - , _id (i) - {} - - FFmpegStream (boost::shared_ptr); - - void as_xml (xmlpp::Node *) const; - - /** @param c An AVFormatContext. - * @param index A stream index within the AVFormatContext. - * @return true if this FFmpegStream uses the given stream index. - */ - bool uses_index (AVFormatContext const * c, int index) const; - AVStream* stream (AVFormatContext const * c) const; - - std::string technical_summary () const { - return "id " + boost::lexical_cast (_id); - } - - std::string identifier () const { - return boost::lexical_cast (_id); - } - - std::string name; - - friend bool operator== (FFmpegStream const & a, FFmpegStream const & b); - friend bool operator!= (FFmpegStream const & a, FFmpegStream const & b); - -private: - int _id; -}; - -class FFmpegAudioStream : public FFmpegStream -{ -public: - FFmpegAudioStream (std::string n, int i, int f, int c) - : FFmpegStream (n, i) - , frame_rate (f) - , channels (c) - , mapping (c) - { - mapping.make_default (); - } - - FFmpegAudioStream (boost::shared_ptr, int); - - void as_xml (xmlpp::Node *) const; - - int frame_rate; - int channels; - AudioMapping mapping; - boost::optional first_audio; - -private: - friend class ffmpeg_pts_offset_test; - - /* Constructor for tests */ - FFmpegAudioStream () - : FFmpegStream ("", 0) - , frame_rate (0) - , channels (0) - , mapping (1) - {} -}; - -class FFmpegSubtitleStream : public FFmpegStream -{ -public: - FFmpegSubtitleStream (std::string n, int i) - : FFmpegStream (n, i) - {} - - FFmpegSubtitleStream (boost::shared_ptr); - - void as_xml (xmlpp::Node *) const; -}; +class FFmpegSubtitleStream; +class FFmpegAudioStream; +struct ffmpeg_pts_offset_test; +struct audio_sampling_rate_test; class FFmpegContentProperty : public VideoContentProperty { public: static int const SUBTITLE_STREAMS; + /** The chosen subtitle stream, or something about it */ static int const SUBTITLE_STREAM; - static int const AUDIO_STREAMS; - static int const AUDIO_STREAM; static int const FILTERS; }; @@ -127,32 +46,36 @@ class FFmpegContent : public VideoContent, public AudioContent, public SubtitleC { public: FFmpegContent (boost::shared_ptr, boost::filesystem::path); - FFmpegContent (boost::shared_ptr, boost::shared_ptr, int version); + FFmpegContent (boost::shared_ptr, cxml::ConstNodePtr, int version, std::list &); FFmpegContent (boost::shared_ptr, std::vector >); boost::shared_ptr shared_from_this () { return boost::dynamic_pointer_cast (Content::shared_from_this ()); } - + void examine (boost::shared_ptr); std::string summary () const; std::string technical_summary () const; - std::string information () const; void as_xml (xmlpp::Node *) const; DCPTime full_length () const; std::string identifier () const; - + + /* VideoContent */ + void set_default_colour_conversion (); + /* AudioContent */ - int audio_channels () const; - ContentTime audio_length () const; - int content_audio_frame_rate () const; - int output_audio_frame_rate () const; - AudioMapping audio_mapping () const; - void set_audio_mapping (AudioMapping); + std::vector audio_streams () const; + + /* SubtitleContent */ + bool has_text_subtitles () const; + bool has_image_subtitles () const; + double subtitle_video_frame_rate () const { + return video_frame_rate (); + } void set_filters (std::vector const &); - + std::vector > subtitle_streams () const { boost::mutex::scoped_lock lm (_mutex); return _subtitle_streams; @@ -163,15 +86,10 @@ public: return _subtitle_stream; } - std::vector > audio_streams () const { + std::vector > ffmpeg_audio_streams () const { boost::mutex::scoped_lock lm (_mutex); return _audio_streams; } - - boost::shared_ptr audio_stream () const { - boost::mutex::scoped_lock lm (_mutex); - return _audio_stream; - } std::vector filters () const { boost::mutex::scoped_lock lm (_mutex); @@ -179,23 +97,36 @@ public: } void set_subtitle_stream (boost::shared_ptr); - void set_audio_stream (boost::shared_ptr); - boost::optional first_video () const { + boost::optional first_video () const { boost::mutex::scoped_lock lm (_mutex); return _first_video; } + std::list image_subtitles_during (ContentTimePeriod, bool starting) const; + std::list text_subtitles_during (ContentTimePeriod, bool starting) const; + + void signal_subtitle_stream_changed (); + +protected: + void add_properties (std::list &) const; + private: - friend class ffmpeg_pts_offset_test; - + friend struct ffmpeg_pts_offset_test; + friend struct audio_sampling_rate_test; + std::vector > _subtitle_streams; boost::shared_ptr _subtitle_stream; std::vector > _audio_streams; - boost::shared_ptr _audio_stream; - boost::optional _first_video; + boost::optional _first_video; /** Video filters that should be used when generating DCPs */ std::vector _filters; + + AVColorRange _color_range; + AVColorPrimaries _color_primaries; + AVColorTransferCharacteristic _color_trc; + AVColorSpace _colorspace; + boost::optional _bits_per_pixel; }; #endif