Trying to create export audio encoders with between 9 and 15 channels

[dcpomatic.git] / src / lib / player_video.cc

diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc
index 75479136f0682bea3be97bf9e1debc8bf4bb390b..10e798ed510644a86e03d11249d737139268d3b0 100644 (file)
--- a/src/lib/player_video.cc
+++ b/src/lib/player_video.cc
@@ -54,7 +54,8 @@ PlayerVideo::PlayerVideo (
        optional<ColourConversion> colour_conversion,
        VideoRange video_range,
        weak_ptr<Content> content,
-       optional<Frame> video_frame
+       optional<Frame> video_frame,
+       bool error
        )
        : _in (in)
        , _crop (crop)
@@ -67,6 +68,7 @@ PlayerVideo::PlayerVideo (
        , _video_range (video_range)
        , _content (content)
        , _video_frame (video_frame)
+       , _error (error)
 {
 
 }
@@ -81,6 +83,7 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket
        _eyes = (Eyes) node->number_child<int> ("Eyes");
        _part = (Part) node->number_child<int> ("Part");
        _video_range = (VideoRange) node->number_child<int>("VideoRange");
+       _error = node->optional_bool_child("Error").get_value_or (false);
 
        /* Assume that the ColourConversion uses the current state version */
        _colour_conversion = ColourConversion::from_xml (node, Film::current_state_version);
@@ -132,31 +135,30 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, b
        _image_out_size = _out_size;
        _image_fade = _fade;
 
-       pair<shared_ptr<Image>, int> prox = _in->image (_inter_size);
-       shared_ptr<Image> im = prox.first;
-       int const reduce = prox.second;
+       ImageProxy::Result prox = _in->image (_inter_size);
+       _error = prox.error;
 
        Crop total_crop = _crop;
        switch (_part) {
        case PART_LEFT_HALF:
-               total_crop.right += im->size().width / 2;
+               total_crop.right += prox.image->size().width / 2;
                break;
        case PART_RIGHT_HALF:
-               total_crop.left += im->size().width / 2;
+               total_crop.left += prox.image->size().width / 2;
                break;
        case PART_TOP_HALF:
-               total_crop.bottom += im->size().height / 2;
+               total_crop.bottom += prox.image->size().height / 2;
                break;
        case PART_BOTTOM_HALF:
-               total_crop.top += im->size().height / 2;
+               total_crop.top += prox.image->size().height / 2;
                break;
        default:
                break;
        }
 
-       if (reduce > 0) {
+       if (prox.log2_scaling > 0) {
                /* Scale the crop down to account for the scaling that has already happened in ImageProxy::image */
-               int const r = pow(2, reduce);
+               int const r = pow(2, prox.log2_scaling);
                total_crop.left /= r;
                total_crop.right /= r;
                total_crop.top /= r;
@@ -168,8 +170,8 @@ PlayerVideo::make_image (function<AVPixelFormat (AVPixelFormat)> pixel_format, b
                yuv_to_rgb = _colour_conversion.get().yuv_to_rgb();
        }
 
-       _image = im->crop_scale_window (
-               total_crop, _inter_size, _out_size, yuv_to_rgb, _video_range, pixel_format (im->pixel_format()), aligned, fast
+       _image = prox.image->crop_scale_window (
+               total_crop, _inter_size, _out_size, yuv_to_rgb, _video_range, pixel_format (prox.image->pixel_format()), aligned, fast
                );
 
        if (_text) {
@@ -196,6 +198,7 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const
        node->add_child("Eyes")->add_child_text (raw_convert<string> (static_cast<int> (_eyes)));
        node->add_child("Part")->add_child_text (raw_convert<string> (static_cast<int> (_part)));
        node->add_child("VideoRange")->add_child_text(raw_convert<string>(static_cast<int>(_video_range)));
+       node->add_child("Error")->add_child_text(_error ? "1" : "0");
        if (_colour_conversion) {
                _colour_conversion.get().as_xml (node);
        }
@@ -208,9 +211,9 @@ PlayerVideo::add_metadata (xmlpp::Node* node) const
 }
 
 void
-PlayerVideo::send_binary (shared_ptr<Socket> socket) const
+PlayerVideo::write_to_socket (shared_ptr<Socket> socket) const
 {
-       _in->send_binary (socket);
+       _in->write_to_socket (socket);
        if (_text) {
                _text->image->write_to_socket (socket);
        }
@@ -317,7 +320,8 @@ PlayerVideo::shallow_copy () const
                        _colour_conversion,
                        _video_range,
                        _content,
-                       _video_frame
+                       _video_frame,
+                       _error
                        )
                );
 }
@@ -335,7 +339,7 @@ PlayerVideo::reset_metadata (shared_ptr<const Film> film, dcp::Size video_contai
 
        _crop = content->video->crop();
        _fade = content->video->fade(film, _video_frame.get());
-       _inter_size = content->video->scale().size(content->video, video_container_size, film_frame_size);
+       _inter_size = scale_for_display(content->video->scaled_size(film_frame_size), video_container_size, film_frame_size);
        _out_size = video_container_size;
        _colour_conversion = content->video->colour_conversion();
        _video_range = content->video->range();