diff options
Diffstat (limited to 'chromium/third_party/ffmpeg/libavcodec/dxva2_h264.c')
| -rw-r--r-- | chromium/third_party/ffmpeg/libavcodec/dxva2_h264.c | 47 |
1 files changed, 32 insertions, 15 deletions
diff --git a/chromium/third_party/ffmpeg/libavcodec/dxva2_h264.c b/chromium/third_party/ffmpeg/libavcodec/dxva2_h264.c index 10905026be6..1174188959c 100644 --- a/chromium/third_party/ffmpeg/libavcodec/dxva2_h264.c +++ b/chromium/third_party/ffmpeg/libavcodec/dxva2_h264.c @@ -23,6 +23,7 @@ #include "dxva2_internal.h" #include "h264.h" #include "h264data.h" +#include "mpegutils.h" struct dxva2_picture_context { DXVA_PicParams_H264 pp; @@ -44,19 +45,19 @@ static void fill_picture_entry(DXVA_PicEntry_H264 *pic, static void fill_picture_parameters(struct dxva_context *ctx, const H264Context *h, DXVA_PicParams_H264 *pp) { - const Picture *current_picture = h->cur_pic_ptr; + const H264Picture *current_picture = h->cur_pic_ptr; int i, j; memset(pp, 0, sizeof(*pp)); /* Configure current picture */ fill_picture_entry(&pp->CurrPic, - ff_dxva2_get_surface_index(ctx, current_picture), + ff_dxva2_get_surface_index(ctx, ¤t_picture->f), h->picture_structure == PICT_BOTTOM_FIELD); /* Configure the set of references */ pp->UsedForReferenceFlags = 0; pp->NonExistingFrameFlags = 0; for (i = 0, j = 0; i < FF_ARRAY_ELEMS(pp->RefFrameList); i++) { - const Picture *r; + const H264Picture *r; if (j < h->short_ref_count) { r = h->short_ref[j++]; } else { @@ -66,7 +67,7 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context } if (r) { fill_picture_entry(&pp->RefFrameList[i], - ff_dxva2_get_surface_index(ctx, r), + ff_dxva2_get_surface_index(ctx, &r->f), r->long_ref != 0); if ((r->reference & PICT_TOP_FIELD) && r->field_poc[0] != INT_MAX) @@ -115,6 +116,8 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context pp->bit_depth_chroma_minus8 = h->sps.bit_depth_chroma - 8; if (ctx->workaround & FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG) pp->Reserved16Bits = 0; + else if (ctx->workaround & FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO) + pp->Reserved16Bits = 0x34c; else pp->Reserved16Bits = 3; /* FIXME is there a way to detect the right mode ? */ pp->StatusReportFeedbackNumber = 1 + ctx->report_id++; @@ -194,8 +197,18 @@ static void fill_slice_short(DXVA_Slice_H264_Short *slice, slice->wBadSliceChopping = 0; } +static int get_refpic_index(const DXVA_PicParams_H264 *pp, int surface_index) +{ + int i; + for (i = 0; i < FF_ARRAY_ELEMS(pp->RefFrameList); i++) { + if ((pp->RefFrameList[i].bPicEntry & 0x7f) == surface_index) + return i; + } + return 0x7f; +} + static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, - unsigned position, unsigned size) + const DXVA_PicParams_H264 *pp, unsigned position, unsigned size) { const H264Context *h = avctx->priv_data; struct dxva_context *ctx = avctx->hwaccel_context; @@ -218,18 +231,22 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, slice->num_ref_idx_l0_active_minus1 = h->ref_count[0] - 1; if (h->list_count > 1) slice->num_ref_idx_l1_active_minus1 = h->ref_count[1] - 1; - slice->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2 - 26; - slice->slice_beta_offset_div2 = h->slice_beta_offset / 2 - 26; + slice->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2; + slice->slice_beta_offset_div2 = h->slice_beta_offset / 2; slice->Reserved8Bits = 0; for (list = 0; list < 2; list++) { unsigned i; for (i = 0; i < FF_ARRAY_ELEMS(slice->RefPicList[list]); i++) { if (list < h->list_count && i < h->ref_count[list]) { - const Picture *r = &h->ref_list[list][i]; + const H264Picture *r = &h->ref_list[list][i]; unsigned plane; - fill_picture_entry(&slice->RefPicList[list][i], - ff_dxva2_get_surface_index(ctx, r), + unsigned index; + if (ctx->workaround & FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO) + index = ff_dxva2_get_surface_index(ctx, &r->f); + else + index = get_refpic_index(pp, ff_dxva2_get_surface_index(ctx, &r->f)); + fill_picture_entry(&slice->RefPicList[list][i], index, r->reference == PICT_BOTTOM_FIELD); for (plane = 0; plane < 3; plane++) { int w, o; @@ -277,7 +294,7 @@ static int commit_bitstream_and_slice_buffer(AVCodecContext *avctx, const H264Context *h = avctx->priv_data; const unsigned mb_count = h->mb_width * h->mb_height; struct dxva_context *ctx = avctx->hwaccel_context; - const Picture *current_picture = h->cur_pic_ptr; + const H264Picture *current_picture = h->cur_pic_ptr; struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private; DXVA_Slice_H264_Short *slice = NULL; uint8_t *dxva_data, *current, *end; @@ -397,7 +414,7 @@ static int dxva2_h264_decode_slice(AVCodecContext *avctx, { const H264Context *h = avctx->priv_data; struct dxva_context *ctx = avctx->hwaccel_context; - const Picture *current_picture = h->cur_pic_ptr; + const H264Picture *current_picture = h->cur_pic_ptr; struct dxva2_picture_context *ctx_pic = current_picture->hwaccel_picture_private; unsigned position; @@ -414,7 +431,7 @@ static int dxva2_h264_decode_slice(AVCodecContext *avctx, position, size); else fill_slice_long(avctx, &ctx_pic->slice_long[ctx_pic->slice_count], - position, size); + &ctx_pic->pp, position, size); ctx_pic->slice_count++; if (h->slice_type != AV_PICTURE_TYPE_I && h->slice_type != AV_PICTURE_TYPE_SI) @@ -431,7 +448,7 @@ static int dxva2_h264_end_frame(AVCodecContext *avctx) if (ctx_pic->slice_count <= 0 || ctx_pic->bitstream_size <= 0) return -1; - ret = ff_dxva2_common_end_frame(avctx, h->cur_pic_ptr, + ret = ff_dxva2_common_end_frame(avctx, &h->cur_pic_ptr->f, &ctx_pic->pp, sizeof(ctx_pic->pp), &ctx_pic->qm, sizeof(ctx_pic->qm), commit_bitstream_and_slice_buffer); @@ -448,5 +465,5 @@ AVHWAccel ff_h264_dxva2_hwaccel = { .start_frame = dxva2_h264_start_frame, .decode_slice = dxva2_h264_decode_slice, .end_frame = dxva2_h264_end_frame, - .priv_data_size = sizeof(struct dxva2_picture_context), + .frame_priv_data_size = sizeof(struct dxva2_picture_context), }; |