From 617cd45ddc9b0fed4e3b4bcb8a51b37fc8565ee8 Mon Sep 17 00:00:00 2001 From: Mark Thompson Date: Sat, 2 Apr 2016 16:48:53 +0100 Subject: [PATCH] vaapi_h264: Fix bit offset of slice data. Commit ca2f19b9cc37be509d85f05c8f902860475905f8 modified the meaning of H264SliceContext.gb: it is now initialised at the start of the NAL unit header, rather than at the start of the slice header. The VAAPI slice decoder uses the offset after parsing to determine the offset of the slice data in the bitstream, so with the changed meaning we no longer need to add the extra byte to account for the NAL unit header because it is now included directly. Signed-off-by: Derek Buitenhuis --- libavcodec/vaapi_h264.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c index b02473851e..7470a1603c 100644 --- a/libavcodec/vaapi_h264.c +++ b/libavcodec/vaapi_h264.c @@ -330,7 +330,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx, slice_param = (VASliceParameterBufferH264 *)ff_vaapi_alloc_slice(vactx, buffer, size); if (!slice_param) return -1; - slice_param->slice_data_bit_offset = get_bits_count(&sl->gb) + 8; /* bit buffer started beyond nal_unit_type */ + slice_param->slice_data_bit_offset = get_bits_count(&sl->gb); slice_param->first_mb_in_slice = (sl->mb_y >> FIELD_OR_MBAFF_PICTURE(h)) * h->mb_width + sl->mb_x; slice_param->slice_type = ff_h264_get_slice_type(sl); slice_param->direct_spatial_mv_pred_flag = sl->slice_type == AV_PICTURE_TYPE_B ? sl->direct_spatial_mv_pred : 0; -- 2.11.0