X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Futil.cc;h=1f6fba96302b4f9b3dc8943374860221fcc7b1cf;hb=c4403784febdbdd42e9c32e67fadb147f11fe566;hp=a1ea8f9f16c645436fc830cc9ada4e75c48bf4bb;hpb=9da0bac018e0e7dcad0c1aafaa7f6be6d434da96;p=dcpomatic.git diff --git a/src/lib/util.cc b/src/lib/util.cc index a1ea8f9f1..1f6fba963 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2016 Carl Hetherington + Copyright (C) 2012-2019 Carl Hetherington This file is part of DCP-o-matic. @@ -38,6 +38,12 @@ #include "crypto.h" #include "compose.hpp" #include "audio_buffers.h" +#include "string_text.h" +#include "font.h" +#include "render_text.h" +#include "ffmpeg_image_proxy.h" +#include "image.h" +#include "text_decoder.h" #include #include #include @@ -56,6 +62,7 @@ extern "C" { #include #include #include +#include #ifdef DCPOMATIC_WINDOWS #include #include @@ -74,6 +81,7 @@ extern "C" { #include "i18n.h" using std::string; +using std::wstring; using std::setfill; using std::ostream; using std::endl; @@ -98,6 +106,7 @@ using boost::scoped_array; using dcp::Size; using dcp::raw_convert; using dcp::locale_convert; +using namespace dcpomatic; /** Path to our executable, required by the stacktrace stuff and filled * in during App::onInit(). @@ -358,9 +367,30 @@ dcpomatic_setup () set_terminate (terminate); +#ifdef DCPOMATIC_WINDOWS + putenv ("PANGOCAIRO_BACKEND=fontconfig"); + putenv (String::compose("FONTCONFIG_PATH=%1", shared_path().string()).c_str()); +#endif + +#ifdef DCPOMATIC_OSX + setenv ("PANGOCAIRO_BACKEND", "fontconfig", 1); + setenv ("FONTCONFIG_PATH", shared_path().string().c_str(), 1); +#endif + Pango::init (); dcp::init (); +#if defined(DCPOMATIC_WINDOWS) || defined(DCPOMATIC_OSX) + /* Render something to fontconfig to create its cache */ + list subs; + dcp::SubtitleString ss( + optional(), false, false, false, dcp::Colour(), 42, 1, dcp::Time(), dcp::Time(), 0, dcp::HALIGN_CENTER, 0, dcp::VALIGN_CENTER, dcp::DIRECTION_LTR, + "Hello dolly", dcp::NONE, dcp::Colour(), dcp::Time(), dcp::Time() + ); + subs.push_back (StringText(ss, 0)); + render_text (subs, list >(), dcp::Size(640, 480), DCPTime(), 24); +#endif + Ratio::setup_ratios (); PresetColourConversion::setup_colour_conversion_presets (); VideoContentScale::setup_scales (); @@ -702,7 +732,7 @@ relaxed_string_to_float (string s) try { boost::algorithm::replace_all (s, ",", "."); return lexical_cast (s); - } catch (bad_lexical_cast) { + } catch (bad_lexical_cast &) { boost::algorithm::replace_all (s, ".", ","); return lexical_cast (s); } @@ -716,15 +746,34 @@ careful_string_filter (string s) Safety first and all that. */ + wstring ws = boost::locale::conv::utf_to_utf(s); + string out; string const allowed = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_%.+"; - for (size_t i = 0; i < s.size(); ++i) { - if (allowed.find (s[i]) != string::npos) { - out += s[i]; + for (size_t i = 0; i < ws.size(); ++i) { + + wchar_t c = ws[i]; + + /* Remove some accents */ + if (wstring(L"áàâ").find(c) != string::npos) { + c = 'a'; + } + if (wstring(L"éèêë").find(c) != string::npos) { + c = 'e'; + } + if (wstring(L"ö").find(c) != string::npos) { + c = 'o'; + } + if (wstring(L"ü").find(c) != string::npos) { + c = 'u'; + } + + if (allowed.find(c) != string::npos) { + out += c; } } - return out; + return boost::locale::conv::utf_to_utf(out); } /** @param mapped List of mapped audio channels from a Film. @@ -815,6 +864,87 @@ checked_fread (void* ptr, size_t size, FILE* stream, boost::filesystem::path pat } } +size_t +utf8_strlen (string s) +{ + size_t const len = s.length (); + int N = 0; + for (size_t i = 0; i < len; ++i) { + unsigned char c = s[i]; + if ((c & 0xe0) == 0xc0) { + ++i; + } else if ((c & 0xf0) == 0xe0) { + i += 2; + } else if ((c & 0xf8) == 0xf0) { + i += 3; + } + ++N; + } + return N; +} + +string +day_of_week_to_string (boost::gregorian::greg_weekday d) +{ + switch (d.as_enum()) { + case boost::date_time::Sunday: + return _("Sunday"); + case boost::date_time::Monday: + return _("Monday"); + case boost::date_time::Tuesday: + return _("Tuesday"); + case boost::date_time::Wednesday: + return _("Wednesday"); + case boost::date_time::Thursday: + return _("Thursday"); + case boost::date_time::Friday: + return _("Friday"); + case boost::date_time::Saturday: + return _("Saturday"); + } + + return d.as_long_string (); +} + +/** @param size Size of picture that the subtitle will be overlaid onto */ +void +emit_subtitle_image (ContentTimePeriod period, dcp::SubtitleImage sub, dcp::Size size, shared_ptr decoder) +{ + /* XXX: this is rather inefficient; decoding the image just to get its size */ + FFmpegImageProxy proxy (sub.png_image()); + shared_ptr image = proxy.image().first; + /* set up rect with height and width */ + dcpomatic::Rect rect(0, 0, image->size().width / double(size.width), image->size().height / double(size.height)); + + /* add in position */ + + switch (sub.h_align()) { + case dcp::HALIGN_LEFT: + rect.x += sub.h_position(); + break; + case dcp::HALIGN_CENTER: + rect.x += 0.5 + sub.h_position() - rect.width / 2; + break; + case dcp::HALIGN_RIGHT: + rect.x += 1 - sub.h_position() - rect.width; + break; + } + + switch (sub.v_align()) { + case dcp::VALIGN_TOP: + rect.y += sub.v_position(); + break; + case dcp::VALIGN_CENTER: + rect.y += 0.5 + sub.v_position() - rect.height / 2; + break; + case dcp::VALIGN_BOTTOM: + rect.y += 1 - sub.v_position() - rect.height; + break; + } + + decoder->emit_bitmap (period, image, rect); +} + #ifdef DCPOMATIC_VARIANT_SWAROOP /* Make up a key from the machine UUID */ @@ -888,8 +1018,6 @@ read_swaroop_chain (boost::filesystem::path path) void write_swaroop_chain (shared_ptr chain, boost::filesystem::path output) { - cout << "write " << output.string() << "\n"; - scoped_array buffer (new uint8_t[65536]); Header* header = (Header *) buffer.get(); memset (header, 0, sizeof(Header));