Old Intel GPUs expect the reference frame index to the actual surface, instead of the index into RefFrameList as specified by the spec. This workaround should be set when using one of the "ClearVideo" decoder devices.
Unified · Split
| @@ -49,6 +49,7 @@ · 48 unmodified lines | |||
| 49 | */ | 49 | */ |
| 50 | 50 | ||
| 51 | #define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for DXVA2 and old UVD/UVD+ ATI video cards | 51 | #define FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG 1 ///< Work around for DXVA2 and old UVD/UVD+ ATI video cards |
| 52 | #define FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO 2 ///< Work around for DXVA2 and old Intel GPUs with ClearVideo interface | ||
| 52 | 53 | ||
| 53 | /** | 54 | /** |
| 54 | * This structure is used to provides the necessary configurations and data | 55 | * This structure is used to provides the necessary configurations and data |
| @@ -115,6 +115,8 @@ static void fill_picture_parameters(struct dxva_context *ctx, const H264Context · 114 unmodified lines | |||
| 115 | pp->bit_depth_chroma_minus8 = h->sps.bit_depth_chroma - 8; | 115 | pp->bit_depth_chroma_minus8 = h->sps.bit_depth_chroma - 8; |
| 116 | if (ctx->workaround & FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG) | 116 | if (ctx->workaround & FF_DXVA2_WORKAROUND_SCALING_LIST_ZIGZAG) |
| 117 | pp->Reserved16Bits = 0; | 117 | pp->Reserved16Bits = 0; |
| 118 | else if (ctx->workaround & FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO) | ||
| 119 | pp->Reserved16Bits = 0x34c; | ||
| 118 | else | 120 | else |
| 119 | pp->Reserved16Bits = 3; /* FIXME is there a way to detect the right mode ? */ | 121 | pp->Reserved16Bits = 3; /* FIXME is there a way to detect the right mode ? */ |
| 120 | pp->StatusReportFeedbackNumber = 1 + ctx->report_id++; | 122 | pp->StatusReportFeedbackNumber = 1 + ctx->report_id++; |
| @@ -238,7 +240,11 @@ static void fill_slice_long(AVCodecContext *avctx, DXVA_Slice_H264_Long *slice, · 117 unmodified lines | |||
| 238 | if (list < h->list_count && i < h->ref_count[list]) { | 240 | if (list < h->list_count && i < h->ref_count[list]) { |
| 239 | const Picture *r = &h->ref_list[list][i]; | 241 | const Picture *r = &h->ref_list[list][i]; |
| 240 | unsigned plane; | 242 | unsigned plane; |
| 241 | unsigned index = get_refpic_index(pp, ff_dxva2_get_surface_index(ctx, r)); | 243 | unsigned index; |
| 244 | if (ctx->workaround & FF_DXVA2_WORKAROUND_INTEL_CLEARVIDEO) | ||
| 245 | index = ff_dxva2_get_surface_index(ctx, r); | ||
| 246 | else | ||
| 247 | index = get_refpic_index(pp, ff_dxva2_get_surface_index(ctx, r)); | ||
| 242 | fill_picture_entry(&slice->RefPicList[list][i], index, | 248 | fill_picture_entry(&slice->RefPicList[list][i], index, |
| 243 | r->reference == PICT_BOTTOM_FIELD); | 249 | r->reference == PICT_BOTTOM_FIELD); |
| 244 | for (plane = 0; plane < 3; plane++) { | 250 | for (plane = 0; plane < 3; plane++) { |