theoradec: Remove mis-leading and redundant uncropped_info
authorSebastian Dröge <sebastian@centricular.com>
Fri, 23 Feb 2024 11:17:42 +0000 (13:17 +0200)
committerGStreamer Marge Bot <gitlab-merge-bot@gstreamer-foundation.org>
Fri, 23 Feb 2024 15:03:35 +0000 (15:03 +0000)
It's actually the cropped info, and equivalent to the info that is
already stored as part of the output state.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6203>

subprojects/gst-plugins-base/ext/theora/gsttheoradec.c
subprojects/gst-plugins-base/ext/theora/gsttheoradec.h

index 66e6edd1ebe31acc1b949ee67f8de42b6aa7eba9..d6e1ee8ecb2e761ddb63f41e9651703ad25704c7 100644 (file)
@@ -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;
 
index e60813b29f9f666e685046781c4cfd4829ceb540..1eaaa9904e6b34d96e1324e813716b966a1e3019 100644 (file)
@@ -75,8 +75,6 @@ struct _GstTheoraDec
   gint telemetry_mbmode;
   gint telemetry_qi;
   gint telemetry_bits;
-
-  GstVideoInfo uncropped_info;
 };
 
 struct _GstTheoraDecClass