mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-21 13:36:39 +00:00
Code Issues 1 Projects Releases Wiki Activity

decoder: properly reference count pictures.

Browse source 
This fixes cases where a GstVaapiPicture would be destroyed whereas
there is still a valid instance of it in either prev, current or
next picture.
This commit is contained in:
Gwenole Beauchesne 2012-01-26 15:19:14 +01:00
parent 7b19745141
commit 2897618b85
3 changed files with 15 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
gst-libs/gst/vaapi/gstvaapidecoder_mpeg2.c
View file

@ -274,9 +274,8 @@ decode_current_picture(GstVaapiDecoderMpeg2 *decoder)
if ((priv->prev_picture && priv->next_picture) || if ((priv->prev_picture && priv->next_picture) ||
(priv->closed_gop && priv->next_picture)) (priv->closed_gop && priv->next_picture))
status = render_picture(decoder, picture); status = render_picture(decoder, picture);
gst_vaapi_picture_unref(picture);
} }
priv->current_picture = NULL; gst_vaapi_picture_replace(&priv->current_picture, NULL);
} }
return status; return status;
} }
@ -494,16 +493,10 @@ decode_picture(GstVaapiDecoderMpeg2 *decoder, guchar *buf, guint buf_size)
/* Update reference pictures */ /* Update reference pictures */
if (pic_hdr->pic_type != GST_MPEG_VIDEO_PICTURE_TYPE_B) { if (pic_hdr->pic_type != GST_MPEG_VIDEO_PICTURE_TYPE_B) {
GST_VAAPI_PICTURE_FLAG_SET(picture, GST_VAAPI_PICTURE_FLAG_REFERENCE); GST_VAAPI_PICTURE_FLAG_SET(picture, GST_VAAPI_PICTURE_FLAG_REFERENCE);
if (priv->prev_picture) { if (priv->next_picture)
gst_vaapi_picture_unref(priv->prev_picture); status = render_picture(decoder, priv->next_picture);
priv->prev_picture = NULL; gst_vaapi_picture_replace(&priv->prev_picture, priv->next_picture);
} gst_vaapi_picture_replace(&priv->next_picture, picture);
if (priv->next_picture) {
priv->prev_picture = priv->next_picture;
priv->next_picture = NULL;
status = render_picture(decoder, priv->prev_picture);
}
priv->next_picture = picture;
} }
return status; return status;
} }

17
gst-libs/gst/vaapi/gstvaapidecoder_mpeg4.c
View file

@ -273,9 +273,8 @@ decode_current_picture(GstVaapiDecoderMpeg4 *decoder)
if ((priv->prev_picture && priv->next_picture) || if ((priv->prev_picture && priv->next_picture) ||
(priv->closed_gop && priv->next_picture)) (priv->closed_gop && priv->next_picture))
status = render_picture(decoder, picture); status = render_picture(decoder, picture);
gst_vaapi_picture_unref(picture);
} }
priv->curr_picture = NULL; gst_vaapi_picture_replace(&priv->curr_picture, NULL);
} }
return status; return status;
} }
@ -569,16 +568,10 @@ decode_picture(GstVaapiDecoderMpeg4 *decoder, const guint8 *buf, guint buf_size)
/* Update reference pictures */ /* Update reference pictures */
/* XXX: consider priv->vol_hdr.low_delay, consider packed video frames for DivX/XviD */ /* XXX: consider priv->vol_hdr.low_delay, consider packed video frames for DivX/XviD */
if (GST_VAAPI_PICTURE_IS_REFERENCE(picture)) { if (GST_VAAPI_PICTURE_IS_REFERENCE(picture)) {
if (priv->prev_picture) { if (priv->next_picture)
gst_vaapi_picture_unref(priv->prev_picture); status = render_picture(decoder, priv->next_picture);
priv->prev_picture = NULL; gst_vaapi_picture_replace(&priv->prev_picture, priv->next_picture);
} gst_vaapi_picture_replace(&priv->next_picture, picture);
if (priv->next_picture) {
priv->prev_picture = priv->next_picture;
priv->next_picture = NULL;
status = render_picture(decoder, priv->prev_picture);
}
priv->next_picture = picture;
} }
return status; return status;
} }

17
gst-libs/gst/vaapi/gstvaapidecoder_vc1.c
View file

@ -227,9 +227,8 @@ decode_current_picture(GstVaapiDecoderVC1 *decoder)
if (!GST_VAAPI_PICTURE_IS_REFERENCE(picture)) { if (!GST_VAAPI_PICTURE_IS_REFERENCE(picture)) {
if (priv->prev_picture && priv->next_picture) if (priv->prev_picture && priv->next_picture)
status = render_picture(decoder, picture); status = render_picture(decoder, picture);
gst_vaapi_picture_unref(picture);
} }
priv->current_picture = NULL; gst_vaapi_picture_replace(&priv->current_picture, NULL);
} }
return status; return status;
} }
@ -957,16 +956,10 @@ decode_frame(GstVaapiDecoderVC1 *decoder, GstVC1BDU *rbdu, GstVC1BDU *ebdu)
/* Update reference pictures */ /* Update reference pictures */
if (GST_VAAPI_PICTURE_IS_REFERENCE(picture)) { if (GST_VAAPI_PICTURE_IS_REFERENCE(picture)) {
if (priv->prev_picture) { if (priv->next_picture)
gst_vaapi_picture_unref(priv->prev_picture); status = render_picture(decoder, priv->next_picture);
priv->prev_picture = NULL; gst_vaapi_picture_replace(&priv->prev_picture, priv->next_picture);
} gst_vaapi_picture_replace(&priv->next_picture, picture);
if (priv->next_picture) {
priv->prev_picture = priv->next_picture;
priv->next_picture = NULL;
status = render_picture(decoder, priv->prev_picture);
}
priv->next_picture = picture;
} }
if (!fill_picture(decoder, picture)) if (!fill_picture(decoder, picture))