mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-26 19:51:11 +00:00
Code Issues 1 Projects Releases Wiki Activity

vah264enc: Do not touch the PTS of output frame

Browse source 
1. The PTS of all frames should not be changed.
2. Just update the DTS based on the PTS. For the frame which is not
   reordered, the DTS is equal to PTS. For frame which is reordered,
   the DTS is equal to previous DTS. For example:
   Input: F0[D0, P0] -- F1[D1, P1] -- F2[D2, P2] -- F3[D3, P3]
   Output: F0[I, D0, P0] -- F3[P, D0, P3] -- F1[B, D1, P1] -- F2[B, D2, P2]

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6703>
This commit is contained in:
He Junyan 2024-04-21 12:51:31 +08:00 committed by GStreamer Marge Bot
parent eec64e372b
commit 4d1a48c9e9
1 changed files with 26 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
subprojects/gst-plugins-bad/sys/va/gstvah264enc.c
View file

@ -255,6 +255,7 @@ struct _GstVaH264Enc
guint cpb_length_bits; guint cpb_length_bits;
} rc; } rc;
GstClockTime last_dts;
GstH264SPS sequence_hdr; GstH264SPS sequence_hdr;
}; };
@ -275,10 +276,8 @@ struct _GstVaH264EncFrame
* explicitly. */ * explicitly. */
gint unused_for_reference_pic_num; gint unused_for_reference_pic_num;
/* The total frame count we handled. */
guint total_frame_count;
gboolean last_frame; gboolean last_frame;
gboolean reorder;
}; };
/** /**
@ -380,8 +379,8 @@ gst_va_enc_frame_new (void)
frame->frame_num = 0; frame->frame_num = 0;
frame->unused_for_reference_pic_num = -1; frame->unused_for_reference_pic_num = -1;
frame->picture = NULL; frame->picture = NULL;
frame->total_frame_count = 0;
frame->last_frame = FALSE; frame->last_frame = FALSE;
frame->reorder = FALSE;
return frame; return frame;
} }
@ -1553,6 +1552,7 @@ gst_va_h264_enc_reset_state (GstVaBaseEnc * base)
self->rc.target_bitrate_bits = 0; self->rc.target_bitrate_bits = 0;
self->rc.cpb_length_bits = 0; self->rc.cpb_length_bits = 0;
self->last_dts = GST_CLOCK_TIME_NONE;
memset (&self->sequence_hdr, 0, sizeof (GstH264SPS)); memset (&self->sequence_hdr, 0, sizeof (GstH264SPS));
} }
@ -1883,6 +1883,9 @@ again:
/* it will unref at pop_frame */ /* it will unref at pop_frame */
f = g_queue_pop_nth (&base->reorder_list, index); f = g_queue_pop_nth (&base->reorder_list, index);
g_assert (f == b_frame); g_assert (f == b_frame);
if (index > 0)
_enc_frame (f)->reorder = TRUE;
} else { } else {
b_frame = NULL; b_frame = NULL;
} }
@ -1911,6 +1914,9 @@ _pop_one_frame (GstVaBaseEnc * base, GstVideoCodecFrame ** out_frame)
vaframe = _enc_frame (frame); vaframe = _enc_frame (frame);
if (vaframe->type != GST_H264_B_SLICE) { if (vaframe->type != GST_H264_B_SLICE) {
frame = g_queue_pop_tail (&base->reorder_list); frame = g_queue_pop_tail (&base->reorder_list);
if (!g_queue_is_empty (&base->reorder_list))
vaframe->reorder = TRUE;
goto get_one; goto get_one;
} }
@ -3079,14 +3085,22 @@ gst_va_h264_enc_prepare_output (GstVaBaseEnc * base,
frame_enc = _enc_frame (frame); frame_enc = _enc_frame (frame);
frame->pts = if (frame_enc->reorder) {
base->start_pts + base->frame_duration * frame_enc->total_frame_count; if (!GST_CLOCK_TIME_IS_VALID (self->last_dts)) {
/* The PTS should always be later than the DTS. */ GST_WARNING_OBJECT (base, "Reorder frame poc: %d, system frame "
frame->dts = base->start_pts + base->frame_duration * "number: %d without previous valid DTS.", frame_enc->poc,
((gint64) base->output_frame_count - frame->system_frame_number);
(gint64) self->gop.num_reorder_frames); frame->dts = frame->pts;
base->output_frame_count++; } else {
frame->duration = base->frame_duration; GST_LOG_OBJECT (base, "Set reorder frame poc: %d, system frame "
"number: %d with DTS: %" GST_TIME_FORMAT, frame_enc->poc,
frame->system_frame_number, GST_TIME_ARGS (self->last_dts));
frame->dts = self->last_dts;
}
} else {
frame->dts = frame->pts;
self->last_dts = frame->dts;
}
buf = gst_va_base_enc_create_output_buffer (base, buf = gst_va_base_enc_create_output_buffer (base,
frame_enc->picture, NULL, 0); frame_enc->picture, NULL, 0);
@ -3229,7 +3243,6 @@ gst_va_h264_enc_new_frame (GstVaBaseEnc * base, GstVideoCodecFrame * frame)
GstVaH264EncFrame *frame_in; GstVaH264EncFrame *frame_in;
frame_in = gst_va_enc_frame_new (); frame_in = gst_va_enc_frame_new ();
frame_in->total_frame_count = base->input_frame_count++;
gst_video_codec_frame_set_user_data (frame, frame_in, gst_va_enc_frame_free); gst_video_codec_frame_set_user_data (frame, frame_in, gst_va_enc_frame_free);
return TRUE; return TRUE;