X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=ede1d4e9b5c16bdee34c0c2ec7fd23db1e1bb7a2;hb=0242efb9802d7bcbde0701a7267972d4dbe5abb8;hp=dccf32f4d6c5d1345d4c7202b0dbe5ae812eb85d;hpb=5229b795b9d7cafe174496fbc6bca8d62f4a3ff0;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index dccf32f4d..ede1d4e9b 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -36,10 +36,10 @@ #include "audio_processor.h" #include "safe_stringstream.h" #include -#include -#include -#include -#include +#include +#include +#include +#include #include #include #include @@ -184,7 +184,7 @@ int addr2line (void const * const addr) { char addr2line_cmd[512] = { 0 }; - sprintf (addr2line_cmd, "addr2line -f -p -e %.256s %p > %s", program_name.c_str(), addr, backtrace_file.string().c_str()); + sprintf (addr2line_cmd, "addr2line -f -p -e %.256s %p > %s", program_name.c_str(), addr, backtrace_file.string().c_str()); return system(addr2line_cmd); } @@ -198,19 +198,19 @@ exception_handler(struct _EXCEPTION_POINTERS * info) FILE* f = fopen_boost (backtrace_file, "w"); fprintf (f, "C-style exception %d\n", info->ExceptionRecord->ExceptionCode); fclose(f); - + if (info->ExceptionRecord->ExceptionCode != EXCEPTION_STACK_OVERFLOW) { CONTEXT* context = info->ContextRecord; SymInitialize (GetCurrentProcess (), 0, true); - + STACKFRAME frame = { 0 }; - + /* setup initial stack frame */ #if _WIN64 frame.AddrPC.Offset = context->Rip; frame.AddrStack.Offset = context->Rsp; frame.AddrFrame.Offset = context->Rbp; -#else +#else frame.AddrPC.Offset = context->Eip; frame.AddrStack.Offset = context->Esp; frame.AddrFrame.Offset = context->Ebp; @@ -218,7 +218,7 @@ exception_handler(struct _EXCEPTION_POINTERS * info) frame.AddrPC.Mode = AddrModeFlat; frame.AddrStack.Mode = AddrModeFlat; frame.AddrFrame.Mode = AddrModeFlat; - + while ( StackWalk ( IMAGE_FILE_MACHINE_I386, @@ -235,13 +235,13 @@ exception_handler(struct _EXCEPTION_POINTERS * info) addr2line((void *) frame.AddrPC.Offset); } } else { -#ifdef _WIN64 +#ifdef _WIN64 addr2line ((void *) info->ContextRecord->Rip); -#else +#else addr2line ((void *) info->ContextRecord->Eip); -#endif +#endif } - + return EXCEPTION_CONTINUE_SEARCH; } #endif @@ -273,7 +273,7 @@ terminate () << e.what() << std::endl; } catch (...) { - std::cerr << __FUNCTION__ << " caught unknown/unhandled exception." + std::cerr << __FUNCTION__ << " caught unknown/unhandled exception." << std::endl; } @@ -306,8 +306,8 @@ dcpomatic_setup () */ std::locale::global (boost::locale::generator().generate ("")); boost::filesystem::path::imbue (std::locale ()); -#endif - +#endif + avfilter_register_all (); #ifdef DCPOMATIC_OSX @@ -323,7 +323,7 @@ dcpomatic_setup () Pango::init (); dcp::init (); - + Ratio::setup_ratios (); PresetColourConversion::setup_colour_conversion_presets (); VideoContentScale::setup_scales (); @@ -332,6 +332,8 @@ dcpomatic_setup () CinemaSoundProcessor::setup_cinema_sound_processors (); AudioProcessor::setup_audio_processors (); + curl_global_init (CURL_GLOBAL_ALL); + ui_thread = boost::this_thread::get_id (); } @@ -377,15 +379,15 @@ dcpomatic_setup_gettext_i18n (string lang) } setlocale (LC_ALL, ""); - textdomain ("libdcpomatic"); + textdomain ("libdcpomatic2"); #if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX) - bindtextdomain ("libdcpomatic", mo_path().string().c_str()); - bind_textdomain_codeset ("libdcpomatic", "UTF8"); -#endif + bindtextdomain ("libdcpomatic2", mo_path().string().c_str()); + bind_textdomain_codeset ("libdcpomatic2", "UTF8"); +#endif #ifdef DCPOMATIC_LINUX - bindtextdomain ("libdcpomatic", LINUX_LOCALE_PREFIX); + bindtextdomain ("libdcpomatic2", LINUX_LOCALE_PREFIX); #endif } @@ -434,25 +436,12 @@ md5_digest_head_tail (vector files, boost::uintmax_t si fclose (f); --i; - } + } digester.add (buffer.get(), size - to_do); return digester.get (); } -/** @param An arbitrary audio frame rate. - * @return The appropriate DCP-approved frame rate (48kHz or 96kHz). - */ -int -dcp_audio_frame_rate (int fs) -{ - if (fs <= 48000) { - return 48000; - } - - return 96000; -} - /** Round a number up to the nearest multiple of another number. * @param c Index. * @param s Array of numbers to round, indexed by c. @@ -466,17 +455,6 @@ stride_round_up (int c, int const * stride, int t) return a - (a % t); } -/** @param n A number. - * @param r Rounding `boundary' (must be a power of 2) - * @return n rounded to the nearest r - */ -int -round_to (float n, int r) -{ - DCPOMATIC_ASSERT (r == 1 || r == 2 || r == 4); - return int (n + float(r) / 2) &~ (r - 1); -} - /** Trip an assert if the caller is not in the UI thread */ void ensure_ui_thread () @@ -516,13 +494,13 @@ valid_image_file (boost::filesystem::path f) if (boost::starts_with (f.leaf().string(), "._")) { return false; } - + 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" || ext == ".dpx" || - ext == ".j2c" || ext == ".j2k" + ext == ".j2c" || ext == ".j2k" || ext == ".jp2" ); } @@ -531,7 +509,7 @@ valid_j2k_file (boost::filesystem::path f) { string ext = f.extension().string(); transform (ext.begin(), ext.end(), ext.begin(), ::tolower); - return (ext == ".j2k" || ext == ".j2c"); + return (ext == ".j2k" || ext == ".j2c" || ext == ".jp2"); } string @@ -555,7 +533,7 @@ fit_ratio_within (float ratio, dcp::Size full_frame) if (ratio < full_frame.ratio ()) { return dcp::Size (rint (full_frame.height * ratio), full_frame.height); } - + return dcp::Size (full_frame.width, rint (full_frame.width / ratio)); } @@ -578,7 +556,7 @@ subtitle_period (AVSubtitle const & sub) /* End time is not known */ return FFmpegSubtitlePeriod (packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3)); } - + return FFmpegSubtitlePeriod ( packet_time + ContentTime::from_seconds (sub.start_display_time / 1e3), packet_time + ContentTime::from_seconds (sub.end_display_time / 1e3) @@ -593,7 +571,7 @@ split_get_request (string url) KEY, VALUE } state = AWAITING_QUESTION_MARK; - + map r; string k; string v; @@ -631,64 +609,14 @@ split_get_request (string url) return r; } -long -frame_info_position (int frame, Eyes eyes) -{ - static int const info_size = 48; - - switch (eyes) { - case EYES_BOTH: - return frame * info_size; - case EYES_LEFT: - return frame * info_size * 2; - case EYES_RIGHT: - return frame * info_size * 2 + info_size; - default: - DCPOMATIC_ASSERT (false); - } - - DCPOMATIC_ASSERT (false); -} - -dcp::FrameInfo -read_frame_info (FILE* file, int frame, Eyes eyes) -{ - dcp::FrameInfo info; - dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET); - fread (&info.offset, sizeof (info.offset), 1, file); - fread (&info.size, sizeof (info.size), 1, file); - - char hash_buffer[33]; - fread (hash_buffer, 1, 32, file); - hash_buffer[32] = '\0'; - info.hash = hash_buffer; - - return info; -} - -void -write_frame_info (FILE* file, int frame, Eyes eyes, dcp::FrameInfo info) -{ - dcpomatic_fseek (file, frame_info_position (frame, eyes), SEEK_SET); - fwrite (&info.offset, sizeof (info.offset), 1, file); - fwrite (&info.size, sizeof (info.size), 1, file); - fwrite (info.hash.c_str(), 1, info.hash.size(), file); -} - -string -video_mxf_filename (shared_ptr mxf) -{ - return "j2c_" + mxf->id() + ".mxf"; -} - string -audio_mxf_filename (shared_ptr mxf) +video_asset_filename (shared_ptr asset) { - return "pcm_" + mxf->id() + ".mxf"; + return "j2c_" + asset->id() + ".mxf"; } string -subtitle_content_filename (shared_ptr content) +audio_asset_filename (shared_ptr asset) { - return "sub_" + content->id() + ".xml"; + return "pcm_" + asset->id() + ".mxf"; }