[SCM] libav/experimental: hwaccel: fix dxva2 & vaapi loop filter parameters
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Aug 10 16:02:59 UTC 2014
The following commit has been merged in the experimental branch:
commit b2b4afe8115fe3c8b005d663610e5af06f110165
Author: Michael Niedermayer <michaelni at gmx.at>
Date: Tue Apr 22 15:22:52 2014 +0200
hwaccel: fix dxva2 & vaapi loop filter parameters
Signed-off-by: Anton Khirnov <anton at khirnov.net>
diff --git a/libavcodec/dxva2_h264.c b/libavcodec/dxva2_h264.c
index 3d503e8..d80bd14 100644
--- a/libavcodec/dxva2_h264.c
+++ b/libavcodec/dxva2_h264.c
@@ -231,8 +231,8 @@ 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++) {
diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
index f2a912c..7529f04 100644
--- a/libavcodec/vaapi_h264.c
+++ b/libavcodec/vaapi_h264.c
@@ -333,8 +333,8 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx,
slice_param->cabac_init_idc = h->cabac_init_idc;
slice_param->slice_qp_delta = h->qscale - h->pps.init_qp;
slice_param->disable_deblocking_filter_idc = h->deblocking_filter < 2 ? !h->deblocking_filter : h->deblocking_filter;
- slice_param->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2 - 26;
- slice_param->slice_beta_offset_div2 = h->slice_beta_offset / 2 - 26;
+ slice_param->slice_alpha_c0_offset_div2 = h->slice_alpha_c0_offset / 2;
+ slice_param->slice_beta_offset_div2 = h->slice_beta_offset / 2;
slice_param->luma_log2_weight_denom = h->luma_log2_weight_denom;
slice_param->chroma_log2_weight_denom = h->chroma_log2_weight_denom;
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list