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

videodecoder: Only use subframes internal values in subframe mode

Browse source 
This clarifies the usage of it, and fixes issues with reverse playback.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/4694>
This commit is contained in:
Edward Hervey 2023-05-10 08:42:15 +02:00 committed by GStreamer Marge Bot
parent 7a4916b251
commit 75d6621c2a
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
subprojects/gst-plugins-base/gst-libs/gst/video/gstvideodecoder.c
View file

@ -2441,8 +2441,8 @@ gst_video_decoder_chain_forward (GstVideoDecoder * decoder,
frame = priv->current_frame; frame = priv->current_frame;
frame->abidata.ABI.num_subframes++;
if (gst_video_decoder_get_subframe_mode (decoder)) { if (gst_video_decoder_get_subframe_mode (decoder)) {
frame->abidata.ABI.num_subframes++;
/* End the frame if the marker flag is set */ /* End the frame if the marker flag is set */
if (!GST_BUFFER_FLAG_IS_SET (buf, GST_VIDEO_BUFFER_FLAG_MARKER) if (!GST_BUFFER_FLAG_IS_SET (buf, GST_VIDEO_BUFFER_FLAG_MARKER)
&& (decoder->input_segment.rate > 0.0)) && (decoder->input_segment.rate > 0.0))
@ -3859,15 +3859,17 @@ gst_video_decoder_have_frame (GstVideoDecoder * decoder)
priv->current_frame = NULL; priv->current_frame = NULL;
} else { } else {
GstVideoCodecFrame *frame = priv->current_frame; GstVideoCodecFrame *frame = priv->current_frame;
frame->abidata.ABI.num_subframes++;
/* In subframe mode, we keep a ref for ourselves /* In subframe mode, we keep a ref for ourselves
* as this frame will be kept during the data collection * as this frame will be kept during the data collection
* in parsed mode. The frame reference will be released by * in parsed mode. The frame reference will be released by
* finish_(sub)frame or drop_(sub)frame.*/ * finish_(sub)frame or drop_(sub)frame.*/
if (gst_video_decoder_get_subframe_mode (decoder)) if (gst_video_decoder_get_subframe_mode (decoder)) {
frame->abidata.ABI.num_subframes++;
gst_video_codec_frame_ref (priv->current_frame); gst_video_codec_frame_ref (priv->current_frame);
else } else {
priv->current_frame = NULL; priv->current_frame = NULL;
}
/* Decode the frame, which gives away our ref */ /* Decode the frame, which gives away our ref */
ret = gst_video_decoder_decode_frame (decoder, frame); ret = gst_video_decoder_decode_frame (decoder, frame);
@ -3955,7 +3957,8 @@ gst_video_decoder_decode_frame (GstVideoDecoder * decoder,
frame->distance_from_sync = priv->distance_from_sync; frame->distance_from_sync = priv->distance_from_sync;
if (frame->abidata.ABI.num_subframes == 1) { if (!gst_video_decoder_get_subframe_mode (decoder)
|| frame->abidata.ABI.num_subframes == 1) {
frame->abidata.ABI.ts = frame->dts; frame->abidata.ABI.ts = frame->dts;
frame->abidata.ABI.ts2 = frame->pts; frame->abidata.ABI.ts2 = frame->pts;
} }
@ -4992,7 +4995,9 @@ guint
gst_video_decoder_get_input_subframe_index (GstVideoDecoder * decoder, gst_video_decoder_get_input_subframe_index (GstVideoDecoder * decoder,
GstVideoCodecFrame * frame) GstVideoCodecFrame * frame)
{ {
if (gst_video_decoder_get_subframe_mode (decoder))
return frame->abidata.ABI.num_subframes; return frame->abidata.ABI.num_subframes;
return 1;
} }
/** /**