X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.h;h=258c2ea5359d9d8ad0a1885cc93ffe31e75a1a0d;hb=9423e02c37daba7f9e406929a1cfc1bb10fb4b62;hp=27bff08b47426749eeee7201234a1aed4e955238;hpb=19483a961b274befaff263d8646a78a56c102c65;p=dcpomatic.git diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h index 27bff08b4..258c2ea53 100644 --- a/src/lib/ffmpeg_examiner.h +++ b/src/lib/ffmpeg_examiner.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-2016 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 @@ -25,16 +25,20 @@ struct AVStream; class FFmpegAudioStream; class FFmpegSubtitleStream; +class Job; class FFmpegExaminer : public FFmpeg, public VideoExaminer { public: FFmpegExaminer (boost::shared_ptr, boost::shared_ptr job = boost::shared_ptr ()); + bool has_video () const; + boost::optional video_frame_rate () const; dcp::Size video_size () const; Frame video_length () const; boost::optional sample_aspect_ratio () const; + bool yuv () const; std::vector > subtitle_streams () const { return _subtitle_streams; @@ -85,6 +89,20 @@ private: Frame _video_length; bool _need_video_length; - typedef std::map, boost::optional > LastSubtitleMap; + struct SubtitleStart + { + SubtitleStart (std::string id_, bool image_, ContentTime time_) + : id (id_) + , image (image_) + , time (time_) + {} + + std::string id; + /** true if it's an image subtitle, false for text */ + bool image; + ContentTime time; + }; + + typedef std::map, boost::optional > LastSubtitleMap; LastSubtitleMap _last_subtitle_start; };