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

vah264enc: Remove preferred_output_delay.

Browse source 
In the current state of the encoder it's just dead code.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/1845>
This commit is contained in:
Víctor Manuel Jáquez Leal 2022-03-03 13:57:35 +01:00 committed by GStreamer Marge Bot
parent 1a19a835a9
commit 81c00664a2
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -210,7 +210,6 @@ struct _GstVaH264Enc
GQueue ref_list; GQueue ref_list;
GQueue output_list; GQueue output_list;
guint preferred_output_delay;
/* H264 fields */ /* H264 fields */
gint mb_width; gint mb_width;
@ -2958,9 +2957,6 @@ gst_va_h264_enc_start (GstVideoEncoder * encoder)
{ {
GstVaH264Enc *self = GST_VA_H264_ENC (encoder); GstVaH264Enc *self = GST_VA_H264_ENC (encoder);
/* TODO: how to poll and wait for the encoded buffer. */
self->preferred_output_delay = 0;
/* Set the minimum pts to some huge value (1000 hours). This keeps /* Set the minimum pts to some huge value (1000 hours). This keeps
* the dts at the start of the stream from needing to be * the dts at the start of the stream from needing to be
* negative. */ * negative. */
@ -3490,8 +3486,7 @@ gst_va_h264_enc_handle_frame (GstVideoEncoder * venc,
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
goto error_encode; goto error_encode;
while (g_queue_get_length (&self->output_list) > while (g_queue_get_length (&self->output_list) > 0) {
self->preferred_output_delay) {
frame_out = g_queue_pop_head (&self->output_list); frame_out = g_queue_pop_head (&self->output_list);
ret = _push_buffer_to_downstream (self, frame_out); ret = _push_buffer_to_downstream (self, frame_out);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
@ -3676,16 +3671,15 @@ gst_va_h264_enc_propose_allocation (GstVideoEncoder * venc, GstQuery * query)
if (!(allocator = _allocator_from_caps (self, caps))) if (!(allocator = _allocator_from_caps (self, caps)))
return FALSE; return FALSE;
pool = gst_va_pool_new_with_config (caps, pool = gst_va_pool_new_with_config (caps, size, 1, 0, usage_hint, allocator,
size, self->preferred_output_delay, 0, usage_hint, allocator, &params); &params);
if (!pool) { if (!pool) {
gst_object_unref (allocator); gst_object_unref (allocator);
goto config_failed; goto config_failed;
} }
gst_query_add_allocation_param (query, allocator, &params); gst_query_add_allocation_param (query, allocator, &params);
gst_query_add_allocation_pool (query, pool, size, gst_query_add_allocation_pool (query, pool, size, 0, 0);
self->preferred_output_delay, 0);
GST_DEBUG_OBJECT (self, GST_DEBUG_OBJECT (self,
"proposing %" GST_PTR_FORMAT " with allocator %" GST_PTR_FORMAT, "proposing %" GST_PTR_FORMAT " with allocator %" GST_PTR_FORMAT,
@ -3766,8 +3760,7 @@ gst_va_h264_enc_set_format (GstVideoEncoder * venc, GstVideoCodecState * state)
return FALSE; return FALSE;
} }
reconstruct_buffer_num = self->gop.num_ref_frames reconstruct_buffer_num = self->gop.num_ref_frames + 3 /* scratch frames */ ;
+ self->preferred_output_delay + 3 /* scratch frames */ ;
if (!gst_va_encoder_open (self->encoder, self->profile, self->entrypoint, if (!gst_va_encoder_open (self->encoder, self->profile, self->entrypoint,
GST_VIDEO_INFO_FORMAT (&self->in_info), self->rt_format, GST_VIDEO_INFO_FORMAT (&self->in_info), self->rt_format,
self->mb_width * 16, self->mb_height * 16, self->codedbuf_size, self->mb_width * 16, self->mb_height * 16, self->codedbuf_size,