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

[mpp_dec]: Fix the problem of screen flutter when decoding mpeg4

Browse Source 
Modify the processing of pts in the decoding process

Change-Id: I80b911c19eb345744333d3ec4d8e22e8c86fc857
Signed-off-by: vic.hong <vic.hong@rock-chips.com>
This commit is contained in:
vic.hong
2021-12-07 20:18:08 +08:00
committed by Hongjin Li
parent c356795741
commit ee10b27c68
2 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mpp/codec/inc/mpp_dec_impl.h
View File

@@ -130,12 +130,6 @@ typedef struct MppDecImpl_t {
spinlock_t ts_lock;
} MppDecImpl;
typedef struct MppPktTimestamp_t {
struct list_head link;
RK_S32 pts;
RK_S32 dts;
} MppPktTs;
#ifdef __cplusplus
extern "C" {
#endif

33
mpp/codec/mpp_dec.cpp
View File

@@ -109,6 +109,12 @@ typedef union DecTaskStatus_u {
};
} DecTaskStatus;
typedef struct MppPktTimestamp_t {
struct list_head link;
RK_S64 pts;
RK_S64 dts;
} MppPktTs;
typedef struct DecTask_t {
HalTaskHnd hnd;
@@ -116,6 +122,7 @@ typedef struct DecTask_t {
PaserTaskWait wait;
HalTaskInfo info;
MppPktTs ts_cur;
} DecTask;
static RK_S32 ts_cmp(void *priv, const struct list_head *a, const struct list_head *b)
@@ -135,6 +142,7 @@ static void dec_task_init(DecTask *task)
task->status.val = 0;
task->wait.val = 0;
task->status.prev_task_rdy = 1;
INIT_LIST_HEAD(&task->ts_cur.link);
hal_task_info_init(&task->info, MPP_CTX_DEC);
}
@@ -834,16 +842,8 @@ static MPP_RET try_proc_dec_task(Mpp *mpp, DecTask *task)
mpp_parser_prepare(dec->parser, dec->mpp_pkt_in, task_dec);
mpp_clock_pause(dec->clocks[DEC_PRS_PREPARE]);
if (dec->cfg.base.sort_pts && task_dec->valid) {
MppPktTs *pkt_ts = (MppPktTs*)mpp_mem_pool_get(dec->ts_pool);
mpp_assert(pkt_ts);
pkt_ts->pts = mpp_packet_get_pts(dec->mpp_pkt_in);
pkt_ts->dts = mpp_packet_get_dts(dec->mpp_pkt_in);
INIT_LIST_HEAD(&pkt_ts->link);
mpp_spinlock_lock(&dec->ts_lock);
list_add_tail(&pkt_ts->link, &dec->ts_link);
list_sort(NULL, &dec->ts_link, ts_cmp);
mpp_spinlock_unlock(&dec->ts_lock);
task->ts_cur.pts = mpp_packet_get_pts(dec->mpp_pkt_in);
task->ts_cur.dts = mpp_packet_get_dts(dec->mpp_pkt_in);
}
dec_release_input_packet(dec, 0);
}
@@ -1081,6 +1081,19 @@ static MPP_RET try_proc_dec_task(Mpp *mpp, DecTask *task)
if (task->wait.dec_pic_match)
return MPP_NOK;
if (dec->cfg.base.sort_pts) {
MppPktTs *pkt_ts = (MppPktTs *)mpp_mem_pool_get(dec->ts_pool);
mpp_assert(pkt_ts);
pkt_ts->pts = task->ts_cur.pts;
pkt_ts->dts = task->ts_cur.dts;
INIT_LIST_HEAD(&pkt_ts->link);
mpp_spinlock_lock(&dec->ts_lock);
list_add_tail(&pkt_ts->link, &dec->ts_link);
list_sort(NULL, &dec->ts_link, ts_cmp);
mpp_spinlock_unlock(&dec->ts_lock);
}
/* generating registers table */
mpp_clock_start(dec->clocks[DEC_HAL_GEN_REG]);
mpp_hal_reg_gen(dec->hal, &task->info);