X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fhints.h;h=985fa1910d9b10733b88a4f827687bf11de9455a;hb=723779c27ffdafe27b3f23840eea4777ae838a83;hp=9164e210659b4b278cab8b200fcad0bc767968a6;hpb=cadca6e4f8c1d844f1b5fb9375023e627c674fa9;p=dcpomatic.git diff --git a/src/lib/hints.h b/src/lib/hints.h index 9164e2106..985fa1910 100644 --- a/src/lib/hints.h +++ b/src/lib/hints.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2016-2020 Carl Hetherington + Copyright (C) 2016-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,13 +18,14 @@ */ + +#include "audio_analyser.h" #include "signaller.h" #include "player_text.h" #include "types.h" #include "dcp_text_track.h" #include "dcpomatic_time.h" #include "weak_film.h" -#include #include #include #include @@ -38,7 +39,7 @@ class Writer; class Hints : public Signaller, public ExceptionStore, public WeakConstFilm { public: - explicit Hints (boost::weak_ptr film); + explicit Hints (std::weak_ptr film); ~Hints (); void start (); @@ -50,16 +51,22 @@ public: /* For tests only */ void join (); + void disable_audio_analysis () { + _disable_audio_analysis = true; + } private: friend struct hint_subtitle_too_early; void thread (); void hint (std::string h); + void audio (std::shared_ptr audio, dcpomatic::DCPTime time); void text (PlayerText text, TextType type, boost::optional track, dcpomatic::DCPTimePeriod period); void closed_caption (PlayerText text, dcpomatic::DCPTimePeriod period); void open_subtitle (PlayerText text, dcpomatic::DCPTimePeriod period); + void check_certificates (); + void check_interop (); void check_big_font_files (); void check_few_audio_channels (); void check_upmixers (); @@ -67,30 +74,39 @@ private: void check_unusual_container (); void check_high_j2k_bandwidth (); void check_frame_rate (); + void check_4k_3d (); void check_speed_up (); void check_vob (); void check_3d_in_2d (); - void check_loudness (); + bool check_loudness (); void check_ffec_and_ffmc_in_smpte_feature (); + void check_out_of_range_markers (); + void check_text_languages (); + void check_audio_language (); boost::thread _thread; /** This is used to make a partial DCP containing only the subtitles and closed captions that * our final DCP will have. This means we can see how big the files will be and warn if they * will be too big. */ - boost::shared_ptr _writer; + std::shared_ptr _writer; + + AudioAnalyser _analyser; - bool _long_ccap; - bool _overlap_ccap; - bool _too_many_ccap_lines; + bool _long_ccap = false; + bool _overlap_ccap = false; + bool _too_many_ccap_lines = false; boost::optional _last_ccap; - bool _early_subtitle; - bool _short_subtitle; - bool _subtitles_too_close; - bool _too_many_subtitle_lines; - bool _long_subtitle; + bool _early_subtitle = false; + bool _short_subtitle = false; + bool _subtitles_too_close = false; + bool _too_many_subtitle_lines = false; + bool _long_subtitle = false; + bool _very_long_subtitle = false; boost::optional _last_subtitle; boost::atomic _stop; + + bool _disable_audio_analysis = false; };