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

[mpg4d]: fixup the compiler warnings

Browse Source 
Change-Id: I70b6731258aaf34ef6f5e605ae8332218dab710b
Signed-off-by: Randy Li <randy.li@rock-chips.com>
This commit is contained in:
Randy Li
2017-08-17 16:52:20 +08:00
parent 7790a03213
commit 28027cdaa4
4 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
mpp/codec/dec/mpg4/mpg4d_api.c
View File

@@ -52,7 +52,7 @@ typedef struct {
Mpg4dParser parser; Mpg4dParser parser;
} Mpg4dCtx; } Mpg4dCtx;
MPP_RET mpg4d_init(void *dec, ParserCfg *cfg) static MPP_RET mpg4d_init(void *dec, ParserCfg *cfg)
{ {
Mpg4dParser parser = NULL; Mpg4dParser parser = NULL;
MppPacket task_pkt = NULL; MppPacket task_pkt = NULL;
@@ -113,7 +113,7 @@ ERR_RET:
return ret; return ret;
} }
MPP_RET mpg4d_deinit(void *dec) static MPP_RET mpg4d_deinit(void *dec)
{ {
Mpg4dCtx *p; Mpg4dCtx *p;
if (NULL == dec) { if (NULL == dec) {
@@ -138,7 +138,7 @@ MPP_RET mpg4d_deinit(void *dec)
return MPP_OK; return MPP_OK;
} }
MPP_RET mpg4d_reset(void *dec) static MPP_RET mpg4d_reset(void *dec)
{ {
if (NULL == dec) { if (NULL == dec) {
mpp_err_f("found NULL intput\n"); mpp_err_f("found NULL intput\n");
@@ -150,8 +150,7 @@ MPP_RET mpg4d_reset(void *dec)
return mpp_mpg4_parser_reset(p->parser); return mpp_mpg4_parser_reset(p->parser);
} }
static MPP_RET mpg4d_flush(void *dec)
MPP_RET mpg4d_flush(void *dec)
{ {
if (NULL == dec) { if (NULL == dec) {
mpp_err_f("found NULL intput\n"); mpp_err_f("found NULL intput\n");
@@ -162,8 +161,7 @@ MPP_RET mpg4d_flush(void *dec)
return mpp_mpg4_parser_flush(p->parser); return mpp_mpg4_parser_flush(p->parser);
} }
static MPP_RET mpg4d_control(void *dec, RK_S32 cmd_type, void *param)
MPP_RET mpg4d_control(void *dec, RK_S32 cmd_type, void *param)
{ {
Mpg4dCtx *p; Mpg4dCtx *p;
@@ -182,7 +180,7 @@ MPP_RET mpg4d_control(void *dec, RK_S32 cmd_type, void *param)
return MPP_OK; return MPP_OK;
} }
MPP_RET mpg4d_prepare(void *dec, MppPacket pkt, HalDecTask *task) static MPP_RET mpg4d_prepare(void *dec, MppPacket pkt, HalDecTask *task)
{ {
Mpg4dCtx *p; Mpg4dCtx *p;
RK_U8 *pos; RK_U8 *pos;
@@ -202,7 +200,6 @@ MPP_RET mpg4d_prepare(void *dec, MppPacket pkt, HalDecTask *task)
if (eos && !length) { if (eos && !length) {
task->valid = 0; task->valid = 0;
task->flags.eos = 1; task->flags.eos = 1;
mpp_log("mpeg4d flush eos");
mpg4d_flush(dec); mpg4d_flush(dec);
return MPP_OK; return MPP_OK;
} }
@@ -280,7 +277,7 @@ MPP_RET mpg4d_prepare(void *dec, MppPacket pkt, HalDecTask *task)
return MPP_OK; return MPP_OK;
} }
MPP_RET mpg4d_parse(void *dec, HalDecTask *task) static MPP_RET mpg4d_parse(void *dec, HalDecTask *task)
{ {
MPP_RET ret; MPP_RET ret;
Mpg4dCtx *p; Mpg4dCtx *p;
@@ -310,7 +307,7 @@ MPP_RET mpg4d_parse(void *dec, HalDecTask *task)
return MPP_OK; return MPP_OK;
} }
MPP_RET mpg4d_callback(void *dec, void *err_info) static MPP_RET mpg4d_callback(void *dec, void *err_info)
{ {
(void)dec; (void)dec;
(void)err_info; (void)err_info;
@@ -318,17 +315,17 @@ MPP_RET mpg4d_callback(void *dec, void *err_info)
} }
const ParserApi api_mpg4d_parser = { const ParserApi api_mpg4d_parser = {
"api_mpg4d_parser", .name = "api_mpg4d_parser",
MPP_VIDEO_CodingMPEG4, .coding = MPP_VIDEO_CodingMPEG4,
sizeof(Mpg4dCtx), .ctx_size = sizeof(Mpg4dCtx),
0, .flag = 0,
mpg4d_init, .init = mpg4d_init,
mpg4d_deinit, .deinit = mpg4d_deinit,
mpg4d_prepare, .prepare = mpg4d_prepare,
mpg4d_parse, .parse = mpg4d_parse,
mpg4d_reset, .reset = mpg4d_reset,
mpg4d_flush, .flush = mpg4d_flush,
mpg4d_control, .control = mpg4d_control,
mpg4d_callback, .callback = mpg4d_callback,
}; };

1
mpp/codec/dec/mpg4/mpg4d_parser.c
View File

@@ -796,7 +796,6 @@ static MPP_RET mpeg4_parse_profile_level(Mpg4dParserImpl *p, BitReadCtx_t *bc)
{ {
READ_BITS(bc, 4, &p->profile); READ_BITS(bc, 4, &p->profile);
READ_BITS(bc, 4, &p->level); READ_BITS(bc, 4, &p->level);
mpp_log("mpeg4 stream profile %d level %d\n", p->profile, p->level);
return MPP_OK; return MPP_OK;
__BITREAD_ERR: __BITREAD_ERR:

1
mpp/hal/vpu/mpg4d/hal_m4vd_vdpu1.c
View File

@@ -31,6 +31,7 @@
#include "mpg4d_syntax.h" #include "mpg4d_syntax.h"
#include "hal_mpg4d_api.h" #include "hal_mpg4d_api.h"
#include "hal_m4vd_com.h" #include "hal_m4vd_com.h"
#include "hal_m4vd_vdpu1.h"
#include "hal_m4vd_vdpu1_reg.h" #include "hal_m4vd_vdpu1_reg.h"
static void vdpu1_mpg4d_setup_regs_by_syntax(hal_mpg4_ctx *ctx, MppSyntax syntax) static void vdpu1_mpg4d_setup_regs_by_syntax(hal_mpg4_ctx *ctx, MppSyntax syntax)

1
mpp/hal/vpu/mpg4d/hal_m4vd_vdpu2.c
View File

@@ -31,6 +31,7 @@
#include "mpg4d_syntax.h" #include "mpg4d_syntax.h"
#include "hal_mpg4d_api.h" #include "hal_mpg4d_api.h"
#include "hal_m4vd_com.h" #include "hal_m4vd_com.h"
#include "hal_m4vd_vdpu2.h"
#include "hal_m4vd_vdpu2_reg.h" #include "hal_m4vd_vdpu2_reg.h"
static void vdpu2_mpg4d_setup_regs_by_syntax(hal_mpg4_ctx *ctx, MppSyntax syntax) static void vdpu2_mpg4d_setup_regs_by_syntax(hal_mpg4_ctx *ctx, MppSyntax syntax)