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

decoder: h264: fix output of second field when first field is not in DPB.

Browse source 
Fix decoding of interlaced streams where a first field (e.g. B-slice)
was immediately output and the current decoded field is to be paired
with that former frame, which is no longer in DPB.

https://bugzilla.gnome.org/show_bug.cgi?id=701340
This commit is contained in:
Gwenole Beauchesne 2014-06-30 16:09:17 +02:00
parent a208a80c29
commit f48b1e0cd6
1 changed files with 19 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
gst-libs/gst/vaapi/gstvaapidecoder_h264.c
View file

@ -689,11 +689,11 @@ dpb_output(
{
picture->output_needed = FALSE;
if (fs) {
if (--fs->output_needed > 0)
return TRUE;
picture = fs->buffers[0];
}
if (--fs->output_needed > 0)
return TRUE;
if (!GST_VAAPI_PICTURE_IS_COMPLETE(picture))
return TRUE;
return gst_vaapi_picture_output(GST_VAAPI_PICTURE_CAST(picture));
}
@ -929,6 +929,14 @@ dpb_add(GstVaapiDecoderH264 *decoder, GstVaapiPictureH264 *picture)
GST_VAAPI_PICTURE_H264(picture->base.parent_picture));
if (found_index >= 0)
return gst_vaapi_frame_store_add(priv->dpb[found_index], picture);
// ... also check the previous picture that was immediately output
fs = priv->prev_frames[picture->base.voc];
if (fs && &fs->buffers[0]->base == picture->base.parent_picture) {
if (!gst_vaapi_frame_store_add(fs, picture))
return FALSE;
return dpb_output(decoder, fs, picture);
}
}
// Create new frame store, and split fields if necessary
@ -938,6 +946,11 @@ dpb_add(GstVaapiDecoderH264 *decoder, GstVaapiPictureH264 *picture)
gst_vaapi_frame_store_replace(&priv->prev_frames[picture->base.voc], fs);
gst_vaapi_frame_store_unref(fs);
if (picture->output_flag) {
picture->output_needed = TRUE;
fs->output_needed++;
}
if (!priv->progressive_sequence && gst_vaapi_frame_store_has_frame(fs)) {
if (!gst_vaapi_frame_store_split_fields(fs))
return FALSE;
@ -965,18 +978,13 @@ dpb_add(GstVaapiDecoderH264 *decoder, GstVaapiPictureH264 *picture)
if (!StoreInterViewOnlyRefFlag) {
if (dpb_find_lowest_poc(decoder, picture, &found_picture) < 0 ||
found_picture->base.poc > picture->base.poc)
return dpb_output(decoder, NULL, picture);
return dpb_output(decoder, fs, picture);
}
if (!dpb_bump(decoder, picture))
return FALSE;
}
}
gst_vaapi_frame_store_replace(&priv->dpb[priv->dpb_count++], fs);
if (picture->output_flag) {
picture->output_needed = TRUE;
fs->output_needed++;
}
return TRUE;
}