X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=fa7be179a95541ea58bf8c33fae3c4ab93483f68;hb=4a74ca2cb973585122e84c21ff48ff4ff1ebd488;hp=85c52b039f10fb91cf614ddd1e1014099ba24833;hpb=04ef57589ebb7c0de3377172a03b24698fd2364a;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index 85c52b039..fa7be179a 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington Copyright (C) 2000-2007 Paul Davis This program is free software; you can redistribute it and/or modify @@ -37,7 +37,6 @@ #include #include #include -#include #include #include #ifdef DCPOMATIC_WINDOWS @@ -45,13 +44,13 @@ #endif #include #include -#include #include #include #include #include #include #include +#include extern "C" { #include #include @@ -70,6 +69,7 @@ extern "C" { #include "job.h" #include "cross.h" #include "video_content.h" +#include "md5_digester.h" #ifdef DCPOMATIC_WINDOWS #include "stack.hpp" #endif @@ -99,9 +99,9 @@ using std::streampos; using std::set_terminate; using boost::shared_ptr; using boost::thread; -using boost::lexical_cast; using boost::optional; using libdcp::Size; +using libdcp::raw_convert; static boost::thread::id ui_thread; static boost::filesystem::path backtrace_file; @@ -266,8 +266,9 @@ LONG WINAPI exception_handler(struct _EXCEPTION_POINTERS *) { dbg::stack s; FILE* f = fopen_boost (backtrace_file, "w"); + fprintf (f, "Exception thrown:"); for (dbg::stack::const_iterator i = s.begin(); i != s.end(); ++i) { - fprintf (f, "%p %s %d %s", i->instruction, i->function.c_str(), i->line, i->module.c_str()); + fprintf (f, "%p %s %d %s\n", i->instruction, i->function.c_str(), i->line, i->module.c_str()); } fclose (f); return EXCEPTION_CONTINUE_SEARCH; @@ -424,23 +425,6 @@ split_at_spaces_considering_quotes (string s) return out; } -string -md5_digest (void const * data, int size) -{ - MD5_CTX md5_context; - MD5_Init (&md5_context); - MD5_Update (&md5_context, data, size); - unsigned char digest[MD5_DIGEST_LENGTH]; - MD5_Final (digest, &md5_context); - - stringstream s; - for (int i = 0; i < MD5_DIGEST_LENGTH; ++i) { - s << std::hex << std::setfill('0') << std::setw(2) << ((int) digest[i]); - } - - return s.str (); -} - /** @param job Optional job for which to report progress */ string md5_digest (vector files, shared_ptr job) @@ -448,8 +432,7 @@ md5_digest (vector files, shared_ptr job) boost::uintmax_t const buffer_size = 64 * 1024; char buffer[buffer_size]; - MD5_CTX md5_context; - MD5_Init (&md5_context); + MD5Digester digester; vector sizes; for (size_t i = 0; i < files.size(); ++i) { @@ -468,7 +451,7 @@ md5_digest (vector files, shared_ptr job) while (remaining > 0) { int const t = min (remaining, buffer_size); fread (buffer, 1, t, f); - MD5_Update (&md5_context, buffer, t); + digester.add (buffer, t); remaining -= t; if (job) { @@ -479,15 +462,7 @@ md5_digest (vector files, shared_ptr job) fclose (f); } - unsigned char digest[MD5_DIGEST_LENGTH]; - MD5_Final (digest, &md5_context); - - stringstream s; - for (int i = 0; i < MD5_DIGEST_LENGTH; ++i) { - s << std::hex << std::setfill('0') << std::setw(2) << ((int) digest[i]); - } - - return s.str (); + return digester.get (); } static bool @@ -729,14 +704,14 @@ int get_required_int (multimap const & kv, string k) { string const v = get_required_string (kv, k); - return lexical_cast (v); + return raw_convert (v); } float get_required_float (multimap const & kv, string k) { string const v = get_required_string (kv, k); - return lexical_cast (v); + return raw_convert (v); } string @@ -766,7 +741,7 @@ get_optional_int (multimap const & kv, string k) return 0; } - return lexical_cast (i->second); + return raw_convert (i->second); } /** Trip an assert if the caller is not in the UI thread */ @@ -790,7 +765,7 @@ video_frames_to_audio_frames (VideoContent::Frame v, float audio_sample_rate, fl string audio_channel_name (int c) { - assert (MAX_AUDIO_CHANNELS == 12); + assert (MAX_DCP_AUDIO_CHANNELS == 12); /* TRANSLATORS: these are the names of audio channels; Lfe (sub) is the low-frequency enhancement channel (sub-woofer). HI is the hearing-impaired audio track and @@ -814,69 +789,12 @@ audio_channel_name (int c) return channels[c]; } -FrameRateConversion::FrameRateConversion (float source, int dcp) - : skip (false) - , repeat (1) - , change_speed (false) -{ - if (fabs (source / 2.0 - dcp) < fabs (source - dcp)) { - /* The difference between source and DCP frame rate will be lower - (i.e. better) if we skip. - */ - skip = true; - } else if (fabs (source * 2 - dcp) < fabs (source - dcp)) { - /* The difference between source and DCP frame rate would be better - if we repeated each frame once; it may be better still if we - repeated more than once. Work out the required repeat. - */ - repeat = round (dcp / source); - } - - change_speed = !about_equal (source * factor(), dcp); - - if (!skip && repeat == 1 && !change_speed) { - description = _("Content and DCP have the same rate.\n"); - } else { - if (skip) { - description = _("DCP will use every other frame of the content.\n"); - } else if (repeat == 2) { - description = _("Each content frame will be doubled in the DCP.\n"); - } else if (repeat > 2) { - description = String::compose (_("Each content frame will be repeated %1 more times in the DCP.\n"), repeat - 1); - } - - if (change_speed) { - float const pc = dcp * 100 / (source * factor()); - description += String::compose (_("DCP will run at %1%% of the content speed.\n"), pc); - } - } -} - -LocaleGuard::LocaleGuard () - : _old (0) -{ - char const * old = setlocale (LC_NUMERIC, 0); - - if (old) { - _old = strdup (old); - if (strcmp (_old, "C")) { - setlocale (LC_NUMERIC, "C"); - } - } -} - -LocaleGuard::~LocaleGuard () -{ - setlocale (LC_NUMERIC, _old); - free (_old); -} - bool valid_image_file (boost::filesystem::path f) { string ext = f.extension().string(); transform (ext.begin(), ext.end(), ext.begin(), ::tolower); - return (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp" || ext == ".tga"); + return (ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" || ext == ".png" || ext == ".bmp" || ext == ".tga" || ext == ".dpx"); } string @@ -1030,3 +948,38 @@ divide_with_round (int64_t a, int64_t b) return a / b; } } + +ScopedTemporary::ScopedTemporary () + : _open (0) +{ + _file = boost::filesystem::temp_directory_path() / boost::filesystem::unique_path (); +} + +ScopedTemporary::~ScopedTemporary () +{ + close (); + boost::system::error_code ec; + boost::filesystem::remove (_file, ec); +} + +char const * +ScopedTemporary::c_str () const +{ + return _file.string().c_str (); +} + +FILE* +ScopedTemporary::open (char const * params) +{ + _open = fopen (c_str(), params); + return _open; +} + +void +ScopedTemporary::close () +{ + if (_open) { + fclose (_open); + _open = 0; + } +}