mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-24 09:10:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoencoder: Also don't request a new key-unit if we already got one after the requested running time

Browse source 
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-base/-/merge_requests/684>
This commit is contained in:
Sebastian Dröge 2020-06-04 15:19:18 +03:00 committed by GStreamer Merge Bot
parent 19fecabdf7
commit 76364ebfe7
2 changed files with 37 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
gst-libs/gst/video/gstvideoencoder.c
View file

@ -143,6 +143,7 @@ struct _GstVideoEncoderPrivate
GQueue force_key_unit; /* List of pending forced keyunits */ GQueue force_key_unit; /* List of pending forced keyunits */
GstClockTime min_force_key_unit_interval; GstClockTime min_force_key_unit_interval;
GstClockTime last_force_key_unit_request; GstClockTime last_force_key_unit_request;
GstClockTime last_key_unit;
guint32 system_frame_number; guint32 system_frame_number;
@ -463,6 +464,7 @@ gst_video_encoder_reset (GstVideoEncoder * encoder, gboolean hard)
g_queue_clear_full (&priv->force_key_unit, g_queue_clear_full (&priv->force_key_unit,
(GDestroyNotify) forced_key_unit_event_free); (GDestroyNotify) forced_key_unit_event_free);
priv->last_force_key_unit_request = GST_CLOCK_TIME_NONE; priv->last_force_key_unit_request = GST_CLOCK_TIME_NONE;
priv->last_key_unit = GST_CLOCK_TIME_NONE;
priv->drained = TRUE; priv->drained = TRUE;
@ -1565,8 +1567,7 @@ gst_video_encoder_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
if (priv->force_key_unit.head) { if (priv->force_key_unit.head) {
GList *l; GList *l;
GstClockTime running_time; GstClockTime running_time;
gboolean throttled = FALSE, have_fevt = FALSE, have_pending_none_fevt = gboolean throttled, have_fevt = FALSE, have_pending_none_fevt = FALSE;
FALSE;
GQueue matching_fevt = G_QUEUE_INIT; GQueue matching_fevt = G_QUEUE_INIT;
running_time = running_time =
@ -1575,9 +1576,12 @@ gst_video_encoder_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
throttled = (priv->min_force_key_unit_interval != 0 && throttled = (priv->min_force_key_unit_interval != 0 &&
priv->min_force_key_unit_interval != GST_CLOCK_TIME_NONE && priv->min_force_key_unit_interval != GST_CLOCK_TIME_NONE &&
priv->last_force_key_unit_request != GST_CLOCK_TIME_NONE && ((priv->last_force_key_unit_request != GST_CLOCK_TIME_NONE &&
priv->last_force_key_unit_request + priv->min_force_key_unit_interval > priv->last_force_key_unit_request +
running_time); priv->min_force_key_unit_interval > running_time)
|| (priv->last_key_unit != GST_CLOCK_TIME_NONE
&& priv->last_key_unit + priv->min_force_key_unit_interval >
running_time)));
for (l = priv->force_key_unit.head; l && (!throttled || !have_fevt); for (l = priv->force_key_unit.head; l && (!throttled || !have_fevt);
l = l->next) { l = l->next) {
@ -1611,10 +1615,20 @@ gst_video_encoder_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
} }
if (throttled && have_fevt) { if (throttled && have_fevt) {
GstClockTime last_time;
if (priv->last_force_key_unit_request != GST_CLOCK_TIME_NONE &&
priv->last_force_key_unit_request +
priv->min_force_key_unit_interval > running_time) {
last_time = priv->last_force_key_unit_request;
} else {
last_time = priv->last_key_unit;
}
GST_DEBUG_OBJECT (encoder, GST_DEBUG_OBJECT (encoder,
"Not requesting a new key unit yet due to throttling (%" "Not requesting a new key unit yet due to throttling (%"
GST_TIME_FORMAT " + %" GST_TIME_FORMAT " > %" GST_TIME_FORMAT, GST_TIME_FORMAT " + %" GST_TIME_FORMAT " > %" GST_TIME_FORMAT,
GST_TIME_ARGS (priv->last_force_key_unit_request), GST_TIME_ARGS (last_time),
GST_TIME_ARGS (priv->min_force_key_unit_interval), GST_TIME_ARGS (priv->min_force_key_unit_interval),
GST_TIME_ARGS (running_time)); GST_TIME_ARGS (running_time));
g_queue_clear (&matching_fevt); g_queue_clear (&matching_fevt);
@ -1632,7 +1646,10 @@ gst_video_encoder_chain (GstPad * pad, GstObject * parent, GstBuffer * buf)
&& have_pending_none_fevt) && have_pending_none_fevt)
|| (priv->last_force_key_unit_request != GST_CLOCK_TIME_NONE || (priv->last_force_key_unit_request != GST_CLOCK_TIME_NONE
&& fevt->running_time != GST_CLOCK_TIME_NONE && fevt->running_time != GST_CLOCK_TIME_NONE
&& fevt->running_time <= priv->last_force_key_unit_request)) { && fevt->running_time <= priv->last_force_key_unit_request) ||
(priv->last_key_unit != GST_CLOCK_TIME_NONE
&& fevt->running_time != GST_CLOCK_TIME_NONE
&& fevt->running_time <= priv->last_key_unit)) {
GST_DEBUG_OBJECT (encoder, GST_DEBUG_OBJECT (encoder,
"Not requesting another key unit at running time %" "Not requesting another key unit at running time %"
GST_TIME_FORMAT, GST_TIME_ARGS (fevt->running_time)); GST_TIME_FORMAT, GST_TIME_ARGS (fevt->running_time));
@ -2511,6 +2528,9 @@ gst_video_encoder_finish_frame (GstVideoEncoder * encoder,
if (!GST_CLOCK_TIME_IS_VALID (frame->dts)) { if (!GST_CLOCK_TIME_IS_VALID (frame->dts)) {
frame->dts = frame->pts; frame->dts = frame->pts;
} }
priv->last_key_unit =
gst_segment_to_running_time (&encoder->output_segment, GST_FORMAT_TIME,
frame->pts);
} }
gst_video_encoder_infer_dts_unlocked (encoder, frame); gst_video_encoder_infer_dts_unlocked (encoder, frame);
@ -2657,6 +2677,9 @@ gst_video_encoder_finish_subframe (GstVideoEncoder * encoder,
if (!GST_CLOCK_TIME_IS_VALID (frame->dts)) { if (!GST_CLOCK_TIME_IS_VALID (frame->dts)) {
frame->dts = frame->pts; frame->dts = frame->pts;
} }
priv->last_key_unit =
gst_segment_to_running_time (&encoder->output_segment, GST_FORMAT_TIME,
frame->pts);
} }
gst_video_encoder_infer_dts_unlocked (encoder, frame); gst_video_encoder_infer_dts_unlocked (encoder, frame);

7
tests/check/libs/videoencoder.c
View file

@ -1065,6 +1065,13 @@ GST_START_TEST (videoencoder_force_keyunit_handling)
fail_unless_equals_int (g_list_length (buffers), 13); fail_unless_equals_int (g_list_length (buffers), 13);
/* we already received a keyframe after the given time, so the next frame
* is not going to be another keyframe */
fail_unless (gst_pad_push_event (mysinkpad,
gst_video_event_new_upstream_force_key_unit
(gst_util_uint64_scale_round (12, GST_SECOND * TEST_VIDEO_FPS_D,
TEST_VIDEO_FPS_N), TRUE, 1)));
buffer = create_test_buffer (13); buffer = create_test_buffer (13);
fail_unless (gst_pad_push (mysrcpad, buffer) == GST_FLOW_OK); fail_unless (gst_pad_push (mysrcpad, buffer) == GST_FLOW_OK);
buffer = NULL; buffer = NULL;