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

[h264e]: Remove unused i_frame_packing

Browse Source 
Change-Id: Ia53c2513bc57dde47960c06374d1c6d5fa729da7
Signed-off-by: Herman Chen <herman.chen@rock-chips.com>
This commit is contained in:
Herman Chen
2019-04-16 09:53:26 +08:00
parent 90b2a3838c
commit a1ae919a33
5 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
inc/rk_mpi_cmd.h
View File

@@ -652,7 +652,6 @@ typedef struct MppEncH264RefCfg_t {
RK_S32 hw_longterm_mode; RK_S32 hw_longterm_mode;
RK_S32 i_dpb_size; /* Force a DPB size larger than that implied by B-frames and reference frames. RK_S32 i_dpb_size; /* Force a DPB size larger than that implied by B-frames and reference frames.
* Useful in combination with interactive error resilience. */ * Useful in combination with interactive error resilience. */
RK_S32 i_frame_packing;
} MppEncH264RefCfg; } MppEncH264RefCfg;
typedef struct MppEncH264SeiCfg_t { typedef struct MppEncH264SeiCfg_t {

2
mpp/hal/common/h264/hal_h264e_api.c
View File

@@ -122,8 +122,6 @@ MPP_RET hal_h264e_init(void *hal, MppHalCfg *cfg)
ref->i_long_term_en = H264E_LONGTERM_REF_EN; ref->i_long_term_en = H264E_LONGTERM_REF_EN;
ref->hw_longterm_mode = 0; ref->hw_longterm_mode = 0;
ref->i_long_term_internal = 0; ref->i_long_term_internal = 0;
ref->i_frame_packing = -1;
ctx->cfg = cfg->cfg; ctx->cfg = cfg->cfg;
ctx->set = cfg->set; ctx->set = cfg->set;

1
mpp/hal/common/h264/hal_h264e_com.c
View File

@@ -450,7 +450,6 @@ static void h264e_set_ref(H264eRefParam *ref)
ref->i_long_term_en = H264E_LONGTERM_REF_EN; ref->i_long_term_en = H264E_LONGTERM_REF_EN;
ref->hw_longterm_mode = 0; ref->hw_longterm_mode = 0;
ref->i_long_term_internal = 0; ref->i_long_term_internal = 0;
ref->i_frame_packing = -1;
} }
void h264e_set_param(H264eHalParam *p, RK_S32 hw_type) void h264e_set_param(H264eHalParam *p, RK_S32 hw_type)

1
mpp/hal/common/h264/hal_h264e_com.h
View File

@@ -360,7 +360,6 @@ typedef struct H264eRefParam_t {
RK_S32 hw_longterm_mode; RK_S32 hw_longterm_mode;
RK_S32 i_dpb_size; /* Force a DPB size larger than that implied by B-frames and reference frames. RK_S32 i_dpb_size; /* Force a DPB size larger than that implied by B-frames and reference frames.
* Useful in combination with interactive error resilience. */ * Useful in combination with interactive error resilience. */
RK_S32 i_frame_packing;
} H264eRefParam; } H264eRefParam;
typedef struct H264eHalParam_t { typedef struct H264eHalParam_t {

13
mpp/hal/rkenc/h264e/hal_h264e_rkv_dpb.c
View File

@@ -175,14 +175,9 @@ static void h264e_rkv_reference_reset(H264eRkvDpbCtx *dpb_ctx)
} }
static RK_S32 static RK_S32
h264e_rkv_reference_distance(H264eRefParam *ref_cfg, h264e_rkv_reference_distance(H264eRkvDpbCtx *dpb_ctx, H264eRkvFrame *frame )
H264eRkvDpbCtx *dpb_ctx, H264eRkvFrame *frame )
{ {
if ( ref_cfg->i_frame_packing == 5 ) return abs(dpb_ctx->fdec->i_frame_cnt - frame->i_frame_cnt);
return abs((dpb_ctx->fdec->i_frame_cnt & ~1) - (frame->i_frame_cnt & ~1)) +
((dpb_ctx->fdec->i_frame_cnt & 1) != (frame->i_frame_cnt & 1));
else
return abs(dpb_ctx->fdec->i_frame_cnt - frame->i_frame_cnt);
} }
static void h264e_rkv_reference_build_list(H264eHalContext *ctx) static void h264e_rkv_reference_build_list(H264eHalContext *ctx)
@@ -254,8 +249,8 @@ static void h264e_rkv_reference_build_list(H264eHalContext *ctx)
if ( list ? dpb_ctx->fref[list][i + 1]->i_poc < dpb_ctx->fref_nearest[list]->i_poc if ( list ? dpb_ctx->fref[list][i + 1]->i_poc < dpb_ctx->fref_nearest[list]->i_poc
: dpb_ctx->fref[list][i + 1]->i_poc > dpb_ctx->fref_nearest[list]->i_poc ) : dpb_ctx->fref[list][i + 1]->i_poc > dpb_ctx->fref_nearest[list]->i_poc )
dpb_ctx->fref_nearest[list] = dpb_ctx->fref[list][i + 1]; dpb_ctx->fref_nearest[list] = dpb_ctx->fref[list][i + 1];
if ( h264e_rkv_reference_distance( ref_cfg, dpb_ctx, dpb_ctx->fref[list][i] ) > if ( h264e_rkv_reference_distance(dpb_ctx, dpb_ctx->fref[list][i] ) >
h264e_rkv_reference_distance( ref_cfg, dpb_ctx, dpb_ctx->fref[list][i + 1] ) ) { h264e_rkv_reference_distance(dpb_ctx, dpb_ctx->fref[list][i + 1] ) ) {
MPP_SWAP( H264eRkvFrame *, dpb_ctx->fref[list][i], dpb_ctx->fref[list][i + 1] ); MPP_SWAP( H264eRkvFrame *, dpb_ctx->fref[list][i], dpb_ctx->fref[list][i + 1] );
b_ok = 0; b_ok = 0;
break; break;