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

[h264e]: Use new mmco wr / rd function

Browse Source 
Change-Id: I963e3e37ecb6c26d406b9095a67d89b971828dc0
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2020-05-27 10:19:18 +08:00
parent 482f80c2e2
commit 51f87fa5e0
5 changed files with 32 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mpp/codec/enc/h264/h264e_dpb.c
View File

@@ -344,6 +344,8 @@ void h264e_dpb_build_marking(H264eDpb *dpb)
h264e_dbg_dpb("enter %p\n", dpb);
h264e_marking_wr_rewind(marking);
// refernce frame can not mark itself as unreferenced.
if (frm->status.is_idr) {
marking->idr_flag = 1;

64
mpp/codec/enc/h264/h264e_slice.c
View File

@@ -135,42 +135,38 @@ MPP_RET h264e_marking_init(H264eMarkingInfo *marking)
marking->long_term_reference_flag = 0;
marking->adaptive_ref_pic_buffering = 0;
marking->size = MAX_H264E_MMCO_CNT;
marking->pos_wr = 0;
marking->pos_rd = marking->size;
marking->count = 0;
marking->wr_cnt = 0;
marking->rd_cnt = 0;
return MPP_OK;
}
RK_S32 h264e_marking_is_empty(H264eMarkingInfo *info)
{
return (info->pos_rd - info->pos_wr == info->size ||
info->pos_wr - info->pos_rd == info->size) ? (1) : (0);
return info->rd_cnt >= info->wr_cnt;
}
RK_S32 h264e_marking_is_full(H264eMarkingInfo *info)
MPP_RET h264e_marking_wr_rewind(H264eMarkingInfo *marking)
{
return (info->pos_rd == info->pos_wr) ? (1) : (0);
marking->wr_cnt = 0;
return MPP_OK;
}
MPP_RET h264e_marking_rd_rewind(H264eMarkingInfo *marking)
{
marking->rd_cnt = 0;
return MPP_OK;
}
MPP_RET h264e_marking_wr_op(H264eMarkingInfo *info, H264eMmco *op)
{
if (h264e_marking_is_full(info))
if (info->wr_cnt >= info->size) {
mpp_err_f("write too many mmco op %d vs %d\n",
info->wr_cnt, info->size);
return MPP_NOK;
}
RK_S32 pos_wr = info->pos_wr;
if (pos_wr >= info->size)
pos_wr -= info->size;
info->ops[pos_wr] = *op;
info->pos_wr++;
if (info->pos_wr >= info->size * 2)
info->pos_wr = 0;
info->count++;
info->ops[info->wr_cnt++] = *op;
return MPP_OK;
}
@@ -179,19 +175,7 @@ MPP_RET h264e_marking_rd_op(H264eMarkingInfo *info, H264eMmco *op)
if (h264e_marking_is_empty(info))
return MPP_NOK;
RK_S32 pos_rd = info->pos_rd;
if (pos_rd >= info->size)
pos_rd -= info->size;
*op = info->ops[pos_rd];
info->pos_rd++;
if (info->pos_rd >= info->size * 2)
info->pos_rd = 0;
info->count--;
*op = info->ops[info->rd_cnt++];
return MPP_OK;
}
@@ -211,19 +195,19 @@ void write_marking(MppWriteCtx *s, H264eMarkingInfo *marking)
// clear long_term_reference_flag flag
marking->long_term_reference_flag = 0;
} else {
h264e_dbg_mmco("mmco count %d\n", marking->count);
h264e_dbg_mmco("mmco count %d\n", marking->wr_cnt);
h264e_marking_rd_rewind(marking);
if (!h264e_marking_is_empty(marking)) {
H264eMmco mmco;
/* adaptive_ref_pic_marking_mode_flag */
mpp_writer_put_bits(s, 1, 1);
h264e_dbg_slice("used bit %2d adaptive_ref_pic_marking_mode_flag 1\n",
mpp_writer_bits(s));
while (!h264e_marking_is_empty(marking)) {
H264eMmco mmco;
h264e_marking_rd_op(marking, &mmco);
while (MPP_OK == h264e_marking_rd_op(marking, &mmco)) {
/* memory_management_control_operation */
mpp_writer_put_ue(s, mmco.mmco);
h264e_dbg_slice("used bit %2d memory_management_control_operation %d\n",

2
mpp/codec/enc/h264/h264e_slice.h
View File

@@ -38,6 +38,8 @@ MPP_RET h264e_reorder_rd_op(H264eReorderInfo *info, H264eRplmo *op);
/* mmco context for both dpb and slice */
MPP_RET h264e_marking_init(H264eMarkingInfo *marking);
RK_S32 h264e_marking_is_empty(H264eMarkingInfo *info);
MPP_RET h264e_marking_wr_rewind(H264eMarkingInfo *marking);
MPP_RET h264e_marking_rd_rewind(H264eMarkingInfo *marking);
MPP_RET h264e_marking_wr_op(H264eMarkingInfo *info, H264eMmco *op);
MPP_RET h264e_marking_rd_op(H264eMarkingInfo *info, H264eMmco *op);

5
mpp/common/h264e_syntax_new.h
View File

@@ -246,9 +246,8 @@ typedef struct H264eMarkingInfo_t {
RK_S32 long_term_reference_flag;
/* non-idr marking flag */
RK_S32 adaptive_ref_pic_buffering;
RK_S32 pos_rd;
RK_S32 pos_wr;
RK_S32 count;
RK_S32 rd_cnt;
RK_S32 wr_cnt;
RK_S32 size;
H264eMmco ops[MAX_H264E_MMCO_CNT];
} H264eMarkingInfo;

2
mpp/hal/rkenc/h264e/hal_h264e_vepu541.c
View File

@@ -528,6 +528,8 @@ static void setup_vepu541_codec(Vepu541H264eRegSet *regs, SynH264eSps *sps,
regs->reg114.long_term_frame_idx1 = 0;
regs->reg114.long_term_frame_idx2 = 0;
h264e_marking_rd_rewind(slice->marking);
/* only update used parameter */
if (slice->slice_type == H264_I_SLICE) {
regs->reg109.nopp_flg = slice->no_output_of_prior_pics;