X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.h;h=d3e6a67de9e1fd053783c65afd8effaef22ef001;hb=8aeb741ccbe2edb528e98a431bf55459a6836a9b;hp=02cc742aa52f62a8fac1a467d1c7a44b310f8625;hpb=47f25009bcbc765e397bcb471dd361a511c99daf;p=dcpomatic.git diff --git a/src/lib/util.h b/src/lib/util.h index 02cc742aa..d3e6a67de 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -38,6 +38,7 @@ extern "C" { } #include "compose.hpp" #include "types.h" +#include "video_content.h" #ifdef DCPOMATIC_DEBUG #define TIMING(...) _film->log()->microsecond_log (String::compose (__VA_ARGS__), Log::TIMING); @@ -45,10 +46,18 @@ extern "C" { #define TIMING(...) #endif +#undef check + /** The maximum number of audio channels that we can cope with */ #define MAX_AUDIO_CHANNELS 6 -class Scaler; +#define DCPOMATIC_HELLO "Boys, you gotta learn not to talk to nuns that way" + +namespace libdcp { + class Signer; +} + +class Job; extern std::string seconds_to_hms (int); extern std::string seconds_to_approximate_hms (int); @@ -56,19 +65,23 @@ extern void stacktrace (std::ostream &, int); extern std::string dependency_version_summary (); extern double seconds (struct timeval); extern void dcpomatic_setup (); -extern void dcpomatic_setup_i18n (std::string); +extern void dcpomatic_setup_gettext_i18n (std::string); extern std::vector split_at_spaces_considering_quotes (std::string); -extern std::string md5_digest (boost::filesystem::path); +extern std::string md5_digest (std::vector, boost::shared_ptr); extern std::string md5_digest (void const *, int); extern void ensure_ui_thread (); extern std::string audio_channel_name (int); +extern bool valid_image_file (boost::filesystem::path); #ifdef DCPOMATIC_WINDOWS extern boost::filesystem::path mo_path (); #endif +extern std::string tidy_for_filename (std::string); +extern boost::shared_ptr make_signer (); +extern libdcp::Size fit_ratio_within (float ratio, libdcp::Size); -struct FrameRateConversion +struct FrameRateChange { - FrameRateConversion (float, int); + FrameRateChange (float, int); /** @return factor by which to multiply a source frame rate to get the effective rate after any skip or repeat has happened. @@ -76,44 +89,44 @@ struct FrameRateConversion float factor () const { if (skip) { return 0.5; - } else if (repeat) { - return 2; } - return 1; + return repeat; } /** true to skip every other frame */ bool skip; - /** true to repeat every frame once */ - bool repeat; + /** number of times to use each frame (e.g. 1 is normal, 2 means repeat each frame once, and so on) */ + int repeat; /** true if this DCP will run its video faster or slower than the source * without taking into account `repeat' nor `skip'. * (e.g. change_speed will be true if - * source is 29.97fps, DCP is 30fps - * source is 14.50fps, DCP is 30fps + * source is 29.97fps, DCP is 30fps + * source is 14.50fps, DCP is 30fps * but not if - * source is 15.00fps, DCP is 30fps - * source is 12.50fps, DCP is 25fps) + * source is 15.00fps, DCP is 30fps + * source is 12.50fps, DCP is 25fps) */ bool change_speed; + /** Amount by which the video is being sped-up in the DCP; e.g. for a + * 24fps source in a 25fps DCP this would be 25/24. + */ + float speed_up; + std::string description; }; -int best_dcp_frame_rate (float); - -extern std::string crop_string (Position, libdcp::Size); -extern int dcp_audio_sample_rate (int); -extern std::string colour_lut_index_to_name (int index); +extern int dcp_audio_frame_rate (int); extern int stride_round_up (int, int const *, int); -extern int stride_lookup (int c, int const * stride); +extern DCPTime time_round_up (DCPTime, DCPTime); extern std::multimap read_key_value (std::istream& s); extern int get_required_int (std::multimap const & kv, std::string k); extern float get_required_float (std::multimap const & kv, std::string k); extern std::string get_required_string (std::multimap const & kv, std::string k); extern int get_optional_int (std::multimap const & kv, std::string k); extern std::string get_optional_string (std::multimap const & kv, std::string k); +extern void* wrapped_av_malloc (size_t); /** @class Socket * @brief A class to wrap a boost::asio::ip::tcp::socket with some things @@ -126,13 +139,15 @@ class Socket { public: Socket (int timeout = 30); + ~Socket (); /** @return Our underlying socket */ boost::asio::ip::tcp::socket& socket () { return _socket; } - void connect (boost::asio::ip::basic_resolver_entry const & endpoint); + void connect (boost::asio::ip::tcp::endpoint); + void accept (int); void write (uint32_t n); void write (uint8_t const * data, int size); @@ -148,55 +163,11 @@ private: boost::asio::io_service _io_service; boost::asio::deadline_timer _deadline; boost::asio::ip::tcp::socket _socket; + boost::asio::ip::tcp::acceptor* _acceptor; int _timeout; }; -/** @class AudioBuffers - * @brief A class to hold multi-channel audio data in float format. - */ -class AudioBuffers -{ -public: - AudioBuffers (int channels, int frames); - AudioBuffers (AudioBuffers const &); - ~AudioBuffers (); - - float** data () const { - return _data; - } - - float* data (int) const; - - int channels () const { - return _channels; - } - - int frames () const { - return _frames; - } - - void set_frames (int f); - - void make_silent (); - void make_silent (int c); - - void copy_from (AudioBuffers* from, int frames_to_copy, int read_offset, int write_offset); - void move (int from, int to, int frames); - void accumulate (boost::shared_ptr, int, int); - -private: - /** Number of channels */ - int _channels; - /** Number of frames (where a frame is one sample across all channels) */ - int _frames; - /** Number of frames that _data can hold */ - int _allocated_frames; - /** Audio data (so that, e.g. _data[2][6] is channel 2, sample 6) */ - float** _data; -}; - -extern int64_t video_frames_to_audio_frames (ContentVideoFrame v, float audio_sample_rate, float frames_per_second); -extern std::pair cpu_info (); +extern int64_t video_frames_to_audio_frames (VideoFrame v, float audio_sample_rate, float frames_per_second); class LocaleGuard {