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

[h265e_rkv_hal]: Support format cfg

Browse Source 
Change-Id: I18dfa559c6ee35cfae672a8bfac04a3ab12edf68
Signed-off-by: sayon.chen <sayon.chen@rock-chips.com>
This commit is contained in:
sayon.chen
2020-01-03 15:10:57 +08:00
parent b792ef7114
commit 5de565c84e
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mpp/codec/enc/h265/h265e_syntax.c
View File

@@ -27,7 +27,7 @@ static void fill_picture_parameters(const H265eCtx *h,
{ {
const H265ePps *pps = (H265ePps *)&h->pps; const H265ePps *pps = (H265ePps *)&h->pps;
const H265eSps *sps = (H265eSps *)&h->sps; const H265eSps *sps = (H265eSps *)&h->sps;
MppEncCfgSet *cfg = h->cfg;
memset(pp, 0, sizeof(H265ePicParams)); memset(pp, 0, sizeof(H265ePicParams));
pp->pic_width = h->cfg->prep.width; pp->pic_width = h->cfg->prep.width;
@@ -37,6 +37,7 @@ static void fill_picture_parameters(const H265eCtx *h,
pp->pps_id = h->slice->m_ppsId; pp->pps_id = h->slice->m_ppsId;
pp->sps_id = pps->m_SPSId; pp->sps_id = pps->m_SPSId;
pp->vps_id = sps->m_VPSId; pp->vps_id = sps->m_VPSId;
pp->mpp_format = cfg->prep.format;
pp->wFormatAndSequenceInfoFlags = (sps->m_chromaFormatIdc << 0) | pp->wFormatAndSequenceInfoFlags = (sps->m_chromaFormatIdc << 0) |
(sps->m_colorPlaneFlag << 2) | (sps->m_colorPlaneFlag << 2) |

34
mpp/hal/rkenc/h265e/hal_h265e_rkv.c
View File

@@ -661,6 +661,35 @@ static MPP_RET h265e_rkv_set_rc_regs(H265eRkvRegSet *regs, H265eSyntax_new *syn)
return MPP_OK; return MPP_OK;
} }
static MPP_RET h265e_rkv_set_pp_regs(H265eRkvRegSet *regs, MppEncPrepCfg *prep_cfg)
{
RK_S32 stridey = 0;
RK_S32 stridec = 0;
regs->src_proc.src_rot = prep_cfg->rotation;
if (prep_cfg->hor_stride) {
stridey = prep_cfg->hor_stride;
} else {
stridey = prep_cfg->width ;
if (regs->src_fmt.src_cfmt == RKVE_CSP_BGRA8888 )
stridey = (stridey + 1) * 4;
else if (regs->src_fmt.src_cfmt == RKVE_CSP_BGR888 )
stridey = (stridey + 1) * 3;
else if ( regs->src_fmt.src_cfmt == RKVE_CSP_BGR565
|| regs->src_fmt.src_cfmt == RKVE_CSP_YUYV422
|| regs->src_fmt.src_cfmt == RKVE_CSP_UYVY422 )
stridey = (stridey + 1) * 2;
}
stridec = (regs->src_fmt.src_cfmt == RKVE_CSP_YUV422SP
|| regs->src_fmt.src_cfmt == RKVE_CSP_YUV420SP)
? stridey : stridey / 2;
regs->src_strid.src_ystrid = stridey;
regs->src_strid.src_cstrid = stridec;
return MPP_OK;
}
static void h265e_rkv_set_slice_regs(H265eSyntax_new *syn, H265eRkvRegSet *regs) static void h265e_rkv_set_slice_regs(H265eSyntax_new *syn, H265eRkvRegSet *regs)
{ {
regs->synt_sps.smpl_adpt_ofst_en = syn->pp.sample_adaptive_offset_enabled_flag;//slice->m_sps->m_bUseSAO; regs->synt_sps.smpl_adpt_ofst_en = syn->pp.sample_adaptive_offset_enabled_flag;//slice->m_sps->m_bUseSAO;
@@ -858,8 +887,6 @@ MPP_RET hal_h265e_rkv_gen_regs(void *hal, HalEncTask *task)
regs->src_proc.src_rot = 0; regs->src_proc.src_rot = 0;
regs->src_proc.txa_en = 1; regs->src_proc.txa_en = 1;
regs->src_proc.fbd_en = 0; regs->src_proc.fbd_en = 0;
regs->src_strid.src_ystrid = syn->pp.hor_stride;
regs->src_strid.src_cstrid = syn->pp.hor_stride / 2;
h265e_rkv_set_ioctl_extra_info(&ioctl_reg_info->extra_info, syn, (RkveCsp)ctx->input_fmt); h265e_rkv_set_ioctl_extra_info(&ioctl_reg_info->extra_info, syn, (RkveCsp)ctx->input_fmt);
@@ -1024,8 +1051,7 @@ MPP_RET hal_h265e_rkv_gen_regs(void *hal, HalEncTask *task)
} }
regs->synt_nal.nal_unit_type = i_nal_type; regs->synt_nal.nal_unit_type = i_nal_type;
} }
h265e_rkv_set_pp_regs(regs, &ctx->cfg->prep);
h265e_rkv_set_rc_regs(regs, syn); h265e_rkv_set_rc_regs(regs, syn);
h265e_rkv_set_slice_regs(syn, regs); h265e_rkv_set_slice_regs(syn, regs);