X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=futatabi%2Fjpeg_frame_view.cpp;h=eb0ed0925947b5a1571d6ba0ff46a00d1bc5385f;hb=04738b0cecf5f7b6d988822c1d7595fdd52a496e;hp=c1afafd765ca32f803c35c23b821c949bb807e91;hpb=e0cb348ca42ae7057f8f5acee92a23e7eb26075f;p=nageru

diff --git a/futatabi/jpeg_frame_view.cpp b/futatabi/jpeg_frame_view.cpp
index c1afafd..eb0ed09 100644
--- a/futatabi/jpeg_frame_view.cpp
+++ b/futatabi/jpeg_frame_view.cpp
@@ -109,6 +109,8 @@ shared_ptr<Frame> 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,
@@ -159,6 +161,14 @@ shared_ptr<Frame> decode_jpeg(const string &jpeg)
 	frame->pitch_y = luma_width_blocks * DCTSIZE;
 	frame->pitch_chroma = chroma_width_blocks * DCTSIZE;
 
+	if (dinfo.marker_list != nullptr &&
+	    dinfo.marker_list->marker == JPEG_APP0 + 1 &&
+	    dinfo.marker_list->data_length >= 4 &&
+	    memcmp(dinfo.marker_list->data, "Exif", 4) == 0) {
+		frame->exif_data.assign(reinterpret_cast<char *>(dinfo.marker_list->data),
+			dinfo.marker_list->data_length);
+	}
+
 	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 };
@@ -238,7 +248,7 @@ shared_ptr<Frame> decode_jpeg_with_cache(FrameOnDisk frame_spec, CacheMissBehavi
 	++metric_jpeg_cache_miss_frames;
 
 	*did_decode = true;
-	shared_ptr<Frame> frame = decode_jpeg(frame_reader->read_frame(frame_spec, /*read_audio=*/false).video);
+	shared_ptr<Frame> frame = decode_jpeg(frame_reader->read_frame(frame_spec, /*read_video=*/true, /*read_audio=*/false).video);
 
 	lock_guard<mutex> lock(cache_mu);
 	cache_bytes_used += frame_size(*frame);
@@ -415,6 +425,7 @@ void JPEGFrameView::paintGL()
 			overlay_input->set_width(overlay_width);
 			overlay_input->set_height(overlay_height);
 			overlay_input->set_pixel_data(overlay_image->bits());
+			overlay_input_needs_refresh = false;
 		}
 		glViewport(gl_width - overlay_width, 0, overlay_width, overlay_height);
 		overlay_chain->render_to_screen();
@@ -454,10 +465,25 @@ void JPEGFrameView::set_overlay(const string &text)
 		return;
 	}
 
+	// Figure out how large the texture needs to be.
+	{
+		QImage img(overlay_width, overlay_height, QImage::Format_Grayscale8);
+		QPainter painter(&img);
+		QFont font = painter.font();
+		font.setPointSize(12);
+		QFontMetrics metrics(font);
+		overlay_base_width = lrint(metrics.boundingRect(QString::fromStdString(text)).width() + 8.0);
+		overlay_base_height = lrint(metrics.height());
+	}
+
 	float dpr = QGuiApplication::primaryScreen()->devicePixelRatio();
 	overlay_width = lrint(overlay_base_width * dpr);
 	overlay_height = lrint(overlay_base_height * dpr);
 
+	// Work around OpenGL alignment issues.
+	while (overlay_width % 4 != 0) ++overlay_width;
+
+	// Now do the actual drawing.
 	overlay_image.reset(new QImage(overlay_width, overlay_height, QImage::Format_Grayscale8));
 	overlay_image->setDevicePixelRatio(dpr);
 	overlay_image->fill(0);