X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fffmpeg_capture.cpp;h=79fba7b9ab4ebf4135e8e9f34c145e78a676e7b4;hb=685a74b4a2e928670eb5fb53919bbcffca45c8e3;hp=96449214a59c8db7d9955918785276133e7e7838;hpb=491a3e4a19271fba3547eead3e062c2a35371a26;p=nageru

diff --git a/nageru/ffmpeg_capture.cpp b/nageru/ffmpeg_capture.cpp
index 9644921..79fba7b 100644
--- a/nageru/ffmpeg_capture.cpp
+++ b/nageru/ffmpeg_capture.cpp
@@ -123,8 +123,8 @@ AVPixelFormat decide_dst_format(AVPixelFormat src_format, bmusb::PixelFormat dst
 		if (desc->comp[0].depth != 8) continue;
 
 		// Same or better chroma resolution only.
-		int chroma_w_diff = desc->log2_chroma_w - src_desc->log2_chroma_w;
-		int chroma_h_diff = desc->log2_chroma_h - src_desc->log2_chroma_h;
+		int chroma_w_diff = src_desc->log2_chroma_w - desc->log2_chroma_w;
+		int chroma_h_diff = src_desc->log2_chroma_h - desc->log2_chroma_h;
 		if (chroma_w_diff < 0 || chroma_h_diff < 0)
 			continue;
 
@@ -657,7 +657,7 @@ bool FFmpegCapture::play_video(const string &pathname)
 			pathname, video_stream_index, audio_stream_index, subtitle_stream_index, audio_frame.get(), &audio_format, &audio_pts, &error);
 		if (error) {
 			if (++consecutive_errors >= 100) {
-				fprintf(stderr, "More than 100 consecutive video frames, aborting playback.\n");
+				fprintf(stderr, "More than 100 consecutive error video frames, aborting playback.\n");
 				return false;
 			} else {
 				continue;
@@ -1144,6 +1144,16 @@ UniqueFrame FFmpegCapture::make_video_frame(const AVFrame *frame, const string &
 
 		current_frame_ycbcr_format = decode_ycbcr_format(desc, frame, is_mjpeg, &last_colorspace, &last_chroma_location);
 	}
+
+	// FIXME: Currently, if the video is too high-res for one of the allocated
+	// frames, we simply refuse to scale it here to avoid crashes. It would be better
+	// if we could somehow signal getting larger frames, especially as 4K is a thing now.
+	if (video_frame->len > FRAME_SIZE) {
+		fprintf(stderr, "%s: Decoded frame would be larger than supported FRAME_SIZE (%zu > %u), not decoding.\n", pathname.c_str(), video_frame->len, FRAME_SIZE);
+		*error = true;
+		return video_frame;
+	}
+
 	sws_scale(sws_ctx.get(), frame->data, frame->linesize, 0, frame->height, pic_data, linesizes);
 
 	return video_frame;