X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fhints.h;h=6553593a06e761da7b908ce1949f5dc3fc06fa58;hp=a7e476b2c738aa3e58f33a0524c307b7538bfc24;hb=cd6c6a693f19fcaa6c75ed60f48a54a8cae51352;hpb=7560428649a428a4bdc3013f41ae7e8319cd5b42 diff --git a/src/lib/hints.h b/src/lib/hints.h index a7e476b2c..6553593a0 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,6 +18,8 @@ */ + +#include "audio_analyser.h" #include "signaller.h" #include "player_text.h" #include "types.h" @@ -49,12 +51,16 @@ 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); @@ -71,10 +77,11 @@ private: 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 @@ -83,17 +90,22 @@ private: */ std::shared_ptr _writer; - bool _long_ccap; - bool _overlap_ccap; - bool _too_many_ccap_lines; + AudioAnalyser _analyser; + + 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; };