X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=futatabi%2Fjpeg_frame_view.cpp;h=059a3410586285ff230d6ebcc469846f428a4dc3;hb=332647953275fdf1691cded8bbe5d4a8dfe7c675;hp=9dc2ec25125ce3880a3db8eabb95bafd7cd1824c;hpb=eeda8995329601f9f4e35047358400833eeae68e;p=nageru
diff --git a/futatabi/jpeg_frame_view.cpp b/futatabi/jpeg_frame_view.cpp
index 9dc2ec2..059a341 100644
--- a/futatabi/jpeg_frame_view.cpp
+++ b/futatabi/jpeg_frame_view.cpp
@@ -1,7 +1,9 @@
#include "jpeg_frame_view.h"
#include "defs.h"
+#include "flags.h"
#include "jpeg_destroyer.h"
+#include "jpeglib_error_wrapper.h"
#include "shared/post_to_main_thread.h"
#include "video_stream.h"
#include "ycbcr_converter.h"
@@ -96,13 +98,18 @@ shared_ptr decode_jpeg(const string &jpeg)
frame.reset(new Frame);
jpeg_decompress_struct dinfo;
- jpeg_error_mgr jerr;
- dinfo.err = jpeg_std_error(&jerr);
- jpeg_create_decompress(&dinfo);
+ JPEGWrapErrorManager error_mgr(&dinfo);
+ if (!error_mgr.run([&dinfo]{ jpeg_create_decompress(&dinfo); })) {
+ return get_black_frame();
+ }
JPEGDestroyer destroy_dinfo(&dinfo);
- jpeg_mem_src(&dinfo, reinterpret_cast(jpeg.data()), jpeg.size());
- jpeg_read_header(&dinfo, true);
+ if (!error_mgr.run([&dinfo, &jpeg]{
+ jpeg_mem_src(&dinfo, reinterpret_cast(jpeg.data()), jpeg.size());
+ jpeg_read_header(&dinfo, true);
+ })) {
+ return get_black_frame();
+ }
if (dinfo.num_components != 3) {
fprintf(stderr, "Not a color JPEG. (%d components, Y=%dx%d, Cb=%dx%d, Cr=%dx%d)\n",
@@ -110,7 +117,7 @@ shared_ptr decode_jpeg(const string &jpeg)
dinfo.comp_info[0].h_samp_factor, dinfo.comp_info[0].v_samp_factor,
dinfo.comp_info[1].h_samp_factor, dinfo.comp_info[1].v_samp_factor,
dinfo.comp_info[2].h_samp_factor, dinfo.comp_info[2].v_samp_factor);
- exit(1);
+ return get_black_frame();
}
if (dinfo.comp_info[0].h_samp_factor != dinfo.max_h_samp_factor ||
dinfo.comp_info[0].v_samp_factor != dinfo.max_v_samp_factor || // Y' must not be subsampled.
@@ -126,7 +133,11 @@ shared_ptr decode_jpeg(const string &jpeg)
}
dinfo.raw_data_out = true;
- jpeg_start_decompress(&dinfo);
+ if (!error_mgr.run([&dinfo]{
+ jpeg_start_decompress(&dinfo);
+ })) {
+ return get_black_frame();
+ }
frame->width = dinfo.output_width;
frame->height = dinfo.output_height;
@@ -150,21 +161,25 @@ shared_ptr decode_jpeg(const string &jpeg)
frame->pitch_y = luma_width_blocks * DCTSIZE;
frame->pitch_chroma = chroma_width_blocks * DCTSIZE;
- JSAMPROW yptr[v_mcu_size], cbptr[v_mcu_size], crptr[v_mcu_size];
- JSAMPARRAY data[3] = { yptr, cbptr, crptr };
- for (unsigned y = 0; y < mcu_height_blocks; ++y) {
- // NOTE: The last elements of cbptr/crptr will be unused for vertically subsampled chroma.
- for (unsigned yy = 0; yy < v_mcu_size; ++yy) {
- yptr[yy] = frame->y.get() + (y * DCTSIZE * dinfo.max_v_samp_factor + yy) * frame->pitch_y;
- cbptr[yy] = frame->cb.get() + (y * DCTSIZE * dinfo.comp_info[1].v_samp_factor + yy) * frame->pitch_chroma;
- crptr[yy] = frame->cr.get() + (y * DCTSIZE * dinfo.comp_info[1].v_samp_factor + yy) * frame->pitch_chroma;
+ if (!error_mgr.run([&dinfo, &frame, v_mcu_size, mcu_height_blocks] {
+ JSAMPROW yptr[v_mcu_size], cbptr[v_mcu_size], crptr[v_mcu_size];
+ JSAMPARRAY data[3] = { yptr, cbptr, crptr };
+ for (unsigned y = 0; y < mcu_height_blocks; ++y) {
+ // NOTE: The last elements of cbptr/crptr will be unused for vertically subsampled chroma.
+ for (unsigned yy = 0; yy < v_mcu_size; ++yy) {
+ yptr[yy] = frame->y.get() + (y * DCTSIZE * dinfo.max_v_samp_factor + yy) * frame->pitch_y;
+ cbptr[yy] = frame->cb.get() + (y * DCTSIZE * dinfo.comp_info[1].v_samp_factor + yy) * frame->pitch_chroma;
+ crptr[yy] = frame->cr.get() + (y * DCTSIZE * dinfo.comp_info[1].v_samp_factor + yy) * frame->pitch_chroma;
+ }
+
+ jpeg_read_raw_data(&dinfo, data, v_mcu_size);
}
- jpeg_read_raw_data(&dinfo, data, v_mcu_size);
+ (void)jpeg_finish_decompress(&dinfo);
+ })) {
+ return get_black_frame();
}
- (void)jpeg_finish_decompress(&dinfo);
-
return frame;
}
@@ -453,3 +468,22 @@ void JPEGFrameView::set_overlay(const string &text)
// Don't refresh immediately; we might not have an OpenGL context here.
overlay_input_needs_refresh = true;
}
+
+shared_ptr get_black_frame()
+{
+ static shared_ptr black_frame;
+ static once_flag flag;
+ call_once(flag, [] {
+ black_frame.reset(new Frame);
+ black_frame->y.reset(new uint8_t[global_flags.width * global_flags.height]);
+ black_frame->cb.reset(new uint8_t[(global_flags.width / 2) * (global_flags.height / 2)]);
+ black_frame->cr.reset(new uint8_t[(global_flags.width / 2) * (global_flags.height / 2)]);
+ black_frame->width = global_flags.width;
+ black_frame->height = global_flags.height;
+ black_frame->chroma_subsampling_x = 2;
+ black_frame->chroma_subsampling_y = 2;
+ black_frame->pitch_y = global_flags.width;
+ black_frame->pitch_chroma = global_flags.width / 2;
+ });
+ return black_frame;
+}