X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.h;h=67fdcfae0baa65986a407f2adfd2b237828875da;hb=8ab408fbf7a8e5c56bd1402b545b402f65923790;hp=f338723b73b2a8968cdfcf7196ff6c101554b972;hpb=3828baf56467224f5d44049bf1e7a7ed11f43a05;p=dcpomatic.git diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h index f338723b7..67fdcfae0 100644 --- a/src/lib/ffmpeg_examiner.h +++ b/src/lib/ffmpeg_examiner.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2013-2016 Carl Hetherington + Copyright (C) 2013-2017 Carl Hetherington This file is part of DCP-o-matic. @@ -69,15 +69,17 @@ public: return video_codec_context()->colorspace; } - int bits_per_pixel () const; + boost::optional bits_per_pixel () const; + + boost::optional rotation () const { + return _rotation; + } private: void video_packet (AVCodecContext *); void audio_packet (AVCodecContext *, boost::shared_ptr); - void subtitle_packet (AVCodecContext *, boost::shared_ptr); std::string stream_name (AVStream* s) const; - std::string audio_stream_name (AVStream* s) const; std::string subtitle_stream_name (AVStream* s) const; boost::optional frame_time (AVStream* s) const; @@ -90,6 +92,8 @@ private: Frame _video_length; bool _need_video_length; + boost::optional _rotation; + struct SubtitleStart { SubtitleStart (std::string id_, bool image_, ContentTime time_)