Merge master.

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

diff --git a/src/lib/player_video_frame.cc b/src/lib/player_video_frame.cc
index 94760e495ce95b5ce0c284b5c5d2f8a4492e24c5..771e0a912e2a2977b438732e5e53aaf4116d23ed 100644 (file)
--- a/src/lib/player_video_frame.cc
+++ b/src/lib/player_video_frame.cc
@@ -36,7 +36,7 @@ PlayerVideoFrame::PlayerVideoFrame (
        Scaler const * scaler,
        Eyes eyes,
        Part part,
-       ColourConversion colour_conversion
+       boost::optional<ColourConversion> colour_conversion
        )
        : _in (in)
        , _crop (crop)
@@ -59,7 +59,7 @@ PlayerVideoFrame::PlayerVideoFrame (shared_ptr<cxml::Node> node, shared_ptr<Sock
        _scaler = Scaler::from_id (node->string_child ("Scaler"));
        _eyes = (Eyes) node->number_child<int> ("Eyes");
        _part = (Part) node->number_child<int> ("Part");
-       _colour_conversion = ColourConversion (node);
+       _colour_conversion = ColourConversion::from_xml (node);
 
        _in = image_proxy_factory (node->node_child ("In"), socket, log);
 
@@ -84,7 +84,7 @@ PlayerVideoFrame::set_subtitle (shared_ptr<const Image> image, Position<int> pos
 }
 
 shared_ptr<Image>
-PlayerVideoFrame::image () const
+PlayerVideoFrame::image (AVPixelFormat pixel_format) const
 {
        shared_ptr<Image> im = _in->image ();
        
@@ -106,7 +106,7 @@ PlayerVideoFrame::image () const
                break;
        }
                
-       shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, PIX_FMT_RGB24, false);
+       shared_ptr<Image> out = im->crop_scale_window (total_crop, _inter_size, _out_size, _scaler, pixel_format, false);
 
        Position<int> const container_offset ((_out_size.width - _inter_size.width) / 2, (_out_size.height - _inter_size.width) / 2);
 
@@ -129,7 +129,9 @@ PlayerVideoFrame::add_metadata (xmlpp::Node* node) const
        node->add_child("Scaler")->add_child_text (_scaler->id ());
        node->add_child("Eyes")->add_child_text (raw_convert<string> (_eyes));
        node->add_child("Part")->add_child_text (raw_convert<string> (_part));
-       _colour_conversion.as_xml (node);
+       if (_colour_conversion) {
+               _colour_conversion.get().as_xml (node);
+       }
        if (_subtitle_image) {
                node->add_child ("SubtitleWidth")->add_child_text (raw_convert<string> (_subtitle_image->size().width));
                node->add_child ("SubtitleHeight")->add_child_text (raw_convert<string> (_subtitle_image->size().height));