+2013-12-04 Carl Hetherington <cth@carlh.net>
+
+ * Several optimisations to video processing, which should
+ speed up the player a bit.
+
2013-12-03 Carl Hetherington <cth@carlh.net>
* Add "play length" control to avoid having to do arithmetic to
return d->nb_components;
}
+/** Crop this image, scale it to `inter_size' and then place it in a black frame of `out_size' */
shared_ptr<Image>
-Image::scale (libdcp::Size out_size, Scaler const * scaler, AVPixelFormat result_format, bool result_aligned) const
+Image::crop_scale_window (Crop crop, libdcp::Size inter_size, libdcp::Size out_size, Scaler const * scaler, AVPixelFormat out_format, bool out_aligned) const
{
assert (scaler);
/* Empirical testing suggests that sws_scale() will crash if
*/
assert (aligned ());
- shared_ptr<Image> scaled (new Image (result_format, out_size, result_aligned));
+ shared_ptr<Image> out (new Image (out_format, out_size, out_aligned));
+ out->make_black ();
+
+ libdcp::Size cropped_size = crop.apply (size ());
+
+ struct SwsContext* scale_context = sws_getContext (
+ cropped_size.width, cropped_size.height, pixel_format(),
+ inter_size.width, inter_size.height, out_format,
+ scaler->ffmpeg_id (), 0, 0, 0
+ );
+
+ uint8_t* scale_in_data[components()];
+ for (int c = 0; c < components(); ++c) {
+ scale_in_data[c] = data()[c] + int (rint (bytes_per_pixel(c) * crop.left)) + stride()[c] * (crop.top / line_factor(c));
+ }
+
+ Position<int> const corner ((out_size.width - inter_size.width) / 2, (out_size.height - inter_size.height) / 2);
+
+ uint8_t* scale_out_data[components()];
+ for (int c = 0; c < components(); ++c) {
+ scale_out_data[c] = out->data()[c] + int (rint (out->bytes_per_pixel(c) * corner.x)) + out->stride()[c] * corner.y;
+ }
+
+ sws_scale (
+ scale_context,
+ scale_in_data, stride(),
+ 0, cropped_size.height,
+ scale_out_data, out->stride()
+ );
+
+ sws_freeContext (scale_context);
+
+ return out;
+}
+
+shared_ptr<Image>
+Image::scale (libdcp::Size out_size, Scaler const * scaler, AVPixelFormat out_format, bool out_aligned) const
+{
+ assert (scaler);
+ /* Empirical testing suggests that sws_scale() will crash if
+ the input image is not aligned.
+ */
+ assert (aligned ());
+
+ shared_ptr<Image> scaled (new Image (out_format, out_size, out_aligned));
struct SwsContext* scale_context = sws_getContext (
size().width, size().height, pixel_format(),
- out_size.width, out_size.height, result_format,
+ out_size.width, out_size.height, out_format,
scaler->ffmpeg_id (), 0, 0, 0
);
boost::shared_ptr<Image> scale (libdcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
boost::shared_ptr<Image> post_process (std::string, bool aligned) const;
- void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);
- void copy (boost::shared_ptr<const Image> image, Position<int> pos);
boost::shared_ptr<Image> crop (Crop c, bool aligned) const;
+
+ boost::shared_ptr<Image> crop_scale_window (Crop c, libdcp::Size, libdcp::Size, Scaler const *, AVPixelFormat, bool aligned) const;
void make_black ();
+ void alpha_blend (boost::shared_ptr<const Image> image, Position<int> pos);
+ void copy (boost::shared_ptr<const Image> image, Position<int> pos);
void read_from_socket (boost::shared_ptr<Socket>);
void write_to_socket (boost::shared_ptr<Socket>) const;
return;
}
- Magick::Image* magick_image = new Magick::Image (_image_content->path(_video_position).string ());
+ Magick::Image* magick_image = new Magick::Image (_image_content->path (_image_content->still() ? 0 : _video_position).string ());
libdcp::Size size (magick_image->columns(), magick_image->rows());
_image.reset (new Image (PIX_FMT_RGB24, size, true));
return;
}
- /* Convert to RGB first, as FFmpeg doesn't seem to like handling YUV images with odd widths */
- shared_ptr<Image> work_image = image->scale (image->size (), _film->scaler(), PIX_FMT_RGB24, true);
-
- work_image = work_image->crop (content->crop(), true);
-
+ Time const time = content->position() + relative_time + extra - content->trim_start ();
float const ratio = content->ratio() ? content->ratio()->ratio() : content->video_size_after_crop().ratio();
- libdcp::Size image_size = fit_ratio_within (ratio, _video_container_size);
+ libdcp::Size const image_size = fit_ratio_within (ratio, _video_container_size);
- work_image = work_image->scale (image_size, _film->scaler(), PIX_FMT_RGB24, true);
+ shared_ptr<Image> work_image = image->crop_scale_window (content->crop(), image_size, _video_container_size, _film->scaler(), PIX_FMT_RGB24, false);
- Time time = content->position() + relative_time + extra - content->trim_start ();
-
- if (_film->with_subtitles () && _out_subtitle.image && time >= _out_subtitle.from && time <= _out_subtitle.to) {
- work_image->alpha_blend (_out_subtitle.image, _out_subtitle.position);
- }
+ Position<int> const container_offset (
+ (_video_container_size.width - image_size.width) / 2,
+ (_video_container_size.height - image_size.width) / 2
+ );
- if (image_size != _video_container_size) {
- assert (image_size.width <= _video_container_size.width);
- assert (image_size.height <= _video_container_size.height);
- shared_ptr<Image> im (new Image (PIX_FMT_RGB24, _video_container_size, true));
- im->make_black ();
- im->copy (work_image, Position<int> ((_video_container_size.width - image_size.width) / 2, (_video_container_size.height - image_size.height) / 2));
- work_image = im;
+ if (_film->with_subtitles () && _out_subtitle.image && time >= _out_subtitle.from && time <= _out_subtitle.to) {
+ work_image->alpha_blend (_out_subtitle.image, _out_subtitle.position + container_offset);
}
#ifdef DCPOMATIC_DEBUG
Video (work_image, eyes, content->colour_conversion(), same, time);
- time += TIME_HZ / _film->video_frame_rate();
_last_emit_was_black = false;
- _video_position = piece->video_position = time;
+ _video_position = piece->video_position = (time + TIME_HZ / _film->video_frame_rate());
if (frc.repeat > 1 && !piece->repeating ()) {
piece->set_repeat (_last_incoming_video, frc.repeat - 1);
T y;
};
+template<class T>
+Position<T>
+operator+ (Position<T> const & a, Position<T> const & b)
+{
+ return Position<T> (a.x + b.x, a.y + b.y);
+}
+
#endif
return;
}
- shared_ptr<Image> packed_frame (new Image (_frame, false));
-
- wxImage frame (_out_size.width, _out_size.height, packed_frame->data()[0], true);
+ wxImage frame (_out_size.width, _out_size.height, _frame->data()[0], true);
wxBitmap frame_bitmap (frame);
dc.DrawBitmap (frame_bitmap, 0, 0);
*/
#include <boost/test/unit_test.hpp>
+#include <Magick++.h>
#include "lib/image.h"
#include "lib/scaler.h"
+using std::string;
+using std::cout;
using boost::shared_ptr;
BOOST_AUTO_TEST_CASE (aligned_image_test)
p += image->stride()[0];
}
}
+
+static
+boost::shared_ptr<Image>
+read_file (string file)
+{
+ Magick::Image magick_image (file.c_str ());
+ libdcp::Size size (magick_image.columns(), magick_image.rows());
+
+ boost::shared_ptr<Image> image (new Image (PIX_FMT_RGB24, size, true));
+
+ using namespace MagickCore;
+
+ uint8_t* p = image->data()[0];
+ for (int y = 0; y < size.height; ++y) {
+ uint8_t* q = p;
+ for (int x = 0; x < size.width; ++x) {
+ Magick::Color c = magick_image.pixelColor (x, y);
+ *q++ = c.redQuantum() * 255 / QuantumRange;
+ *q++ = c.greenQuantum() * 255 / QuantumRange;
+ *q++ = c.blueQuantum() * 255 / QuantumRange;
+ }
+ p += image->stride()[0];
+ }
+
+ return image;
+}
+
+static
+void
+write_file (shared_ptr<Image> image, string file)
+{
+ using namespace MagickCore;
+
+ Magick::Image magick_image (Magick::Geometry (image->size().width, image->size().height), Magick::Color (0, 0, 0));
+ uint8_t*p = image->data()[0];
+ for (int y = 0; y < image->size().height; ++y) {
+ uint8_t* q = p;
+ for (int x = 0; x < image->size().width; ++x) {
+ Magick::Color c (q[0] * QuantumRange / 256, q[1] * QuantumRange / 256, q[2] * QuantumRange / 256);
+ magick_image.pixelColor (x, y, c);
+ q += 3;
+ }
+ p += image->stride()[0];
+ }
+
+ magick_image.write (file.c_str ());
+}
+
+static
+void
+crop_scale_window_single (AVPixelFormat in_format, libdcp::Size in_size, Crop crop, libdcp::Size inter_size, libdcp::Size out_size)
+{
+ /* Set up our test image */
+ shared_ptr<Image> test (new Image (in_format, in_size, true));
+ uint8_t n = 0;
+ for (int c = 0; c < test->components(); ++c) {
+ uint8_t* p = test->data()[c];
+ for (int y = 0; y < test->lines(c); ++y) {
+ for (int x = 0; x < test->stride()[c]; ++x) {
+ *p++ = n++;
+ }
+ }
+ }
+
+ /* Convert using separate methods */
+ boost::shared_ptr<Image> sep = test->crop (crop, true);
+ sep = sep->scale (inter_size, Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true);
+ boost::shared_ptr<Image> sep_container (new Image (PIX_FMT_RGB24, out_size, true));
+ sep_container->make_black ();
+ sep_container->copy (sep, Position<int> ((out_size.width - inter_size.width) / 2, (out_size.height - inter_size.height) / 2));
+
+ /* Convert using the all-in-one method */
+ shared_ptr<Image> all = test->crop_scale_window (crop, inter_size, out_size, Scaler::from_id ("bicubic"), PIX_FMT_RGB24, true);
+
+ /* Compare */
+ BOOST_CHECK_EQUAL (sep_container->size().width, all->size().width);
+ BOOST_CHECK_EQUAL (sep_container->size().height, all->size().height);
+
+ /* Assuming RGB on these */
+ BOOST_CHECK_EQUAL (sep_container->components(), 1);
+ BOOST_CHECK_EQUAL (all->components(), 1);
+
+ uint8_t* p = sep_container->data()[0];
+ uint8_t* q = all->data()[0];
+ for (int y = 0; y < all->size().height; ++y) {
+ uint8_t* pp = p;
+ uint8_t* qq = q;
+ for (int x = 0; x < all->size().width * 3; ++x) {
+ BOOST_CHECK_EQUAL (*pp++, *qq++);
+ }
+ p += sep_container->stride()[0];
+ q += all->stride()[0];
+ }
+}
+
+/** Test Image::crop_scale_window against separate calls to crop/scale/copy */
+BOOST_AUTO_TEST_CASE (crop_scale_window_test)
+{
+ crop_scale_window_single (AV_PIX_FMT_YUV422P, libdcp::Size (640, 480), Crop (), libdcp::Size (640, 480), libdcp::Size (640, 480));
+ crop_scale_window_single (AV_PIX_FMT_YUV422P, libdcp::Size (640, 480), Crop (2, 4, 6, 8), libdcp::Size (640, 480), libdcp::Size (640, 480));
+ crop_scale_window_single (AV_PIX_FMT_YUV422P, libdcp::Size (640, 480), Crop (2, 4, 6, 8), libdcp::Size (1920, 1080), libdcp::Size (1998, 1080));
+ crop_scale_window_single (AV_PIX_FMT_YUV422P, libdcp::Size (640, 480), Crop (1, 4, 6, 8), libdcp::Size (1920, 1080), libdcp::Size (1998, 1080));
+ crop_scale_window_single (AV_PIX_FMT_YUV420P, libdcp::Size (640, 480), Crop (16, 16, 0, 0), libdcp::Size (1920, 1080), libdcp::Size (1998, 1080));
+ crop_scale_window_single (AV_PIX_FMT_YUV420P, libdcp::Size (640, 480), Crop (16, 3, 3, 0), libdcp::Size (1920, 1080), libdcp::Size (1998, 1080));
+ crop_scale_window_single (AV_PIX_FMT_RGB24, libdcp::Size (1000, 800), Crop (0, 0, 0, 0), libdcp::Size (1920, 1080), libdcp::Size (1998, 1080));
+ crop_scale_window_single (AV_PIX_FMT_RGB24, libdcp::Size (1000, 800), Crop (55, 0, 1, 9), libdcp::Size (1920, 1080), libdcp::Size (1998, 1080));
+}
projects / dcpomatic.git / commitdiff