diff options
author | Gwenole Beauchesne <gwenole.beauchesne@intel.com> | 2012-03-15 14:41:47 +0100 |
---|---|---|
committer | Xiang, Haihao <haihao.xiang@intel.com> | 2012-03-29 16:24:48 +0800 |
commit | 50b38778e0e7e9b27e5679b17b63c1c30ec2e919 (patch) | |
tree | 5e4adf4d68a030a3f027adf70f597df962b9abbb /src/i965_decoder_utils.c | |
parent | 1881e8a067db677bb0ad5adaa5adc59644ac5195 (diff) |
mpeg2: fix construction of reference frames list (SNB, IVB).
Fix construction of reference frames list for interlaced streams.
In this case, the array is indexed by frame store ID >> 1 where
bit 0 of frame store ID represents top (0) or bottom (1) field.
Besides, current render target can also be used as a reference
while decoding the second field.
Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne@intel.com>
(cherry picked from commit 14f70559b516030d141cce09db54cf49d11df9b2)
Diffstat (limited to 'src/i965_decoder_utils.c')
-rw-r--r-- | src/i965_decoder_utils.c | 86 |
1 files changed, 86 insertions, 0 deletions
diff --git a/src/i965_decoder_utils.c b/src/i965_decoder_utils.c index 9e1d9a8..b126a47 100644 --- a/src/i965_decoder_utils.c +++ b/src/i965_decoder_utils.c @@ -29,6 +29,27 @@ #include "i965_drv_video.h" #include "i965_defines.h" +/* Set reference surface if backing store exists */ +static inline int +set_ref_frame( + struct i965_driver_data *i965, + GenFrameStore *ref_frame, + VASurfaceID va_surface +) +{ + struct object_surface *obj_surface; + + if (va_surface == VA_INVALID_ID) + return 0; + + obj_surface = SURFACE(va_surface); + if (!obj_surface || !obj_surface->bo) + return 0; + + ref_frame->surface_id = va_surface; + return 1; +} + /* Check wether codec layer incorrectly fills in slice_vertical_position */ int mpeg2_wa_slice_vertical_position( @@ -69,6 +90,71 @@ mpeg2_wa_slice_vertical_position( return 0; } +/* Build MPEG-2 reference frames array */ +void +mpeg2_set_reference_surfaces( + VADriverContextP ctx, + GenFrameStore ref_frames[MAX_GEN_REFERENCE_FRAMES], + struct decode_state *decode_state, + VAPictureParameterBufferMPEG2 *pic_param +) +{ + struct i965_driver_data * const i965 = i965_driver_data(ctx); + VASurfaceID va_surface; + unsigned pic_structure, is_second_field, n = 0; + + pic_structure = pic_param->picture_coding_extension.bits.picture_structure; + is_second_field = pic_structure != MPEG_FRAME && + !pic_param->picture_coding_extension.bits.is_first_field; + + /* Reference frames are indexed by frame store ID (0:top, 1:bottom) */ + switch (pic_param->picture_coding_type) { + case MPEG_P_PICTURE: + if (is_second_field && pic_structure == MPEG_BOTTOM_FIELD) { + va_surface = decode_state->current_render_target; + n += set_ref_frame(i965, &ref_frames[n], va_surface); + } + va_surface = pic_param->forward_reference_picture; + n += set_ref_frame(i965, &ref_frames[n], va_surface); + break; + + case MPEG_B_PICTURE: + va_surface = pic_param->forward_reference_picture; + n += set_ref_frame(i965, &ref_frames[n], va_surface); + va_surface = pic_param->backward_reference_picture; + n += set_ref_frame(i965, &ref_frames[n], va_surface); + break; + } + + while (n != 2) + ref_frames[n++].surface_id = VA_INVALID_ID; + + if (pic_param->picture_coding_extension.bits.progressive_frame) + return; + + /* Bottom field pictures used as reference */ + switch (pic_param->picture_coding_type) { + case MPEG_P_PICTURE: + if (is_second_field && pic_structure == MPEG_TOP_FIELD) { + va_surface = decode_state->current_render_target; + n += set_ref_frame(i965, &ref_frames[n], va_surface); + } + va_surface = pic_param->forward_reference_picture; + n += set_ref_frame(i965, &ref_frames[n], va_surface); + break; + + case MPEG_B_PICTURE: + va_surface = pic_param->forward_reference_picture; + n += set_ref_frame(i965, &ref_frames[n], va_surface); + va_surface = pic_param->backward_reference_picture; + n += set_ref_frame(i965, &ref_frames[n], va_surface); + break; + } + + while (n != 4) + ref_frames[n++].surface_id = VA_INVALID_ID; +} + /* Generate flat scaling matrices for H.264 decoding */ void avc_gen_default_iq_matrix(VAIQMatrixBufferH264 *iq_matrix) |