From cc4a67b7eb8ecaed076e261960848f70e3e741af Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 10 Oct 2012 15:47:06 +0100 Subject: Subs successfully exported with thumbs. --- src/lib/wscript | 1 + 1 file changed, 1 insertion(+) (limited to 'src/lib/wscript') diff --git a/src/lib/wscript b/src/lib/wscript index c809226ce..67292047c 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -42,6 +42,7 @@ def build(bld): screen.cc server.cc sound_processor.cc + subtitle.cc thumbs_job.cc tiff_decoder.cc tiff_encoder.cc -- cgit v1.2.3 From b96ad1327c25d5de8d61ed73a1c0e207e67f1226 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Thu, 11 Oct 2012 01:18:24 +0100 Subject: Use PNG for thumbs so that we get alpha blending in wxwidgets. --- src/lib/film.cc | 6 +- src/lib/film_state.cc | 2 +- src/lib/imagemagick_encoder.cc | 99 +++++++++++++++++++++++++++++++ src/lib/imagemagick_encoder.h | 43 ++++++++++++++ src/lib/subtitle.cc | 70 ++++++++++++++++++++++ src/lib/subtitle.h | 63 ++++++++++++++++++++ src/lib/thumbs_job.cc | 4 +- src/lib/tiff_encoder.cc | 129 ----------------------------------------- src/lib/tiff_encoder.h | 43 -------------- src/lib/wscript | 2 +- src/wx/film_viewer.cc | 2 +- 11 files changed, 283 insertions(+), 180 deletions(-) create mode 100644 src/lib/imagemagick_encoder.cc create mode 100644 src/lib/imagemagick_encoder.h create mode 100644 src/lib/subtitle.cc create mode 100644 src/lib/subtitle.h delete mode 100644 src/lib/tiff_encoder.cc delete mode 100644 src/lib/tiff_encoder.h (limited to 'src/lib/wscript') diff --git a/src/lib/film.cc b/src/lib/film.cc index 1e23c4d6b..08ef938d1 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -30,7 +30,7 @@ #include #include "film.h" #include "format.h" -#include "tiff_encoder.h" +#include "imagemagick_encoder.h" #include "job.h" #include "filter.h" #include "transcoder.h" @@ -397,7 +397,7 @@ Film::update_thumbs_post_gui () string const l = i->leaf (); #endif - size_t const d = l.find (".tiff"); + size_t const d = l.find (".png"); if (d != string::npos) { _state.thumbs.push_back (atoi (l.substr (0, d).c_str())); } @@ -707,7 +707,7 @@ Film::thumb_subtitles (int n) const } else if (k == "x") { sub_x = v; } else if (k == "y") { - subs.push_back (make_pair (Position (sub_x, v), String::compose ("%1.sub.%2.tiff", _state.thumb_base(n), sub_number))); + subs.push_back (make_pair (Position (sub_x, v), String::compose ("%1.sub.%2.png", _state.thumb_base(n), sub_number))); } } diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc index 2847ea513..610362dcd 100644 --- a/src/lib/film_state.cc +++ b/src/lib/film_state.cc @@ -191,7 +191,7 @@ FilmState::thumb_file (int n) const string FilmState::thumb_file_for_frame (int n) const { - return thumb_base_for_frame(n) + ".tiff"; + return thumb_base_for_frame(n) + ".png"; } string diff --git a/src/lib/imagemagick_encoder.cc b/src/lib/imagemagick_encoder.cc new file mode 100644 index 000000000..b7b79ed0c --- /dev/null +++ b/src/lib/imagemagick_encoder.cc @@ -0,0 +1,99 @@ +/* + Copyright (C) 2012 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +/** @file src/imagemagick_encoder.cc + * @brief An encoder that writes image files using ImageMagick (and does nothing with audio). + */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include "imagemagick_encoder.h" +#include "film.h" +#include "film_state.h" +#include "options.h" +#include "exceptions.h" +#include "image.h" +#include "subtitle.h" + +using namespace std; +using namespace boost; + +/** @param s FilmState of the film that we are encoding. + * @param o Options. + * @param l Log. + */ +ImageMagickEncoder::ImageMagickEncoder (shared_ptr s, shared_ptr o, Log* l) + : Encoder (s, o, l) +{ + +} + +void +ImageMagickEncoder::process_video (shared_ptr image, int frame, shared_ptr sub) +{ + shared_ptr scaled = image->scale_and_convert_to_rgb (_opt->out_size, _opt->padding, _fs->scaler); + + string tmp_file = _opt->frame_out_path (frame, true); + Magick::Image thumb (_opt->out_size.width, _opt->out_size.height, "RGB", MagickCore::CharPixel, scaled->data()[0]); + thumb.magick ("PNG"); + thumb.write (tmp_file); + filesystem::rename (tmp_file, _opt->frame_out_path (frame, false)); + + if (sub) { + float const x_scale = float (_opt->out_size.width) / _fs->size.width; + float const y_scale = float (_opt->out_size.height) / _fs->size.height; + + string tmp_metadata_file = _opt->frame_out_path (frame, false, ".sub"); + ofstream metadata (tmp_metadata_file.c_str ()); + + list > images = sub->images (); + int n = 0; + for (list >::iterator i = images.begin(); i != images.end(); ++i) { + stringstream ext; + ext << ".sub." << n << ".png"; + + Size new_size = (*i)->image()->size (); + new_size.width *= x_scale; + new_size.height *= y_scale; + shared_ptr scaled = (*i)->image()->scale (new_size, _fs->scaler); + + string tmp_sub_file = _opt->frame_out_path (frame, true, ext.str ()); + Magick::Image sub_thumb (scaled->size().width, scaled->size().height, "RGBA", MagickCore::CharPixel, scaled->data()[0]); + sub_thumb.magick ("PNG"); + sub_thumb.write (tmp_sub_file); + filesystem::rename (tmp_sub_file, _opt->frame_out_path (frame, false, ext.str ())); + + metadata << "image " << n << "\n" + << "x " << (*i)->position().x << "\n" + << "y " << (*i)->position().y << "\n"; + + metadata.close (); + filesystem::rename (tmp_metadata_file, _opt->frame_out_path (frame, false, ".sub")); + } + + } + + frame_done (frame); +} diff --git a/src/lib/imagemagick_encoder.h b/src/lib/imagemagick_encoder.h new file mode 100644 index 000000000..ce6ca3e8f --- /dev/null +++ b/src/lib/imagemagick_encoder.h @@ -0,0 +1,43 @@ +/* + Copyright (C) 2012 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +/** @file src/imagemagick_encoder.h + * @brief An encoder that writes image files using ImageMagick (and does nothing with audio). + */ + +#include +#include +#include "encoder.h" + +class FilmState; +class Log; + +/** @class ImageMagickEncoder + * @brief An encoder that writes image files using ImageMagick files (and does nothing with audio). + */ +class ImageMagickEncoder : public Encoder +{ +public: + ImageMagickEncoder (boost::shared_ptr s, boost::shared_ptr o, Log* l); + + void process_begin (int64_t audio_channel_layout, AVSampleFormat audio_sample_format) {} + void process_video (boost::shared_ptr, int, boost::shared_ptr); + void process_audio (uint8_t *, int) {} + void process_end () {} +}; diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc new file mode 100644 index 000000000..18dded02c --- /dev/null +++ b/src/lib/subtitle.cc @@ -0,0 +1,70 @@ +/* + Copyright (C) 2012 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include "subtitle.h" +#include "image.h" +#include "exceptions.h" + +using namespace std; +using namespace boost; + +Subtitle::Subtitle (AVSubtitle const & sub) +{ + /* subtitle PTS in seconds */ + float const packet_time = (sub.pts / AV_TIME_BASE) + float (sub.pts % AV_TIME_BASE) / 1e6; + + /* hence start time for this sub */ + _from = packet_time + (double (sub.start_display_time) / 1e3); + _to = packet_time + (double (sub.end_display_time) / 1e3); + + for (unsigned int i = 0; i < sub.num_rects; ++i) { + _images.push_back (shared_ptr (new SubtitleImage (sub.rects[i]))); + } +} + +/** @param t Time in seconds from the start of the film */ +bool +Subtitle::displayed_at (double t) +{ + return t >= _from && t <= _to; +} + +SubtitleImage::SubtitleImage (AVSubtitleRect const * rect) + : _position (rect->x, rect->y) + , _image (new SimpleImage (PIX_FMT_RGBA, Size (rect->w, rect->h))) +{ + if (rect->type != SUBTITLE_BITMAP) { + throw DecodeError ("non-bitmap subtitles not yet supported"); + } + + /* Start of the first line in the subtitle */ + uint8_t* sub_p = rect->pict.data[0]; + /* sub_p looks up into a RGB palette which is here */ + uint32_t const * palette = (uint32_t *) rect->pict.data[1]; + /* Start of the output data */ + uint32_t* out_p = (uint32_t *) _image->data()[0]; + + for (int y = 0; y < rect->h; ++y) { + uint8_t* sub_line_p = sub_p; + for (int x = 0; x < rect->w; ++x) { + *out_p++ = palette[*sub_line_p++]; + } + sub_p += rect->pict.linesize[0]; + } +} diff --git a/src/lib/subtitle.h b/src/lib/subtitle.h new file mode 100644 index 000000000..18d2590eb --- /dev/null +++ b/src/lib/subtitle.h @@ -0,0 +1,63 @@ +/* + Copyright (C) 2012 Carl Hetherington + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + +#include +#include +#include "util.h" + +struct AVSubtitle; +class SubtitleImage; +class SimpleImage; + +class Subtitle +{ +public: + Subtitle (AVSubtitle const &); + + bool displayed_at (double t); + + std::list > images () const { + return _images; + } + +private: + /** display from time in seconds from the start of the film */ + double _from; + /** display to time in seconds from the start of the film */ + double _to; + std::list > _images; +}; + +class SubtitleImage +{ +public: + SubtitleImage (AVSubtitleRect const *); + + Position position () const { + return _position; + } + + boost::shared_ptr image () const { + return _image; + } + +private: + Position _position; + boost::shared_ptr _image; +}; diff --git a/src/lib/thumbs_job.cc b/src/lib/thumbs_job.cc index 779a1d5d1..16a8a7b01 100644 --- a/src/lib/thumbs_job.cc +++ b/src/lib/thumbs_job.cc @@ -24,7 +24,7 @@ #include #include "thumbs_job.h" #include "film_state.h" -#include "tiff_encoder.h" +#include "imagemagick_encoder.h" #include "transcoder.h" #include "options.h" @@ -51,7 +51,7 @@ void ThumbsJob::run () { try { - shared_ptr e (new TIFFEncoder (_fs, _opt, _log)); + shared_ptr e (new ImageMagickEncoder (_fs, _opt, _log)); Transcoder w (_fs, _opt, this, _log, e); w.go (); set_progress (1); diff --git a/src/lib/tiff_encoder.cc b/src/lib/tiff_encoder.cc deleted file mode 100644 index 9aa7b68c3..000000000 --- a/src/lib/tiff_encoder.cc +++ /dev/null @@ -1,129 +0,0 @@ -/* - Copyright (C) 2012 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -/** @file src/tiff_encoder.h - * @brief An encoder that writes TIFF files (and does nothing with audio). - */ - -#include -#include -#include -#include -#include -#include -#include -#include -#include "tiff_encoder.h" -#include "film.h" -#include "film_state.h" -#include "options.h" -#include "exceptions.h" -#include "image.h" -#include "subtitle.h" - -using namespace std; -using namespace boost; - -/** @param s FilmState of the film that we are encoding. - * @param o Options. - * @param l Log. - */ -TIFFEncoder::TIFFEncoder (shared_ptr s, shared_ptr o, Log* l) - : Encoder (s, o, l) -{ - -} - -void -TIFFEncoder::process_video (shared_ptr image, int frame, shared_ptr sub) -{ - shared_ptr scaled = image->scale_and_convert_to_rgb (_opt->out_size, _opt->padding, _fs->scaler); - string tmp_file = _opt->frame_out_path (frame, true); - TIFF* output = TIFFOpen (tmp_file.c_str (), "w"); - if (output == 0) { - throw CreateFileError (tmp_file); - } - - TIFFSetField (output, TIFFTAG_IMAGEWIDTH, _opt->out_size.width); - TIFFSetField (output, TIFFTAG_IMAGELENGTH, _opt->out_size.height); - TIFFSetField (output, TIFFTAG_COMPRESSION, COMPRESSION_NONE); - TIFFSetField (output, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - TIFFSetField (output, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB); - TIFFSetField (output, TIFFTAG_BITSPERSAMPLE, 8); - TIFFSetField (output, TIFFTAG_SAMPLESPERPIXEL, 3); - - if (TIFFWriteEncodedStrip (output, 0, scaled->data()[0], _opt->out_size.width * _opt->out_size.height * 3) == 0) { - throw WriteFileError (tmp_file, 0); - } - - TIFFClose (output); - - filesystem::rename (tmp_file, _opt->frame_out_path (frame, false)); - - if (sub) { - float const x_scale = float (_opt->out_size.width) / _fs->size.width; - float const y_scale = float (_opt->out_size.height) / _fs->size.height; - - string tmp_metadata_file = _opt->frame_out_path (frame, false, ".sub"); - ofstream metadata (tmp_metadata_file.c_str ()); - - list > images = sub->images (); - int n = 0; - for (list >::iterator i = images.begin(); i != images.end(); ++i) { - stringstream ext; - ext << ".sub." << n << ".tiff"; - - string tmp_sub_file = _opt->frame_out_path (frame, true, ext.str ()); - output = TIFFOpen (tmp_sub_file.c_str(), "w"); - if (output == 0) { - throw CreateFileError (tmp_file); - } - - Size new_size = (*i)->image()->size (); - new_size.width *= x_scale; - new_size.height *= y_scale; - shared_ptr scaled = (*i)->image()->scale (new_size, _fs->scaler); - - TIFFSetField (output, TIFFTAG_IMAGEWIDTH, scaled->size().width); - TIFFSetField (output, TIFFTAG_IMAGELENGTH, scaled->size().height); - TIFFSetField (output, TIFFTAG_COMPRESSION, COMPRESSION_NONE); - TIFFSetField (output, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG); - TIFFSetField (output, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB); - TIFFSetField (output, TIFFTAG_BITSPERSAMPLE, 8); - TIFFSetField (output, TIFFTAG_SAMPLESPERPIXEL, 4); - - if (TIFFWriteEncodedStrip (output, 0, scaled->data()[0], scaled->size().width * scaled->size().height * 4) == 0) { - throw WriteFileError (tmp_file, 0); - } - - TIFFClose (output); - filesystem::rename (tmp_sub_file, _opt->frame_out_path (frame, false, ext.str ())); - - metadata << "image " << n << "\n" - << "x " << (*i)->position().x << "\n" - << "y " << (*i)->position().y << "\n"; - - metadata.close (); - filesystem::rename (tmp_metadata_file, _opt->frame_out_path (frame, false, ".sub")); - } - - } - - frame_done (frame); -} diff --git a/src/lib/tiff_encoder.h b/src/lib/tiff_encoder.h deleted file mode 100644 index 1c9f33f4a..000000000 --- a/src/lib/tiff_encoder.h +++ /dev/null @@ -1,43 +0,0 @@ -/* - Copyright (C) 2012 Carl Hetherington - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. - -*/ - -/** @file src/tiff_encoder.h - * @brief An encoder that writes TIFF files (and does nothing with audio). - */ - -#include -#include -#include "encoder.h" - -class FilmState; -class Log; - -/** @class TIFFEncoder - * @brief An encoder that writes TIFF files (and does nothing with audio). - */ -class TIFFEncoder : public Encoder -{ -public: - TIFFEncoder (boost::shared_ptr s, boost::shared_ptr o, Log* l); - - void process_begin (int64_t audio_channel_layout, AVSampleFormat audio_sample_format) {} - void process_video (boost::shared_ptr, int, boost::shared_ptr); - void process_audio (uint8_t *, int) {} - void process_end () {} -}; diff --git a/src/lib/wscript b/src/lib/wscript index 67292047c..9539d57a1 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -30,6 +30,7 @@ def build(bld): format.cc image.cc imagemagick_decoder.cc + imagemagick_encoder.cc j2k_still_encoder.cc j2k_wav_encoder.cc job.cc @@ -45,7 +46,6 @@ def build(bld): subtitle.cc thumbs_job.cc tiff_decoder.cc - tiff_encoder.cc timer.cc transcode_job.cc transcoder.cc diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index 8c298ea57..e49532cdb 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -326,7 +326,7 @@ FilmViewer::update_thumbs () _film->update_thumbs_pre_gui (); shared_ptr s = _film->state_copy (); - shared_ptr o (new Options (s->dir ("thumbs"), ".tiff", "")); + shared_ptr o (new Options (s->dir ("thumbs"), ".png", "")); o->out_size = _film->size (); o->apply_crop = false; o->decode_audio = false; -- cgit v1.2.3 From 43990add893eccf350f280e2dd3f947a94f3e9aa Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Mon, 15 Oct 2012 12:40:47 +0100 Subject: Some work on DCI naming. Clean up compacted / aligned image handling somewhat. --- src/lib/dcp_content_type.cc | 23 +++++++-------- src/lib/dcp_content_type.h | 7 ++++- src/lib/film_state.cc | 63 +++++++++++++++++++++++++++++++++++++++++- src/lib/film_state.h | 12 +++++++- src/lib/format.cc | 32 ++++++++++----------- src/lib/format.h | 12 ++++++-- src/lib/image.cc | 46 ++++++++++++++++++++++++++---- src/lib/image.h | 16 ++++++++++- src/lib/imagemagick_encoder.cc | 6 ++-- src/lib/server.cc | 2 +- src/lib/subtitle.cc | 6 ++-- src/lib/util.cc | 1 + src/lib/util.h | 1 + src/lib/wscript | 2 +- src/wx/film_editor.cc | 5 ++++ src/wx/film_editor.h | 3 ++ test/test.cc | 2 +- wscript | 8 ++++++ 18 files changed, 200 insertions(+), 47 deletions(-) (limited to 'src/lib/wscript') diff --git a/src/lib/dcp_content_type.cc b/src/lib/dcp_content_type.cc index 1f50c8dc4..aae805308 100644 --- a/src/lib/dcp_content_type.cc +++ b/src/lib/dcp_content_type.cc @@ -28,9 +28,10 @@ using namespace std; vector DCPContentType::_dcp_content_types; -DCPContentType::DCPContentType (string p, libdcp::ContentKind k) +DCPContentType::DCPContentType (string p, libdcp::ContentKind k, string d) : _pretty_name (p) , _libdcp_kind (k) + , _dci_name (d) { } @@ -38,16 +39,16 @@ DCPContentType::DCPContentType (string p, libdcp::ContentKind k) void DCPContentType::setup_dcp_content_types () { - _dcp_content_types.push_back (new DCPContentType ("Feature", libdcp::FEATURE)); - _dcp_content_types.push_back (new DCPContentType ("Short", libdcp::SHORT)); - _dcp_content_types.push_back (new DCPContentType ("Trailer", libdcp::TRAILER)); - _dcp_content_types.push_back (new DCPContentType ("Test", libdcp::TEST)); - _dcp_content_types.push_back (new DCPContentType ("Transitional", libdcp::TRANSITIONAL)); - _dcp_content_types.push_back (new DCPContentType ("Rating", libdcp::RATING)); - _dcp_content_types.push_back (new DCPContentType ("Teaser", libdcp::TEASER)); - _dcp_content_types.push_back (new DCPContentType ("Policy", libdcp::POLICY)); - _dcp_content_types.push_back (new DCPContentType ("Public Service Announcement", libdcp::PUBLIC_SERVICE_ANNOUNCEMENT)); - _dcp_content_types.push_back (new DCPContentType ("Advertisement", libdcp::ADVERTISEMENT)); + _dcp_content_types.push_back (new DCPContentType ("Feature", libdcp::FEATURE, "FTR")); + _dcp_content_types.push_back (new DCPContentType ("Short", libdcp::SHORT, "SHR")); + _dcp_content_types.push_back (new DCPContentType ("Trailer", libdcp::TRAILER, "TLR")); + _dcp_content_types.push_back (new DCPContentType ("Test", libdcp::TEST, "TST")); + _dcp_content_types.push_back (new DCPContentType ("Transitional", libdcp::TRANSITIONAL, "XSN")); + _dcp_content_types.push_back (new DCPContentType ("Rating", libdcp::RATING, "RTG")); + _dcp_content_types.push_back (new DCPContentType ("Teaser", libdcp::TEASER, "TSR")); + _dcp_content_types.push_back (new DCPContentType ("Policy", libdcp::POLICY, "POL")); + _dcp_content_types.push_back (new DCPContentType ("Public Service Announcement", libdcp::PUBLIC_SERVICE_ANNOUNCEMENT, "PSA")); + _dcp_content_types.push_back (new DCPContentType ("Advertisement", libdcp::ADVERTISEMENT, "ADV")); } DCPContentType const * diff --git a/src/lib/dcp_content_type.h b/src/lib/dcp_content_type.h index cb858cf5a..b703970a3 100644 --- a/src/lib/dcp_content_type.h +++ b/src/lib/dcp_content_type.h @@ -31,7 +31,7 @@ class DCPContentType { public: - DCPContentType (std::string, libdcp::ContentKind); + DCPContentType (std::string, libdcp::ContentKind, std::string); /** @return user-visible `pretty' name */ std::string pretty_name () const { @@ -42,6 +42,10 @@ public: return _libdcp_kind; } + std::string dci_name () const { + return _dci_name; + } + static DCPContentType const * from_pretty_name (std::string); static DCPContentType const * from_index (int); static int as_index (DCPContentType const *); @@ -51,6 +55,7 @@ public: private: std::string _pretty_name; libdcp::ContentKind _libdcp_kind; + std::string _dci_name; /** All available DCP content types */ static std::vector _dcp_content_types; diff --git a/src/lib/film_state.cc b/src/lib/film_state.cc index a4d88d0e0..fed506863 100644 --- a/src/lib/film_state.cc +++ b/src/lib/film_state.cc @@ -29,6 +29,7 @@ #include #include #include +#include #include "film_state.h" #include "scaler.h" #include "filter.h" @@ -330,4 +331,64 @@ FilmState::dcp_length () const return length; } - +string +FilmState::dci_name () const +{ + stringstream d; + d << dci_name_prefix << "_"; + + if (dcp_content_type) { + d << dcp_content_type->dci_name() << "_"; + } + + if (format) { + d << format->dci_name() << "_"; + } + + if (!audio_language.empty ()) { + d << audio_language; + if (!subtitle_language.empty ()) { + d << "-" << subtitle_language; + } + d << "_"; + } + + if (!territory.empty ()) { + d << territory; + if (!rating.empty ()) { + d << "-" << rating; + } + d << "_"; + } + + switch (audio_channels) { + case 1: + d << "1_"; + break; + case 2: + d << "2_"; + break; + case 6: + d << "51_"; + break; + } + + d << "2K_"; + + if (!studio.empty ()) { + d << studio << "_"; + } + + gregorian::date today = gregorian::day_clock::local_day (); + d << gregorian::to_iso_extended_string (today) << "_"; + + if (!facility.empty ()) { + d << facility << "_"; + } + + if (!package_type.empty ()) { + d << package_type; + } + + return d.str (); +} diff --git a/src/lib/film_state.h b/src/lib/film_state.h index d53c6a969..e58d46b0f 100644 --- a/src/lib/film_state.h +++ b/src/lib/film_state.h @@ -91,8 +91,8 @@ public: void read_metadata (std::string, std::string); Size cropped_size (Size) const; - int dcp_length () const; + std::string dci_name () const; /** Complete path to directory containing the film metadata; must not be relative. @@ -138,6 +138,16 @@ public: int subtitle_offset; float subtitle_scale; + /* DCI naming stuff */ + std::string dci_name_prefix; + std::string audio_language; + std::string subtitle_language; + std::string territory; + std::string rating; + std::string studio; + std::string facility; + std::string package_type; + /* Data which is cached to speed things up */ /** Vector of frame indices for each of our `thumbnails' */ diff --git a/src/lib/format.cc b/src/lib/format.cc index aaf5211f9..2eb4990da 100644 --- a/src/lib/format.cc +++ b/src/lib/format.cc @@ -63,18 +63,18 @@ Format::as_metadata () const void Format::setup_formats () { - _formats.push_back (new FixedFormat (119, Size (1285, 1080), "119", "1.19")); - _formats.push_back (new FixedFormat (133, Size (1436, 1080), "133", "1.33")); - _formats.push_back (new FixedFormat (138, Size (1485, 1080), "138", "1.375")); - _formats.push_back (new FixedFormat (133, Size (1998, 1080), "133-in-flat", "4:3 within Flat")); - _formats.push_back (new FixedFormat (137, Size (1480, 1080), "137", "Academy")); - _formats.push_back (new FixedFormat (166, Size (1793, 1080), "166", "1.66")); - _formats.push_back (new FixedFormat (166, Size (1998, 1080), "166-in-flat", "1.66 within Flat")); - _formats.push_back (new FixedFormat (178, Size (1998, 1080), "178-in-flat", "16:9 within Flat")); - _formats.push_back (new FixedFormat (185, Size (1998, 1080), "185", "Flat")); - _formats.push_back (new FixedFormat (239, Size (2048, 858), "239", "Scope")); - _formats.push_back (new VariableFormat (Size (1998, 1080), "var-185", "Flat")); - _formats.push_back (new VariableFormat (Size (2048, 858), "var-239", "Scope")); + _formats.push_back (new FixedFormat (119, Size (1285, 1080), "119", "1.19", "F")); + _formats.push_back (new FixedFormat (133, Size (1436, 1080), "133", "1.33", "F")); + _formats.push_back (new FixedFormat (138, Size (1485, 1080), "138", "1.375", "F")); + _formats.push_back (new FixedFormat (133, Size (1998, 1080), "133-in-flat", "4:3 within Flat", "F")); + _formats.push_back (new FixedFormat (137, Size (1480, 1080), "137", "Academy", "F")); + _formats.push_back (new FixedFormat (166, Size (1793, 1080), "166", "1.66", "F")); + _formats.push_back (new FixedFormat (166, Size (1998, 1080), "166-in-flat", "1.66 within Flat", "F")); + _formats.push_back (new FixedFormat (178, Size (1998, 1080), "178-in-flat", "16:9 within Flat", "F")); + _formats.push_back (new FixedFormat (185, Size (1998, 1080), "185", "Flat", "F")); + _formats.push_back (new FixedFormat (239, Size (2048, 858), "239", "Scope", "S")); + _formats.push_back (new VariableFormat (Size (1998, 1080), "var-185", "Flat", "F")); + _formats.push_back (new VariableFormat (Size (2048, 858), "var-239", "Scope", "S")); } /** @param n Nickname. @@ -135,8 +135,8 @@ Format::all () * @param id ID (e.g. 185) * @param n Nick name (e.g. Flat) */ -FixedFormat::FixedFormat (int r, Size dcp, string id, string n) - : Format (dcp, id, n) +FixedFormat::FixedFormat (int r, Size dcp, string id, string n, string d) + : Format (dcp, id, n, d) , _ratio (r) { @@ -155,8 +155,8 @@ Format::dcp_padding (Film const * f) const return p; } -VariableFormat::VariableFormat (Size dcp, string id, string n) - : Format (dcp, id, n) +VariableFormat::VariableFormat (Size dcp, string id, string n, string d) + : Format (dcp, id, n, d) { } diff --git a/src/lib/format.h b/src/lib/format.h index fd6cdbece..35dd4fb85 100644 --- a/src/lib/format.h +++ b/src/lib/format.h @@ -31,10 +31,11 @@ class Film; class Format { public: - Format (Size dcp, std::string id, std::string n) + Format (Size dcp, std::string id, std::string n, std::string d) : _dcp_size (dcp) , _id (id) , _nickname (n) + , _dci_name (d) {} /** @return the aspect ratio multiplied by 100 @@ -67,6 +68,10 @@ public: return _nickname; } + std::string dci_name () const { + return _dci_name; + } + std::string as_metadata () const; static Format const * from_nickname (std::string n); @@ -85,6 +90,7 @@ protected: std::string _id; /** nickname (e.g. Flat, Scope) */ std::string _nickname; + std::string _dci_name; private: /** all available formats */ @@ -98,7 +104,7 @@ private: class FixedFormat : public Format { public: - FixedFormat (int, Size, std::string, std::string); + FixedFormat (int, Size, std::string, std::string, std::string); int ratio_as_integer (Film const *) const { return _ratio; @@ -119,7 +125,7 @@ private: class VariableFormat : public Format { public: - VariableFormat (Size, std::string, std::string); + VariableFormat (Size, std::string, std::string, std::string); int ratio_as_integer (Film const * f) const; float ratio_as_float (Film const * f) const; diff --git a/src/lib/image.cc b/src/lib/image.cc index 2c0338b53..f5aef8444 100644 --- a/src/lib/image.cc +++ b/src/lib/image.cc @@ -26,6 +26,7 @@ #include #include #include +#include #include extern "C" { #include @@ -88,7 +89,7 @@ Image::scale (Size out_size, Scaler const * scaler) const { assert (scaler); - shared_ptr scaled (new SimpleImage (pixel_format(), out_size)); + shared_ptr scaled (new AlignedImage (pixel_format(), out_size)); struct SwsContext* scale_context = sws_getContext ( size().width, size().height, pixel_format(), @@ -120,7 +121,7 @@ Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scal Size content_size = out_size; content_size.width -= (padding * 2); - shared_ptr rgb (new SimpleImage (PIX_FMT_RGB24, content_size)); + shared_ptr rgb (new AlignedImage (PIX_FMT_RGB24, content_size)); struct SwsContext* scale_context = sws_getContext ( size().width, size().height, pixel_format(), @@ -141,7 +142,7 @@ Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scal scheme of things. */ if (padding > 0) { - shared_ptr padded_rgb (new SimpleImage (PIX_FMT_RGB24, out_size)); + shared_ptr padded_rgb (new AlignedImage (PIX_FMT_RGB24, out_size)); padded_rgb->make_black (); /* XXX: we are cheating a bit here; we know the frame is RGB so we can @@ -170,7 +171,7 @@ Image::scale_and_convert_to_rgb (Size out_size, int padding, Scaler const * scal shared_ptr Image::post_process (string pp) const { - shared_ptr out (new SimpleImage (PIX_FMT_YUV420P, size ())); + shared_ptr out (new AlignedImage (PIX_FMT_YUV420P, size ())); pp_mode* mode = pp_get_mode_by_name_and_quality (pp.c_str (), PP_QUALITY_MAX); pp_context* context = pp_get_context (size().width, size().height, PP_FORMAT_420 | PP_CPU_CAPS_MMX2); @@ -249,14 +250,16 @@ Image::alpha_blend (shared_ptr other, Position position) * @param p Pixel format. * @param s Size in pixels. */ -SimpleImage::SimpleImage (PixelFormat p, Size s) +SimpleImage::SimpleImage (PixelFormat p, Size s, function rounder) : Image (p) , _size (s) { _data = (uint8_t **) av_malloc (4 * sizeof (uint8_t *)); _data[0] = _data[1] = _data[2] = _data[3] = 0; + _line_size = (int *) av_malloc (4); _line_size[0] = _line_size[1] = _line_size[2] = _line_size[3] = 0; + _stride = (int *) av_malloc (4); _stride[0] = _stride[1] = _stride[2] = _stride[3] = 0; @@ -277,7 +280,7 @@ SimpleImage::SimpleImage (PixelFormat p, Size s) } for (int i = 0; i < components(); ++i) { - _stride[i] = round_up (_line_size[i], 32); + _stride[i] = rounder (_line_size[i]); _data[i] = (uint8_t *) av_malloc (_stride[i] * lines (i)); } } @@ -318,6 +321,37 @@ SimpleImage::size () const return _size; } +AlignedImage::AlignedImage (PixelFormat f, Size s) + : SimpleImage (f, s, boost::bind (round_up, _1, 32)) +{ + +} + +CompactImage::CompactImage (PixelFormat f, Size s) + : SimpleImage (f, s, boost::bind (round_up, _1, 1)) +{ + +} + +CompactImage::CompactImage (shared_ptr im) + : SimpleImage (im->pixel_format(), im->size(), boost::bind (round_up, _1, 1)) +{ + assert (components() == im->components()); + + for (int c = 0; c < components(); ++c) { + + assert (line_size()[c] == im->line_size()[c]); + + uint8_t* t = data()[c]; + uint8_t* o = im->data()[c]; + + for (int y = 0; y < lines(c); ++y) { + memcpy (t, o, line_size()[c]); + t += stride()[c]; + o += im->stride()[c]; + } + } +} FilterBufferImage::FilterBufferImage (PixelFormat p, AVFilterBufferRef* b) : Image (p) diff --git a/src/lib/image.h b/src/lib/image.h index 3e16d43bf..30c8519e7 100644 --- a/src/lib/image.h +++ b/src/lib/image.h @@ -26,6 +26,7 @@ #include #include +#include extern "C" { #include #include @@ -107,7 +108,7 @@ private: class SimpleImage : public Image { public: - SimpleImage (PixelFormat, Size); + SimpleImage (PixelFormat, Size, boost::function rounder); ~SimpleImage (); uint8_t ** data () const; @@ -116,11 +117,24 @@ public: Size size () const; private: + Size _size; ///< size in pixels uint8_t** _data; ///< array of pointers to components int* _line_size; ///< array of sizes of the data in each line, in pixels (without any alignment padding bytes) int* _stride; ///< array of strides for each line (including any alignment padding bytes) +}; + +class AlignedImage : public SimpleImage +{ +public: + AlignedImage (PixelFormat, Size); +}; +class CompactImage : public SimpleImage +{ +public: + CompactImage (PixelFormat, Size); + CompactImage (boost::shared_ptr); }; /** @class RGBFrameImage diff --git a/src/lib/imagemagick_encoder.cc b/src/lib/imagemagick_encoder.cc index b7b79ed0c..9bd8162f8 100644 --- a/src/lib/imagemagick_encoder.cc +++ b/src/lib/imagemagick_encoder.cc @@ -54,9 +54,10 @@ void ImageMagickEncoder::process_video (shared_ptr image, int frame, shared_ptr sub) { shared_ptr scaled = image->scale_and_convert_to_rgb (_opt->out_size, _opt->padding, _fs->scaler); + shared_ptr compact (new CompactImage (scaled)); string tmp_file = _opt->frame_out_path (frame, true); - Magick::Image thumb (_opt->out_size.width, _opt->out_size.height, "RGB", MagickCore::CharPixel, scaled->data()[0]); + Magick::Image thumb (compact->size().width, compact->size().height, "RGB", MagickCore::CharPixel, compact->data()[0]); thumb.magick ("PNG"); thumb.write (tmp_file); filesystem::rename (tmp_file, _opt->frame_out_path (frame, false)); @@ -78,9 +79,10 @@ ImageMagickEncoder::process_video (shared_ptr image, int frame, shared_pt new_size.width *= x_scale; new_size.height *= y_scale; shared_ptr scaled = (*i)->image()->scale (new_size, _fs->scaler); + shared_ptr compact (new CompactImage (scaled)); string tmp_sub_file = _opt->frame_out_path (frame, true, ext.str ()); - Magick::Image sub_thumb (scaled->size().width, scaled->size().height, "RGBA", MagickCore::CharPixel, scaled->data()[0]); + Magick::Image sub_thumb (compact->size().width, compact->size().height, "RGBA", MagickCore::CharPixel, compact->data()[0]); sub_thumb.magick ("PNG"); sub_thumb.write (tmp_sub_file); filesystem::rename (tmp_sub_file, _opt->frame_out_path (frame, false, ext.str ())); diff --git a/src/lib/server.cc b/src/lib/server.cc index 659418b8f..b5eda2eb8 100644 --- a/src/lib/server.cc +++ b/src/lib/server.cc @@ -116,7 +116,7 @@ Server::process (shared_ptr socket) post_process = ""; } - shared_ptr image (new SimpleImage (pixel_format, in_size)); + shared_ptr image (new AlignedImage (pixel_format, in_size)); for (int i = 0; i < image->components(); ++i) { socket->read_definite_and_consume (image->data()[i], image->stride()[i] * image->lines(i), 30); diff --git a/src/lib/subtitle.cc b/src/lib/subtitle.cc index f0d77c511..0eb40b14e 100644 --- a/src/lib/subtitle.cc +++ b/src/lib/subtitle.cc @@ -48,7 +48,7 @@ Subtitle::displayed_at (double t) SubtitleImage::SubtitleImage (AVSubtitleRect const * rect) : _position (rect->x, rect->y) - , _image (new SimpleImage (PIX_FMT_RGBA, Size (rect->w, rect->h))) + , _image (new AlignedImage (PIX_FMT_RGBA, Size (rect->w, rect->h))) { if (rect->type != SUBTITLE_BITMAP) { throw DecodeError ("non-bitmap subtitles not yet supported"); @@ -63,10 +63,12 @@ SubtitleImage::SubtitleImage (AVSubtitleRect const * rect) for (int y = 0; y < rect->h; ++y) { uint8_t* sub_line_p = sub_p; + uint32_t* out_line_p = out_p; for (int x = 0; x < rect->w; ++x) { - *out_p++ = palette[*sub_line_p++]; + *out_line_p++ = palette[*sub_line_p++]; } sub_p += rect->pict.linesize[0]; + out_p += _image->stride()[0] / sizeof (uint32_t); } } diff --git a/src/lib/util.cc b/src/lib/util.cc index c3dd13d7c..fbe77461e 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -620,3 +620,4 @@ round_up (int a, int t) a += (t - 1); return a - (a % t); } + diff --git a/src/lib/util.h b/src/lib/util.h index 244c01855..bd7675a8a 100644 --- a/src/lib/util.h +++ b/src/lib/util.h @@ -192,3 +192,4 @@ private: }; #endif + diff --git a/src/lib/wscript b/src/lib/wscript index 9539d57a1..63847224c 100644 --- a/src/lib/wscript +++ b/src/lib/wscript @@ -2,7 +2,7 @@ def build(bld): obj = bld(features = 'cxx cxxshlib') obj.name = 'libdvdomatic' obj.export_includes = ['.'] - obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD OPENJPEG POSTPROC TIFF SIGC++ MAGICK SSH DCP GLIB' + obj.uselib = 'AVCODEC AVUTIL AVFORMAT AVFILTER SWSCALE SWRESAMPLE SNDFILE BOOST_FILESYSTEM BOOST_THREAD BOOST_DATETIME OPENJPEG POSTPROC TIFF SIGC++ MAGICK SSH DCP GLIB' if bld.env.TARGET_WINDOWS: obj.uselib += ' WINSOCK2' obj.source = """ diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 143b058b1..7fd2eb9fc 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -60,6 +60,11 @@ FilmEditor::FilmEditor (Film* f, wxWindow* parent) _name = new wxTextCtrl (this, wxID_ANY); _sizer->Add (_name, 1, wxEXPAND); + _use_dci_name = new wxCheckBox (this, wxID_ANY, wxT ("Use DCI name")); + _sizer->Add (_use_dci_name, 1, wxEXPAND); + _edit_dci_button = new wxButton (this, wxID_ANY, wxT ("Edit...")); + _sizer->Add (_edit_dci_button, 0); + add_label_to_sizer (_sizer, this, "Content"); _content = new wxFilePickerCtrl (this, wxID_ANY, wxT (""), wxT ("Select Content File"), wxT("*.*")); _sizer->Add (_content, 1, wxEXPAND); diff --git a/src/wx/film_editor.h b/src/wx/film_editor.h index 31d8ad39b..2a3be6d0c 100644 --- a/src/wx/film_editor.h +++ b/src/wx/film_editor.h @@ -24,6 +24,7 @@ #include #include #include +#include #include "lib/trim_action.h" #include "lib/film.h" @@ -83,6 +84,8 @@ private: Film* _film; /** The Film's name */ wxTextCtrl* _name; + wxCheckBox* _use_dci_name; + wxButton* _edit_dci_button; /** The Film's format */ wxComboBox* _format; /** The Film's content file */ diff --git a/test/test.cc b/test/test.cc index aaa911b32..c43f0cb7d 100644 --- a/test/test.cc +++ b/test/test.cc @@ -270,7 +270,7 @@ do_remote_encode (shared_ptr frame, ServerDescription* descriptio BOOST_AUTO_TEST_CASE (client_server_test) { - shared_ptr image (new SimpleImage (PIX_FMT_RGB24, Size (1998, 1080))); + shared_ptr image (new CompactImage (PIX_FMT_RGB24, Size (1998, 1080))); uint8_t* p = image->data()[0]; diff --git a/wscript b/wscript index 8e36f8aa6..98a098f7e 100644 --- a/wscript +++ b/wscript @@ -93,6 +93,14 @@ def configure(conf): lib = ['boost_filesystem%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], uselib_store = 'BOOST_FILESYSTEM') + conf.check_cxx(fragment = """ + #include \n + int main() { boost::gregorian::day_clock::local_day(); }\n + """, msg = 'Checking for boost datetime library', + libpath = '/usr/local/lib', + lib = ['boost_date_time%s' % boost_lib_suffix, 'boost_system%s' % boost_lib_suffix], + uselib_store = 'BOOST_DATETIME') + conf.check_cc(fragment = """ #include int main() { g_format_size (1); } -- cgit v1.2.3