virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

avcodec/nvdec_hevc: fix scaling lists

Browse Source 
The main issue here was the use of [i] instead of [i * 3] for the 32x32
matrix. As part of fixing this, I changed the code to match that used
in vdpau_hevc, which I spent a lot of time verifying.

I also changed to calculating NumPocTotalCurr using the existing helper,
which is what vdpau does.

Signed-off-by: Timo Rothenpieler <timo@rothenpieler.org>
(cherry picked from commit 1261003700322789d62a892e3325f8b58349d051)
This commit is contained in:
Philip Langdale 2018-05-09 18:48:59 -07:00 committed by Timo Rothenpieler
parent 61b673b1f1
commit 2a44f706aa
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/nvdec_hevc.c
View File

@ -58,12 +58,13 @@ static void fill_scaling_lists(CUVIDHEVCPICPARAMS *ppc, const HEVCContext *s)
ppc->ScalingList16x16[i][j] = sl->sl[2][i][pos]; ppc->ScalingList16x16[i][j] = sl->sl[2][i][pos];
if (i < 2) if (i < 2)
ppc->ScalingList32x32[i][j] = sl->sl[3][i][pos]; ppc->ScalingList32x32[i][j] = sl->sl[3][i * 3][pos];
}
} }
memcpy(ppc->ScalingListDCCoeff16x16, sl->sl_dc[0], sizeof(ppc->ScalingListDCCoeff16x16)); ppc->ScalingListDCCoeff16x16[i] = sl->sl_dc[0][i];
memcpy(ppc->ScalingListDCCoeff32x32, sl->sl_dc[1], sizeof(ppc->ScalingListDCCoeff32x32)); if (i < 2)
ppc->ScalingListDCCoeff32x32[i] = sl->sl_dc[1][i * 3];
}
} }
static int nvdec_hevc_start_frame(AVCodecContext *avctx, static int nvdec_hevc_start_frame(AVCodecContext *avctx,
@ -166,8 +167,7 @@ static int nvdec_hevc_start_frame(AVCodecContext *avctx,
.NumBitsForShortTermRPSInSlice = s->sh.short_term_rps ? s->sh.short_term_ref_pic_set_size : 0, .NumBitsForShortTermRPSInSlice = s->sh.short_term_rps ? s->sh.short_term_ref_pic_set_size : 0,
.NumDeltaPocsOfRefRpsIdx = s->sh.short_term_rps ? s->sh.short_term_rps->rps_idx_num_delta_pocs : 0, .NumDeltaPocsOfRefRpsIdx = s->sh.short_term_rps ? s->sh.short_term_rps->rps_idx_num_delta_pocs : 0,
.NumPocTotalCurr = s->rps[ST_CURR_BEF].nb_refs + s->rps[ST_CURR_AFT].nb_refs + .NumPocTotalCurr = ff_hevc_frame_nb_refs(s),
s->rps[LT_CURR].nb_refs,
.NumPocStCurrBefore = s->rps[ST_CURR_BEF].nb_refs, .NumPocStCurrBefore = s->rps[ST_CURR_BEF].nb_refs,
.NumPocStCurrAfter = s->rps[ST_CURR_AFT].nb_refs, .NumPocStCurrAfter = s->rps[ST_CURR_AFT].nb_refs,
.NumPocLtCurr = s->rps[LT_CURR].nb_refs, .NumPocLtCurr = s->rps[LT_CURR].nb_refs,