X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fffmpeg_examiner.h;h=10d060707588be939ba20925c4a2d41b6035bea1;hb=f706bbb9afd10472e81a051cd5db601d6404377c;hp=793460f9b11b7dfc777e502914ee5f976c64f2cf;hpb=3339d3bce70afe9ae2ca10e9fcfc4b54b748fbf4;p=dcpomatic.git diff --git a/src/lib/ffmpeg_examiner.h b/src/lib/ffmpeg_examiner.h index 793460f9b..10d060707 100644 --- a/src/lib/ffmpeg_examiner.h +++ b/src/lib/ffmpeg_examiner.h @@ -35,13 +35,13 @@ class FFmpegExaminer : public FFmpeg, public VideoExaminer public: FFmpegExaminer (std::shared_ptr, std::shared_ptr job = std::shared_ptr()); - bool has_video () const; + bool has_video () const override; - boost::optional video_frame_rate () const; - dcp::Size video_size () const; - Frame video_length () const; - boost::optional sample_aspect_ratio () const; - bool yuv () const; + boost::optional video_frame_rate () const override; + dcp::Size video_size () const override; + Frame video_length () const override; + boost::optional sample_aspect_ratio () const override; + bool yuv () const override; std::vector> subtitle_streams () const { return _subtitle_streams; @@ -55,7 +55,9 @@ public: return _first_video; } - VideoRange range () const; + VideoRange range () const override; + + PixelQuanta pixel_quanta () const override; AVColorRange color_range () const { return video_codec_context()->color_range; @@ -89,7 +91,7 @@ private: std::string stream_name (AVStream* s) const; std::string subtitle_stream_name (AVStream* s) const; - boost::optional frame_time (AVStream* s) const; + boost::optional frame_time (AVFrame* frame, AVStream* stream) const; std::vector> _subtitle_streams; std::vector> _audio_streams;