package/mpp
1
0
Fork 0
mirror of https://github.com/nyanmisaka/mpp.git synced 2025-10-28 19:31:45 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix[hal_h265d]: Fix filter col rcb buffer size calc

Browse Source 
Change-Id: Iddc1ee4d8089d876896131415cbe43bd704713bf
Signed-off-by: Yandong Lin <yandong.lin@rock-chips.com>
This commit is contained in:
Yandong Lin
2024-03-08 17:46:07 +08:00
committed by Herman Chen
parent 6627f4667b
commit 613973548c
2 changed files with 33 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mpp/hal/rkdec/h265d/hal_h265d_vdpu34x.c
View File

@@ -693,6 +693,7 @@ static void h265d_refine_rcb_size(Vdpu34xRcbInfo *rcb_info,
width = MPP_ALIGN(width, ctu_size); width = MPP_ALIGN(width, ctu_size);
height = MPP_ALIGN(height, ctu_size); height = MPP_ALIGN(height, ctu_size);
/* RCB_STRMD_ROW */ /* RCB_STRMD_ROW */
if (width > 8192) { if (width > 8192) {
RK_U32 factor = ctu_size / 16; RK_U32 factor = ctu_size / 16;
@@ -700,27 +701,33 @@ static void h265d_refine_rcb_size(Vdpu34xRcbInfo *rcb_info,
} else } else
rcb_bits = 0; rcb_bits = 0;
rcb_info[RCB_STRMD_ROW].size = MPP_RCB_BYTES(rcb_bits); rcb_info[RCB_STRMD_ROW].size = MPP_RCB_BYTES(rcb_bits);
/* RCB_TRANSD_ROW */ /* RCB_TRANSD_ROW */
if (width > 8192) if (width > 8192)
rcb_bits = (MPP_ALIGN(width - 8192, 4) << 1) + ext_align_size; rcb_bits = (MPP_ALIGN(width - 8192, 4) << 1) + ext_align_size;
else else
rcb_bits = 0; rcb_bits = 0;
rcb_info[RCB_TRANSD_ROW].size = MPP_RCB_BYTES(rcb_bits); rcb_info[RCB_TRANSD_ROW].size = MPP_RCB_BYTES(rcb_bits);
/* RCB_TRANSD_COL */ /* RCB_TRANSD_COL */
if (height > 8192) if (height > 8192 && tile_col_cut_num)
rcb_bits = (MPP_ALIGN(height - 8192, 4) << 1) + ext_align_size; rcb_bits = (MPP_ALIGN(height - 8192, 4) << 1);
else else
rcb_bits = 0; rcb_bits = 0;
rcb_info[RCB_TRANSD_COL].size = MPP_RCB_BYTES(rcb_bits); rcb_info[RCB_TRANSD_COL].size = MPP_RCB_BYTES(rcb_bits);
/* RCB_INTER_ROW */ /* RCB_INTER_ROW */
rcb_bits = width * 22 + ext_align_size; rcb_bits = width * 22 + ext_align_size;
rcb_info[RCB_INTER_ROW].size = MPP_RCB_BYTES(rcb_bits); rcb_info[RCB_INTER_ROW].size = MPP_RCB_BYTES(rcb_bits);
/* RCB_INTER_COL */ /* RCB_INTER_COL */
rcb_bits = height * 22 + ext_align_size; rcb_bits = tile_col_cut_num ? height * 22 : 0;
rcb_info[RCB_INTER_COL].size = MPP_RCB_BYTES(rcb_bits); rcb_info[RCB_INTER_COL].size = MPP_RCB_BYTES(rcb_bits);
/* RCB_INTRA_ROW */ /* RCB_INTRA_ROW */
rcb_bits = width * 48 + ext_align_size; rcb_bits = width * 48 + ext_align_size;
rcb_info[RCB_INTRA_ROW].size = MPP_RCB_BYTES(rcb_bits); rcb_info[RCB_INTRA_ROW].size = MPP_RCB_BYTES(rcb_bits);
/* RCB_DBLK_ROW */ /* RCB_DBLK_ROW */
if (chroma_fmt_idc == 1 || chroma_fmt_idc == 2) { if (chroma_fmt_idc == 1 || chroma_fmt_idc == 2) {
if (ctu_size == 32) if (ctu_size == 32)
@@ -735,6 +742,7 @@ static void h265d_refine_rcb_size(Vdpu34xRcbInfo *rcb_info,
} }
rcb_bits += (tile_col_cut_num * (bit_depth == 8 ? 256 : 192)) + ext_align_size; rcb_bits += (tile_col_cut_num * (bit_depth == 8 ? 256 : 192)) + ext_align_size;
rcb_info[RCB_DBLK_ROW].size = MPP_RCB_BYTES(rcb_bits); rcb_info[RCB_DBLK_ROW].size = MPP_RCB_BYTES(rcb_bits);
/* RCB_SAO_ROW */ /* RCB_SAO_ROW */
if (chroma_fmt_idc == 1 || chroma_fmt_idc == 2) { if (chroma_fmt_idc == 1 || chroma_fmt_idc == 2) {
rcb_bits = width * (128 / ctu_size + 2 * bit_depth); rcb_bits = width * (128 / ctu_size + 2 * bit_depth);
@@ -743,6 +751,7 @@ static void h265d_refine_rcb_size(Vdpu34xRcbInfo *rcb_info,
} }
rcb_bits += (tile_col_cut_num * (bit_depth == 8 ? 160 : 128)) + ext_align_size; rcb_bits += (tile_col_cut_num * (bit_depth == 8 ? 160 : 128)) + ext_align_size;
rcb_info[RCB_SAO_ROW].size = MPP_RCB_BYTES(rcb_bits); rcb_info[RCB_SAO_ROW].size = MPP_RCB_BYTES(rcb_bits);
/* RCB_FBC_ROW */ /* RCB_FBC_ROW */
if (hw_regs->common.reg012.fbc_e) { if (hw_regs->common.reg012.fbc_e) {
rcb_bits = width * (chroma_fmt_idc - 1) * 2 * bit_depth; rcb_bits = width * (chroma_fmt_idc - 1) * 2 * bit_depth;
@@ -750,21 +759,25 @@ static void h265d_refine_rcb_size(Vdpu34xRcbInfo *rcb_info,
} else } else
rcb_bits = 0; rcb_bits = 0;
rcb_info[RCB_FBC_ROW].size = MPP_RCB_BYTES(rcb_bits); rcb_info[RCB_FBC_ROW].size = MPP_RCB_BYTES(rcb_bits);
/* RCB_FILT_COL */ /* RCB_FILT_COL */
if (hw_regs->common.reg012.fbc_e) { if (tile_col_cut_num) {
RK_U32 ctu_idx = ctu_size >> 5; if (hw_regs->common.reg012.fbc_e) {
RK_U32 a = filterd_fbc_on[chroma_fmt_idc][ctu_idx].a; RK_U32 ctu_idx = ctu_size >> 5;
RK_U32 b = filterd_fbc_on[chroma_fmt_idc][ctu_idx].b; RK_U32 a = filterd_fbc_on[ctu_idx][chroma_fmt_idc].a;
RK_U32 b = filterd_fbc_on[ctu_idx][chroma_fmt_idc].b;
rcb_bits = height * (a * bit_depth + b); rcb_bits = height * (a * bit_depth + b);
} else { } else {
RK_U32 ctu_idx = ctu_size >> 5; RK_U32 ctu_idx = ctu_size >> 5;
RK_U32 a = filterd_fbc_off[chroma_fmt_idc][ctu_idx].a; RK_U32 a = filterd_fbc_off[ctu_idx][chroma_fmt_idc].a;
RK_U32 b = filterd_fbc_off[chroma_fmt_idc][ctu_idx].b; RK_U32 b = filterd_fbc_off[ctu_idx][chroma_fmt_idc].b;
rcb_bits = height * (a * bit_depth + b + (bit_depth == 10 ? 16 : 0));
}
} else
rcb_bits = 0;
rcb_bits = height * (a * bit_depth + b + (bit_depth == 10 ? 192 * ctu_size >> 4 : 0));
}
rcb_bits += ext_align_size;
rcb_info[RCB_FILT_COL].size = MPP_RCB_BYTES(rcb_bits); rcb_info[RCB_FILT_COL].size = MPP_RCB_BYTES(rcb_bits);
} }

10
mpp/hal/rkdec/h265d/hal_h265d_vdpu382.c
View File

@@ -77,10 +77,10 @@ static const FilterdColBufRatio filterd_fbc_on[CTU][FMT] = {
}; };
static const FilterdColBufRatio filterd_fbc_off[CTU][FMT] = { static const FilterdColBufRatio filterd_fbc_off[CTU][FMT] = {
/* 400 420 422 444 */ /* 400 420 422 444 */
{{0, 0}, {9, 31}, {12, 39}, {12, 39}}, //ctu 16 {{0, 0}, {15, 5}, {20, 5}, {20, 5}}, //ctu 16
{{0, 0}, {9, 25}, {12, 33}, {12, 33}}, //ctu 32 {{0, 0}, {15, 9}, {20, 9}, {20, 9}}, //ctu 32
{{0, 0}, {9, 21}, {12, 29}, {12, 29}} //ctu 64 {{0, 0}, {15, 16}, {20, 16}, {20, 16}} //ctu 64
}; };
#define CABAC_TAB_ALIGEND_SIZE (MPP_ALIGN(27456, SZ_4K)) #define CABAC_TAB_ALIGEND_SIZE (MPP_ALIGN(27456, SZ_4K))
@@ -555,7 +555,7 @@ static void h265d_refine_rcb_size(Vdpu382RcbInfo *rcb_info,
RK_U32 a = filterd_fbc_off[ctu_idx][chroma_fmt_idc].a; RK_U32 a = filterd_fbc_off[ctu_idx][chroma_fmt_idc].a;
RK_U32 b = filterd_fbc_off[ctu_idx][chroma_fmt_idc].b; RK_U32 b = filterd_fbc_off[ctu_idx][chroma_fmt_idc].b;
rcb_bits = height * (a * bit_depth + b + (bit_depth == 10 ? 192 * ctu_size >> 4 : 0)); rcb_bits = height * (a * bit_depth + b);
} }
} else } else
rcb_bits = 0; rcb_bits = 0;