diff --git a/mpp/codec/dec/h264/h264d_api.c b/mpp/codec/dec/h264/h264d_api.c index 34b6a1a4..df99e42f 100644 --- a/mpp/codec/dec/h264/h264d_api.c +++ b/mpp/codec/dec/h264/h264d_api.c @@ -56,7 +56,7 @@ MPP_RET h264d_control(void *decoder, RK_S32 cmd_type, void *param) } -MPP_RET h264d_parser(void *decoder, MppPacket pkt, HalDecTask *task) +MPP_RET h264d_parse(void *decoder, MppPacket pkt, HalDecTask *task) { (void)decoder; (void)pkt; @@ -64,14 +64,14 @@ MPP_RET h264d_parser(void *decoder, MppPacket pkt, HalDecTask *task) return MPP_OK; } -const MppDecParser api_h264d_parser = { +const MppDecParser h264d_parser = { "h264d_parser", MPP_VIDEO_CodingAVC, 0, 0, h264d_init, h264d_deinit, - h264d_parser, + h264d_parse, h264d_reset, h264d_flush, h264d_control, diff --git a/mpp/codec/inc/h264d_api.h b/mpp/codec/inc/h264d_api.h index 7490f7ac..9da19521 100644 --- a/mpp/codec/inc/h264d_api.h +++ b/mpp/codec/inc/h264d_api.h @@ -23,14 +23,14 @@ extern "C" { #endif -extern const MppDecParser api_h264d_parser; +extern const MppDecParser h264d_parser; MPP_RET h264d_init (void *decoder, MppParserInitCfg *cfg); MPP_RET h264d_deinit (void *decoder); MPP_RET h264d_reset (void *decoder); MPP_RET h264d_flush (void *decoder); MPP_RET h264d_control(void *decoder, RK_S32 cmd_type, void *param); -MPP_RET h264d_parser (void *decoder, MppPacket pkt, HalDecTask *task); +MPP_RET h264d_parse (void *decoder, MppPacket pkt, HalDecTask *task); #ifdef __cplusplus } diff --git a/mpp/codec/mpp_dec.cpp b/mpp/codec/mpp_dec.cpp index 5f3334e7..564787ad 100644 --- a/mpp/codec/mpp_dec.cpp +++ b/mpp/codec/mpp_dec.cpp @@ -36,7 +36,7 @@ * all decoder static register here */ static const MppDecParser *parsers[] = { - &api_h264d_parser, + &h264d_parser, &dummy_dec_parser, }; diff --git a/test/mpi_test.c b/test/mpi_test.c index 22d563d0..7f1a2c44 100644 --- a/test/mpi_test.c +++ b/test/mpi_test.c @@ -64,7 +64,7 @@ int main() mpp_log("mpi_test decoder test start\n"); // decoder demo - ret = mpp_init(&ctx, &mpi, MPP_CTX_DEC, MPP_VIDEO_CodingAVC); + ret = mpp_init(&ctx, &mpi, MPP_CTX_DEC, MPP_VIDEO_CodingUnused); if (MPP_OK != ret) { mpp_err("mpp_init failed\n"); goto MPP_TEST_FAILED; @@ -151,7 +151,7 @@ int main() mpp_log("mpi_test encoder test start\n"); // encoder demo - ret = mpp_init(&ctx, &mpi, MPP_CTX_ENC, MPP_VIDEO_CodingAVC); + ret = mpp_init(&ctx, &mpi, MPP_CTX_ENC, MPP_VIDEO_CodingUnused); if (MPP_OK != ret) { mpp_err("mpp_init failed\n"); goto MPP_TEST_FAILED;