diff options
| author | Carl Hetherington <cth@carlh.net> | 2018-02-02 17:23:25 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2018-02-02 17:23:25 +0000 |
| commit | 496d364e2b8eaba0e9bd89b70660e58bbd9a1f29 (patch) | |
| tree | e8874c871b91730bf106347004adc62ceec680a8 | |
| parent | 5e0a4699d50931aafaca2801fa8b010549ab3abc (diff) | |
Fix incorrect pixel format on subtitles when they are sent to encoding servers.
| -rw-r--r-- | src/lib/player_video.cc | 2 | ||||
| -rw-r--r-- | test/client_server_test.cc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player_video.cc b/src/lib/player_video.cc index 8ff008b39..4784b1637 100644 --- a/src/lib/player_video.cc +++ b/src/lib/player_video.cc @@ -79,7 +79,7 @@ PlayerVideo::PlayerVideo (shared_ptr<cxml::Node> node, shared_ptr<Socket> socket if (node->optional_number_child<int> ("SubtitleX")) { shared_ptr<Image> image ( - new Image (AV_PIX_FMT_RGBA, dcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true) + new Image (AV_PIX_FMT_BGRA, dcp::Size (node->number_child<int> ("SubtitleWidth"), node->number_child<int> ("SubtitleHeight")), true) ); image->read_from_socket (socket); diff --git a/test/client_server_test.cc b/test/client_server_test.cc index cb1aba389..074ca0c9e 100644 --- a/test/client_server_test.cc +++ b/test/client_server_test.cc @@ -70,7 +70,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_rgb) p += image->stride()[0]; } - shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true)); + shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_BGRA, dcp::Size (100, 200), true)); p = sub_image->data()[0]; for (int y = 0; y < 200; ++y) { uint8_t* q = p; @@ -153,7 +153,7 @@ BOOST_AUTO_TEST_CASE (client_server_test_yuv) } } - shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_RGBA, dcp::Size (100, 200), true)); + shared_ptr<Image> sub_image (new Image (AV_PIX_FMT_BGRA, dcp::Size (100, 200), true)); uint8_t* p = sub_image->data()[0]; for (int y = 0; y < 200; ++y) { uint8_t* q = p; |