mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 20:21:24 +00:00
Code Issues 1 Projects Releases Wiki Activity

h264: fix VAPictureParameterBufferH264.ReferenceFrames[] construction.

Browse source 
... for interlaced streams. The short_ref[] and long_ref[] arrays may
contain up to 32 fields but VA ReferenceFrames[] array expects up to
16 reference frames, thus including both fields.
This commit is contained in:
Gwenole Beauchesne 2012-11-14 14:25:34 +01:00
parent f196605fc8
commit 1fc397affd
1 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2458,8 +2458,12 @@ vaapi_init_picture(VAPictureH264 *pic)
} }
static void static void
vaapi_fill_picture(VAPictureH264 *pic, GstVaapiPictureH264 *picture) vaapi_fill_picture(VAPictureH264 *pic, GstVaapiPictureH264 *picture,
guint picture_structure)
{ {
if (!picture_structure)
picture_structure = picture->structure;
pic->picture_id = picture->base.surface_id; pic->picture_id = picture->base.surface_id;
pic->flags = 0; pic->flags = 0;
@ -2473,7 +2477,7 @@ vaapi_fill_picture(VAPictureH264 *pic, GstVaapiPictureH264 *picture)
pic->frame_idx = picture->frame_num; pic->frame_idx = picture->frame_num;
} }
switch (picture->structure) { switch (picture_structure) {
case GST_VAAPI_PICTURE_STRUCTURE_FRAME: case GST_VAAPI_PICTURE_STRUCTURE_FRAME:
pic->TopFieldOrderCnt = picture->field_poc[TOP_FIELD]; pic->TopFieldOrderCnt = picture->field_poc[TOP_FIELD];
pic->BottomFieldOrderCnt = picture->field_poc[BOTTOM_FIELD]; pic->BottomFieldOrderCnt = picture->field_poc[BOTTOM_FIELD];
@ -2507,11 +2511,14 @@ fill_picture(
guint i, n; guint i, n;
/* Fill in VAPictureParameterBufferH264 */ /* Fill in VAPictureParameterBufferH264 */
vaapi_fill_picture(&pic_param->CurrPic, picture); vaapi_fill_picture(&pic_param->CurrPic, picture, 0);
for (i = 0, n = 0; i < priv->short_ref_count; i++, n++)
vaapi_fill_picture(&pic_param->ReferenceFrames[n], priv->short_ref[i]); for (i = 0, n = 0; i < priv->dpb_count; i++) {
for (i = 0; i < priv->long_ref_count; i++, n++) GstVaapiFrameStore * const fs = priv->dpb[i];
vaapi_fill_picture(&pic_param->ReferenceFrames[n], priv->long_ref[i]); if (gst_vaapi_frame_store_has_reference(fs))
vaapi_fill_picture(&pic_param->ReferenceFrames[n++],
fs->buffers[0], fs->structure);
}
for (; n < G_N_ELEMENTS(pic_param->ReferenceFrames); n++) for (; n < G_N_ELEMENTS(pic_param->ReferenceFrames); n++)
vaapi_init_picture(&pic_param->ReferenceFrames[n]); vaapi_init_picture(&pic_param->ReferenceFrames[n]);
@ -2793,7 +2800,7 @@ fill_RefPicList(GstVaapiDecoderH264 *decoder, GstVaapiSliceH264 *slice)
slice_hdr->num_ref_idx_l0_active_minus1; slice_hdr->num_ref_idx_l0_active_minus1;
for (i = 0; i < priv->RefPicList0_count && priv->RefPicList0[i]; i++) for (i = 0; i < priv->RefPicList0_count && priv->RefPicList0[i]; i++)
vaapi_fill_picture(&slice_param->RefPicList0[i], priv->RefPicList0[i]); vaapi_fill_picture(&slice_param->RefPicList0[i], priv->RefPicList0[i], 0);
for (; i <= slice_param->num_ref_idx_l0_active_minus1; i++) for (; i <= slice_param->num_ref_idx_l0_active_minus1; i++)
vaapi_init_picture(&slice_param->RefPicList0[i]); vaapi_init_picture(&slice_param->RefPicList0[i]);
@ -2804,7 +2811,7 @@ fill_RefPicList(GstVaapiDecoderH264 *decoder, GstVaapiSliceH264 *slice)
slice_hdr->num_ref_idx_l1_active_minus1; slice_hdr->num_ref_idx_l1_active_minus1;
for (i = 0; i < priv->RefPicList1_count && priv->RefPicList1[i]; i++) for (i = 0; i < priv->RefPicList1_count && priv->RefPicList1[i]; i++)
vaapi_fill_picture(&slice_param->RefPicList1[i], priv->RefPicList1[i]); vaapi_fill_picture(&slice_param->RefPicList1[i], priv->RefPicList1[i], 0);
for (; i <= slice_param->num_ref_idx_l1_active_minus1; i++) for (; i <= slice_param->num_ref_idx_l1_active_minus1; i++)
vaapi_init_picture(&slice_param->RefPicList1[i]); vaapi_init_picture(&slice_param->RefPicList1[i]);
return TRUE; return TRUE;