mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-08 23:42:28 +00:00
Code Issues 1 Projects Releases Wiki Activity

codecs: h265decoder: Fix picture leaks because of reference set.

Browse source 
The last frame's reference set has no one to cleanup. We need to
clean all pictures in the stop() func.
We also add a helper function to cleanup all the pictures in the
reference picture set.

Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/merge_requests/1717>
This commit is contained in:
He Junyan 2020-10-23 22:29:57 +08:00 committed by GStreamer Merge Bot
parent 4d296a07e4
commit 002cddf131
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
gst-libs/gst/codecs/gsth265decoder.c
View file

@ -132,6 +132,7 @@ static GstFlowReturn gst_h265_decoder_handle_frame (GstVideoDecoder * decoder,
GstVideoCodecFrame * frame); GstVideoCodecFrame * frame);
static gboolean gst_h265_decoder_finish_current_picture (GstH265Decoder * self); static gboolean gst_h265_decoder_finish_current_picture (GstH265Decoder * self);
static void gst_h265_decoder_clear_ref_pic_sets (GstH265Decoder * self);
static void gst_h265_decoder_clear_dpb (GstH265Decoder * self); static void gst_h265_decoder_clear_dpb (GstH265Decoder * self);
static gboolean gst_h265_decoder_drain_internal (GstH265Decoder * self); static gboolean gst_h265_decoder_drain_internal (GstH265Decoder * self);
static gboolean gst_h265_decoder_start_current_picture (GstH265Decoder * self); static gboolean gst_h265_decoder_start_current_picture (GstH265Decoder * self);
@ -227,6 +228,8 @@ gst_h265_decoder_stop (GstVideoDecoder * decoder)
priv->dpb = NULL; priv->dpb = NULL;
} }
gst_h265_decoder_clear_ref_pic_sets (self);
return TRUE; return TRUE;
} }
@ -1055,13 +1058,9 @@ has_entry_in_rps (GstH265Picture * dpb_pic,
} }
static void static void
gst_h265_decoder_derive_and_mark_rps (GstH265Decoder * self, gst_h265_decoder_clear_ref_pic_sets (GstH265Decoder * self)
GstH265Picture * picture, gint32 * CurrDeltaPocMsbPresentFlag,
gint32 * FollDeltaPocMsbPresentFlag)
{ {
GstH265DecoderPrivate *priv = self->priv;
guint i; guint i;
GArray *dpb_array;
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
gst_h265_picture_replace (&self->RefPicSetLtCurr[i], NULL); gst_h265_picture_replace (&self->RefPicSetLtCurr[i], NULL);
@ -1070,6 +1069,18 @@ gst_h265_decoder_derive_and_mark_rps (GstH265Decoder * self,
gst_h265_picture_replace (&self->RefPicSetStCurrAfter[i], NULL); gst_h265_picture_replace (&self->RefPicSetStCurrAfter[i], NULL);
gst_h265_picture_replace (&self->RefPicSetStFoll[i], NULL); gst_h265_picture_replace (&self->RefPicSetStFoll[i], NULL);
} }
}
static void
gst_h265_decoder_derive_and_mark_rps (GstH265Decoder * self,
GstH265Picture * picture, gint32 * CurrDeltaPocMsbPresentFlag,
gint32 * FollDeltaPocMsbPresentFlag)
{
GstH265DecoderPrivate *priv = self->priv;
guint i;
GArray *dpb_array;
gst_h265_decoder_clear_ref_pic_sets (self);
/* (8-6) */ /* (8-6) */
for (i = 0; i < self->NumPocLtCurr; i++) { for (i = 0; i < self->NumPocLtCurr; i++) {