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

[mpi_test]: set mpi_test coding to MPP_VIDEO_CodingUnused, and change name of h264d parser api

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@223 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-09-06 20:16:16 +00:00
parent 1154f07cfc
commit 4145133673
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mpp/codec/dec/h264/h264d_api.c
View File

@@ -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)decoder;
(void)pkt; (void)pkt;
@@ -64,14 +64,14 @@ MPP_RET h264d_parser(void *decoder, MppPacket pkt, HalDecTask *task)
return MPP_OK; return MPP_OK;
} }
const MppDecParser api_h264d_parser = { const MppDecParser h264d_parser = {
"h264d_parser", "h264d_parser",
MPP_VIDEO_CodingAVC, MPP_VIDEO_CodingAVC,
0, 0,
0, 0,
h264d_init, h264d_init,
h264d_deinit, h264d_deinit,
h264d_parser, h264d_parse,
h264d_reset, h264d_reset,
h264d_flush, h264d_flush,
h264d_control, h264d_control,

4
mpp/codec/inc/h264d_api.h
View File

@@ -23,14 +23,14 @@
extern "C" { extern "C" {
#endif #endif
extern const MppDecParser api_h264d_parser; extern const MppDecParser h264d_parser;
MPP_RET h264d_init (void *decoder, MppParserInitCfg *cfg); MPP_RET h264d_init (void *decoder, MppParserInitCfg *cfg);
MPP_RET h264d_deinit (void *decoder); MPP_RET h264d_deinit (void *decoder);
MPP_RET h264d_reset (void *decoder); MPP_RET h264d_reset (void *decoder);
MPP_RET h264d_flush (void *decoder); MPP_RET h264d_flush (void *decoder);
MPP_RET h264d_control(void *decoder, RK_S32 cmd_type, void *param); 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 #ifdef __cplusplus
} }

2
mpp/codec/mpp_dec.cpp
View File

@@ -36,7 +36,7 @@
* all decoder static register here * all decoder static register here
*/ */
static const MppDecParser *parsers[] = { static const MppDecParser *parsers[] = {
&api_h264d_parser, &h264d_parser,
&dummy_dec_parser, &dummy_dec_parser,
}; };

4
test/mpi_test.c
View File

@@ -64,7 +64,7 @@ int main()
mpp_log("mpi_test decoder test start\n"); mpp_log("mpi_test decoder test start\n");
// decoder demo // 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) { if (MPP_OK != ret) {
mpp_err("mpp_init failed\n"); mpp_err("mpp_init failed\n");
goto MPP_TEST_FAILED; goto MPP_TEST_FAILED;
@@ -151,7 +151,7 @@ int main()
mpp_log("mpi_test encoder test start\n"); mpp_log("mpi_test encoder test start\n");
// encoder demo // 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) { if (MPP_OK != ret) {
mpp_err("mpp_init failed\n"); mpp_err("mpp_init failed\n");
goto MPP_TEST_FAILED; goto MPP_TEST_FAILED;