X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=cf1849971450659f5d12ccb64d0b1c681a825561;hp=367c30103e77812927878d0f2f31062e995cc647;hb=f515b8daea9d28200be803bb64ff17e9f30343c4;hpb=e6c67f4aac2ca9afc275b6f13058e1e46f2cecc3 diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index 367c30103..cf1849971 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -1,31 +1,31 @@ /* - Copyright (C) 2013-2014 Carl Hetherington + Copyright (C) 2013-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 . */ #ifndef DCPOMATIC_FFMPEG_CONTENT_H #define DCPOMATIC_FFMPEG_CONTENT_H -#include -#include -#include "video_content.h" -#include "audio_content.h" -#include "subtitle_content.h" -#include "audio_mapping.h" +#ifdef DCPOMATIC_VARIANT_SWAROOP +#include "encrypted_ecinema_kdm.h" +#endif +#include "content.h" +#include "audio_stream.h" struct AVFormatContext; struct AVStream; @@ -33,48 +33,49 @@ struct AVStream; class Filter; class FFmpegSubtitleStream; class FFmpegAudioStream; -class ffmpeg_pts_offset_test; +class VideoContent; +struct ffmpeg_pts_offset_test; +struct audio_sampling_rate_test; -class FFmpegContentProperty : public VideoContentProperty +class FFmpegContentProperty { 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; + static int const KDM; }; -class FFmpegContent : public VideoContent, public AudioContent, public SubtitleContent +class FFmpegContent : public Content { public: - FFmpegContent (boost::shared_ptr, boost::filesystem::path); - FFmpegContent (boost::shared_ptr, cxml::ConstNodePtr, int version, std::list &); - FFmpegContent (boost::shared_ptr, std::vector >); + FFmpegContent (boost::filesystem::path); + FFmpegContent (cxml::ConstNodePtr, int version, std::list &); + FFmpegContent (std::vector >); boost::shared_ptr shared_from_this () { return boost::dynamic_pointer_cast (Content::shared_from_this ()); } - - void examine (boost::shared_ptr); + + boost::shared_ptr shared_from_this () const { + return boost::dynamic_pointer_cast (Content::shared_from_this ()); + } + + void examine (boost::shared_ptr film, boost::shared_ptr); + void take_settings_from (boost::shared_ptr c); std::string summary () const; std::string technical_summary () const; - std::string information () const; - void as_xml (xmlpp::Node *) const; - DCPTime full_length () const; + void as_xml (xmlpp::Node *, bool with_paths) const; + dcpomatic::DCPTime full_length (boost::shared_ptr film) const; + dcpomatic::DCPTime approximate_length () const; std::string identifier () const; - - /* AudioContent */ - int audio_channels () const; - ContentTime audio_length () const; - int audio_frame_rate () const; - AudioMapping audio_mapping () const; - void set_audio_mapping (AudioMapping); - boost::filesystem::path audio_analysis_path () const; + + void set_default_colour_conversion (); void set_filters (std::vector const &); - + std::vector > subtitle_streams () const { boost::mutex::scoped_lock lm (_mutex); return _subtitle_streams; @@ -85,15 +86,7 @@ public: return _subtitle_stream; } - std::vector > 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 > ffmpeg_audio_streams () const; std::vector filters () const { boost::mutex::scoped_lock lm (_mutex); @@ -101,25 +94,57 @@ 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; } - bool has_subtitle_during (ContentTimePeriod) const; + void signal_subtitle_stream_changed (); + +#ifdef DCPOMATIC_VARIANT_SWAROOP + + bool encrypted () const { + boost::mutex::scoped_lock lm (_mutex); + return _encrypted; + } + + void add_kdm (EncryptedECinemaKDM kdm); + + boost::optional kdm () const { + return _kdm; + } + + boost::optional id () const { + return _id; + } + + bool kdm_timing_window_valid () const; + +#endif private: - friend class ffmpeg_pts_offset_test; - + void add_properties (boost::shared_ptr film, std::list &) const; + + 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; + + boost::optional _color_range; + boost::optional _color_primaries; + boost::optional _color_trc; + boost::optional _colorspace; + boost::optional _bits_per_pixel; +#ifdef DCPOMATIC_VARIANT_SWAROOP + bool _encrypted; + boost::optional _kdm; + boost::optional _id; +#endif }; #endif