diff options
| author | Carl Hetherington <cth@carlh.net> | 2025-05-25 22:16:19 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2025-05-26 21:51:18 +0200 |
| commit | df9b4676aba8b941f124b174393988cad21677e1 (patch) | |
| tree | 21658068cf5b2a74e23339e013398b20b327f886 /src/lib/dcp_video.cc | |
| parent | e444fbd0d7c8a32e9f50adc19d0d49ae7c489a11 (diff) | |
Remove functors for choosing pixel format output from make_image().
Diffstat (limited to 'src/lib/dcp_video.cc')
| -rw-r--r-- | src/lib/dcp_video.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/dcp_video.cc b/src/lib/dcp_video.cc index 66c09daca..988a92ac5 100644 --- a/src/lib/dcp_video.cc +++ b/src/lib/dcp_video.cc @@ -102,7 +102,7 @@ DCPVideo::convert_to_xyz(shared_ptr<const PlayerVideo> frame) shared_ptr<dcp::OpenJPEGImage> xyz; if (frame->colour_conversion()) { - auto image = frame->image([](AVPixelFormat) { return AV_PIX_FMT_RGB48LE; }, VideoRange::FULL, false); + auto image = frame->image(AV_PIX_FMT_RGB48LE, VideoRange::FULL, false); xyz = dcp::rgb_to_xyz( image->data()[0], image->size(), @@ -110,7 +110,7 @@ DCPVideo::convert_to_xyz(shared_ptr<const PlayerVideo> frame) frame->colour_conversion().get() ); } else { - auto image = frame->image([](AVPixelFormat) { return AV_PIX_FMT_XYZ12LE; }, VideoRange::FULL, false); + auto image = frame->image(AV_PIX_FMT_XYZ12LE, VideoRange::FULL, false); xyz = make_shared<dcp::OpenJPEGImage>(image->data()[0], image->size(), image->stride()[0]); } @@ -120,7 +120,7 @@ DCPVideo::convert_to_xyz(shared_ptr<const PlayerVideo> frame) dcp::Size DCPVideo::get_size() const { - auto image = _frame->image([](AVPixelFormat) { return AV_PIX_FMT_RGB48LE; }, VideoRange::FULL, false); + auto image = _frame->image(AV_PIX_FMT_RGB48LE, VideoRange::FULL, false); return image->size(); } @@ -130,7 +130,7 @@ DCPVideo::convert_to_xyz(uint16_t* dst) const { DCPOMATIC_ASSERT(_frame->colour_conversion()); - auto image = _frame->image([](AVPixelFormat) { return AV_PIX_FMT_RGB48LE; }, VideoRange::FULL, false); + auto image = _frame->image(AV_PIX_FMT_RGB48LE, VideoRange::FULL, false); dcp::rgb_to_xyz( image->data()[0], dst, |