From 0c81d1a1e75bd8b56afdaa225c7e0459cd6e8c6b Mon Sep 17 00:00:00 2001 From: He Junyan <junyan.he@intel.com> Date: Tue, 30 Apr 2024 11:20:54 +0800 Subject: [PATCH] vabaseenc: delete the useless frame counter fields They are used to calculate the PTS and DTS before, no usage now. Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6773> --- subprojects/gst-plugins-bad/sys/va/gstvaav1enc.c | 5 ----- subprojects/gst-plugins-bad/sys/va/gstvabaseenc.c | 3 --- subprojects/gst-plugins-bad/sys/va/gstvabaseenc.h | 3 --- subprojects/gst-plugins-bad/sys/va/gstvavp9enc.c | 6 ------ 4 files changed, 17 deletions(-) diff --git a/subprojects/gst-plugins-bad/sys/va/gstvaav1enc.c b/subprojects/gst-plugins-bad/sys/va/gstvaav1enc.c index 51c430e8dd..a34eba451f 100644 --- a/subprojects/gst-plugins-bad/sys/va/gstvaav1enc.c +++ b/subprojects/gst-plugins-bad/sys/va/gstvaav1enc.c @@ -170,8 +170,6 @@ struct _GstVaAV1EncFrame gint frame_num; guint32 flags; guint pyramid_level; - /* The total frame count we handled. */ - guint total_frame_count; gboolean bidir_ref; gint8 ref_frame_idx[GST_AV1_NUM_REF_FRAMES]; /* The index in reference list to update */ @@ -510,7 +508,6 @@ gst_va_av1_enc_frame_new (void) frame->temporal_id = 0; frame->spatial_id = 0; frame->picture = NULL; - frame->total_frame_count = 0; frame->pyramid_level = 0; frame->flags = 0; frame->bidir_ref = FALSE; @@ -537,7 +534,6 @@ gst_va_av1_enc_new_frame (GstVaBaseEnc * base, GstVideoCodecFrame * frame) GstVaAV1EncFrame *frame_in; frame_in = gst_va_av1_enc_frame_new (); - frame_in->total_frame_count = base->input_frame_count++; gst_video_codec_frame_set_user_data (frame, frame_in, gst_va_av1_enc_frame_free); @@ -4080,7 +4076,6 @@ gst_va_av1_enc_prepare_output (GstVaBaseEnc * base, } *complete = TRUE; - base->output_frame_count++; GST_BUFFER_FLAG_SET (buf, GST_BUFFER_FLAG_MARKER); if (frame_enc->frame_num == 0) { diff --git a/subprojects/gst-plugins-bad/sys/va/gstvabaseenc.c b/subprojects/gst-plugins-bad/sys/va/gstvabaseenc.c index dfa3cbfabc..74a4473aad 100644 --- a/subprojects/gst-plugins-bad/sys/va/gstvabaseenc.c +++ b/subprojects/gst-plugins-bad/sys/va/gstvabaseenc.c @@ -125,9 +125,6 @@ gst_va_base_enc_start (GstVideoEncoder * venc) gst_va_base_enc_reset_state (base); - base->input_frame_count = 0; - base->output_frame_count = 0; - base->input_state = NULL; return TRUE; diff --git a/subprojects/gst-plugins-bad/sys/va/gstvabaseenc.h b/subprojects/gst-plugins-bad/sys/va/gstvabaseenc.h index da4162a3f0..bf5dd52a6c 100644 --- a/subprojects/gst-plugins-bad/sys/va/gstvabaseenc.h +++ b/subprojects/gst-plugins-bad/sys/va/gstvabaseenc.h @@ -56,9 +56,6 @@ struct _GstVaBaseEnc GstClockTime start_pts; GstClockTime frame_duration; - /* Total frames we handled since reconfig. */ - guint input_frame_count; - guint output_frame_count; GQueue reorder_list; GQueue ref_list; diff --git a/subprojects/gst-plugins-bad/sys/va/gstvavp9enc.c b/subprojects/gst-plugins-bad/sys/va/gstvavp9enc.c index f65585c940..ab509d8e25 100644 --- a/subprojects/gst-plugins-bad/sys/va/gstvavp9enc.c +++ b/subprojects/gst-plugins-bad/sys/va/gstvavp9enc.c @@ -160,8 +160,6 @@ struct _GstVaVp9EncFrame gint frame_num; guint32 flags; guint pyramid_level; - /* The total frame count we handled. */ - guint total_frame_count; gboolean bidir_ref; gint8 ref_frame_idx[GST_VP9_REF_FRAME_MAX]; /* The index in reference list to update */ @@ -267,7 +265,6 @@ gst_va_vp9_enc_frame_new (void) frame->frame_num = -1; frame->type = FRAME_TYPE_INVALID; frame->picture = NULL; - frame->total_frame_count = 0; frame->pyramid_level = 0; frame->flags = 0; frame->bidir_ref = FALSE; @@ -294,7 +291,6 @@ gst_va_vp9_enc_new_frame (GstVaBaseEnc * base, GstVideoCodecFrame * frame) GstVaVp9EncFrame *frame_in; frame_in = gst_va_vp9_enc_frame_new (); - frame_in->total_frame_count = base->input_frame_count++; gst_video_codec_frame_set_user_data (frame, frame_in, gst_va_vp9_enc_frame_free); @@ -2739,8 +2735,6 @@ gst_va_vp9_enc_prepare_output (GstVaBaseEnc * base, gst_buffer_replace (&frame->output_buffer, buf); gst_clear_buffer (&buf); - base->output_frame_count++; - return TRUE; }