mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-06-07 07:58:51 +00:00
Code Issues 1 Projects Releases Wiki Activity

videoencoder: protect the use of num_subframes

Browse source 
change stream lock location to protect the use of
frame->abidata.ABI.num_subframes
This commit is contained in:
Stéphane Cerveau 2020-02-06 09:52:31 +01:00 committed by GStreamer Merge Bot
parent 8df947df5d
commit 19f27f94ee
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2486,6 +2486,8 @@ gst_video_encoder_finish_subframe (GstVideoEncoder * encoder,
g_return_val_if_fail (frame->output_buffer, GST_FLOW_ERROR); g_return_val_if_fail (frame->output_buffer, GST_FLOW_ERROR);
subframe_buffer = frame->output_buffer; subframe_buffer = frame->output_buffer;
GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
discont = (frame->presentation_frame_number == 0 discont = (frame->presentation_frame_number == 0
&& frame->abidata.ABI.num_subframes == 0); && frame->abidata.ABI.num_subframes == 0);
@ -2497,8 +2499,6 @@ gst_video_encoder_finish_subframe (GstVideoEncoder * encoder,
frame->presentation_frame_number, GST_TIME_ARGS (frame->pts), frame->presentation_frame_number, GST_TIME_ARGS (frame->pts),
GST_TIME_ARGS (frame->dts), GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT (frame)); GST_TIME_ARGS (frame->dts), GST_VIDEO_CODEC_FRAME_IS_SYNC_POINT (frame));
GST_VIDEO_ENCODER_STREAM_LOCK (encoder);
ret = gst_video_encoder_can_push_unlocked (encoder); ret = gst_video_encoder_can_push_unlocked (encoder);
if (ret != GST_FLOW_OK) if (ret != GST_FLOW_OK)
goto done; goto done;