From 26a5c1c6a939fba538d96254181f32218ac42b71 Mon Sep 17 00:00:00 2001 From: Plastkast user Date: Fri, 8 Oct 2021 19:51:20 +0200 Subject: [PATCH] Fix white balance with non-VAAPI decoding. --- futatabi/jpeg_frame_view.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/futatabi/jpeg_frame_view.cpp b/futatabi/jpeg_frame_view.cpp index ff4fcb8..af89432 100644 --- a/futatabi/jpeg_frame_view.cpp +++ b/futatabi/jpeg_frame_view.cpp @@ -112,6 +112,8 @@ shared_ptr decode_jpeg(const string &jpeg) } JPEGDestroyer destroy_dinfo(&dinfo); + jpeg_save_markers(&dinfo, JPEG_APP0 + 1, 0xFFFF); + if (!error_mgr.run([&dinfo, &jpeg] { jpeg_mem_src(&dinfo, reinterpret_cast(jpeg.data()), jpeg.size()); jpeg_read_header(&dinfo, true); @@ -119,8 +121,6 @@ shared_ptr decode_jpeg(const string &jpeg) return get_black_frame(); } - jpeg_save_markers(&dinfo, JPEG_APP0 + 1, 0xFFFF); - if (dinfo.num_components != 3) { fprintf(stderr, "Not a color JPEG. (%d components, Y=%dx%d, Cb=%dx%d, Cr=%dx%d)\n", dinfo.num_components, -- 2.39.2