X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_content.h;h=666322669c071015bc5d9d864727adeeb72c5a07;hb=cd29c4ed26fde9b9c07190f92205705b13c6bd73;hp=96d8c1727d24fc46e9b0d84a5e14a1ae6265386f;hpb=38fda7888663429d452b9c71902e8bb5239dd720;p=dcpomatic.git diff --git a/src/lib/ffmpeg_content.h b/src/lib/ffmpeg_content.h index 96d8c1727..666322669 100644 --- a/src/lib/ffmpeg_content.h +++ b/src/lib/ffmpeg_content.h @@ -1,126 +1,71 @@ /* - Copyright (C) 2013 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 "video_content.h" -#include "audio_content.h" -#include "subtitle_content.h" -#include "audio_mapping.h" - -class Filter; -class ffmpeg_pts_offset_test; - -class FFmpegAudioStream -{ -public: - FFmpegAudioStream (std::string n, int i, int f, int c) - : name (n) - , id (i) - , frame_rate (f) - , channels (c) - , mapping (c) - { - mapping.make_default (); - } - - FFmpegAudioStream (boost::shared_ptr); - - void as_xml (xmlpp::Node *) const; - - std::string name; - int id; - int frame_rate; - int channels; - AudioMapping mapping; - boost::optional first_audio; - -private: - friend class ffmpeg_pts_offset_test; - - /* Constructor for tests */ - FFmpegAudioStream () - : mapping (1) - {} -}; - -extern bool operator== (FFmpegAudioStream const & a, FFmpegAudioStream const & b); - -class FFmpegSubtitleStream -{ -public: - FFmpegSubtitleStream (std::string n, int i) - : name (n) - , id (i) - {} - - FFmpegSubtitleStream (boost::shared_ptr); +#include "content.h" +#include "audio_stream.h" - void as_xml (xmlpp::Node *) const; - - std::string name; - int id; -}; +struct AVFormatContext; +struct AVStream; -extern bool operator== (FFmpegSubtitleStream const & a, FFmpegSubtitleStream const & b); +class Filter; +class FFmpegSubtitleStream; +class FFmpegAudioStream; +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; }; -class FFmpegContent : public VideoContent, public AudioContent, public SubtitleContent +class FFmpegContent : public Content { public: FFmpegContent (boost::shared_ptr, boost::filesystem::path); - FFmpegContent (boost::shared_ptr, boost::shared_ptr); + 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; - Time length () const; + DCPTime full_length () const; std::string identifier () const; - - /* AudioContent */ - int audio_channels () const; - AudioContent::Frame audio_length () const; - int content_audio_frame_rate () const; - int output_audio_frame_rate () const; - AudioMapping audio_mapping () const; - void set_audio_mapping (AudioMapping); + + 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; @@ -131,15 +76,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); @@ -147,23 +84,34 @@ 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 (); + private: - friend class ffmpeg_pts_offset_test; - + void add_properties (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; + + AVColorRange _color_range; + AVColorPrimaries _color_primaries; + AVColorTransferCharacteristic _color_trc; + AVColorSpace _colorspace; + boost::optional _bits_per_pixel; }; #endif