From e690b53d05248fc6b32d47aa7a85bdb788e5f28a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Fri, 23 Feb 2024 13:17:42 +0200 Subject: [PATCH] theoradec: Remove mis-leading and redundant uncropped_info It's actually the cropped info, and equivalent to the info that is already stored as part of the output state. Part-of: --- subprojects/gst-plugins-base/ext/theora/gsttheoradec.c | 4 +--- subprojects/gst-plugins-base/ext/theora/gsttheoradec.h | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/subprojects/gst-plugins-base/ext/theora/gsttheoradec.c b/subprojects/gst-plugins-base/ext/theora/gsttheoradec.c index 66e6edd1eb..d6e1ee8ecb 100644 --- a/subprojects/gst-plugins-base/ext/theora/gsttheoradec.c +++ b/subprojects/gst-plugins-base/ext/theora/gsttheoradec.c @@ -517,8 +517,6 @@ theora_handle_type_packet (GstTheoraDec * dec) break; } - dec->uncropped_info = state->info; - if (!gst_video_decoder_negotiate (GST_VIDEO_DECODER (dec))) goto not_negotiated; @@ -680,7 +678,7 @@ theora_handle_image (GstTheoraDec * dec, th_ycbcr_buffer buf, GST_CAT_TRACE_OBJECT (CAT_PERFORMANCE, dec, "doing unavoidable video frame copy"); - if (G_UNLIKELY (!gst_video_frame_map (&vframe, &dec->uncropped_info, + if (G_UNLIKELY (!gst_video_frame_map (&vframe, &dec->output_state->info, frame->output_buffer, GST_MAP_WRITE))) goto invalid_frame; diff --git a/subprojects/gst-plugins-base/ext/theora/gsttheoradec.h b/subprojects/gst-plugins-base/ext/theora/gsttheoradec.h index e60813b29f..1eaaa9904e 100644 --- a/subprojects/gst-plugins-base/ext/theora/gsttheoradec.h +++ b/subprojects/gst-plugins-base/ext/theora/gsttheoradec.h @@ -75,8 +75,6 @@ struct _GstTheoraDec gint telemetry_mbmode; gint telemetry_qi; gint telemetry_bits; - - GstVideoInfo uncropped_info; }; struct _GstTheoraDecClass