X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=fd11fffbda2b5f2fbc41169aa1da3f5c14094e11;hb=cf2ed48d21ddbc32bda262064480e88e69dc031a;hp=f5218653dafb05e106e11546da72c14ad79ac825;hpb=951d70db4f81b5ddd4093f11853637c8ecbe63c5;p=dcpomatic.git diff --git a/src/lib/util.h b/src/lib/util.h index f5218653d..fd11fffbd 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2020 Carl Hetherington This file is part of DCP-o-matic. @@ -18,19 +18,24 @@ */ + /** @file src/util.h * @brief Some utility functions and classes. */ + #ifndef DCPOMATIC_UTIL_H #define DCPOMATIC_UTIL_H -#include "types.h" -#include "dcpomatic_time.h" + #include "audio_mapping.h" +#include "dcpomatic_time.h" +#include "pixel_quanta.h" +#include "types.h" +#include +#include #include #include -#include #include #include #include @@ -40,15 +45,12 @@ #undef check + namespace dcp { class PictureAsset; class SoundAsset; } -#ifndef M_PI -#define M_PI (3.14159265358979323846) -#endif - /** The maximum number of audio channels that we can have in a DCP */ #define MAX_DCP_AUDIO_CHANNELS 16 /** Message broadcast to find possible encoding servers */ @@ -60,13 +62,19 @@ namespace dcp { /** Largest KDM size (in bytes) that will be accepted */ #define MAX_KDM_SIZE (256 * 1024) /** Number of lines that closed caption viewers will display */ -#define CLOSED_CAPTION_LINES 3 -/** Maximum line length of closed caption viewers */ -#define CLOSED_CAPTION_LENGTH 30 -/* We are mis-using genre here, as only some metadata tags are written/read. - I tried the use_metadata_tags option but it didn't seem to make any difference. -*/ -#define SWAROOP_ID_TAG "genre" +#define MAX_CLOSED_CAPTION_LINES 3 +/** Maximum line length of closed caption viewers, according to SMPTE Bv2.1 */ +#define MAX_CLOSED_CAPTION_LENGTH 32 +/** Maximum size of a subtitle / closed caption MXF in bytes, according to SMPTE Bv2.1 */ +#define MAX_TEXT_MXF_SIZE (115 * 1024 * 1024) +#define MAX_TEXT_MXF_SIZE_TEXT "115MB" +/** Maximum size of a font file, in bytes */ +#define MAX_FONT_FILE_SIZE (640 * 1024) +#define MAX_FONT_FILE_SIZE_TEXT "640KB" +/** Maximum size of the XML part of a closed caption file, according to SMPTE Bv2.1 */ +#define MAX_CLOSED_CAPTION_XML_SIZE (256 * 1024) +#define MAX_CLOSED_CAPTION_XML_SIZE_TEXT "256KB" +#define CERTIFICATE_VALIDITY_PERIOD (10 * 365) extern std::string program_name; extern bool is_batch_converter; @@ -94,33 +102,47 @@ extern boost::filesystem::path mo_path (); #endif extern std::string tidy_for_filename (std::string); extern dcp::Size fit_ratio_within (float ratio, dcp::Size); -extern int stride_round_up (int, int const *, int); extern void* wrapped_av_malloc (size_t); extern void set_backtrace_file (boost::filesystem::path); extern std::map split_get_request (std::string url); -extern std::string video_asset_filename (boost::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); -extern std::string audio_asset_filename (boost::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); +extern std::string video_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); +extern std::string audio_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); +extern std::string atmos_asset_filename (std::shared_ptr asset, int reel_index, int reel_count, boost::optional content_summary); extern float relaxed_string_to_float (std::string); extern std::string careful_string_filter (std::string); extern std::pair audio_channel_types (std::list mapped, int channels); -extern boost::shared_ptr remap (boost::shared_ptr input, int output_channels, AudioMapping map); +extern std::shared_ptr remap (std::shared_ptr input, int output_channels, AudioMapping map); extern Eyes increment_eyes (Eyes e); extern void checked_fread (void* ptr, size_t size, FILE* stream, boost::filesystem::path path); extern void checked_fwrite (void const * ptr, size_t size, FILE* stream, boost::filesystem::path path); extern size_t utf8_strlen (std::string s); extern std::string day_of_week_to_string (boost::gregorian::greg_weekday d); -extern void emit_subtitle_image (dcpomatic::ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, boost::shared_ptr decoder); -#ifdef DCPOMATIC_VARIANT_SWAROOP -extern boost::shared_ptr read_swaroop_chain (boost::filesystem::path path); -extern void write_swaroop_chain (boost::shared_ptr chain, boost::filesystem::path output); -#endif +extern void emit_subtitle_image (dcpomatic::ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, std::shared_ptr decoder); +extern bool show_jobs_on_console (bool progress); +extern void copy_in_bits (boost::filesystem::path from, boost::filesystem::path to, std::function); +extern dcp::Size scale_for_display (dcp::Size s, dcp::Size display_container, dcp::Size film_container, PixelQuanta quanta); +extern dcp::DecryptedKDM decrypt_kdm_with_helpful_error (dcp::EncryptedKDM kdm); +extern boost::filesystem::path default_font_file (); +extern std::string to_upper (std::string s); +extern void start_of_thread (std::string name); template std::list vector_to_list (std::vector v) { std::list l; - BOOST_FOREACH (T& i, v) { + for (auto& i: v) { + l.push_back (i); + } + return l; +} + +template +std::vector +list_to_vector (std::list v) +{ + std::vector l; + for (auto& i: v) { l.push_back (i); } return l;