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

[mpi]: change mpp interface

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@157 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-08-25 01:40:36 +00:00
parent f73ae488e9
commit b298253516
4 changed files with 126 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
inc/rk_mpi.h
View File

@@ -24,6 +24,12 @@
#include "mpp_buffer.h" #include "mpp_buffer.h"
#include "mpp_frame.h" #include "mpp_frame.h"
typedef enum {
MPP_CTX_DEC,
MPP_CTX_ENC,
MPP_CTX_BUTT,
} MppCtxType;
/** /**
* Enumeration used to define the possible video compression codings. * Enumeration used to define the possible video compression codings.
* NOTE: This essentially refers to file extensions. If the coding is * NOTE: This essentially refers to file extensions. If the coding is
@@ -34,68 +40,112 @@
* up to the codec to handle this. * up to the codec to handle this.
*/ */
//sync with the omx_video.h //sync with the omx_video.h
typedef enum MPI_VIDEO_CODINGTYPE { typedef enum {
MPI_VIDEO_CodingUnused, /**< Value when coding is N/A */ MPP_VIDEO_CodingUnused, /**< Value when coding is N/A */
MPI_VIDEO_CodingAutoDetect, /**< Autodetection of coding type */ MPP_VIDEO_CodingAutoDetect, /**< Autodetection of coding type */
MPI_VIDEO_CodingMPEG2, /**< AKA: H.262 */ MPP_VIDEO_CodingMPEG2, /**< AKA: H.262 */
MPI_VIDEO_CodingH263, /**< H.263 */ MPP_VIDEO_CodingH263, /**< H.263 */
MPI_VIDEO_CodingMPEG4, /**< MPEG-4 */ MPP_VIDEO_CodingMPEG4, /**< MPEG-4 */
MPI_VIDEO_CodingWMV, /**< Windows Media Video (WMV1,WMV2,WMV3)*/ MPP_VIDEO_CodingWMV, /**< Windows Media Video (WMV1,WMV2,WMV3)*/
MPI_VIDEO_CodingRV, /**< all versions of Real Video */ MPP_VIDEO_CodingRV, /**< all versions of Real Video */
MPI_VIDEO_CodingAVC, /**< H.264/AVC */ MPP_VIDEO_CodingAVC, /**< H.264/AVC */
MPI_VIDEO_CodingMJPEG, /**< Motion JPEG */ MPP_VIDEO_CodingMJPEG, /**< Motion JPEG */
MPI_VIDEO_CodingVP8, /**< VP8 */ MPP_VIDEO_CodingVP8, /**< VP8 */
MPI_VIDEO_CodingVP9, /**< VP9 */ MPP_VIDEO_CodingVP9, /**< VP9 */
MPI_VIDEO_CodingVC1 = 0x01000000, /**< Windows Media Video (WMV1,WMV2,WMV3)*/ MPP_VIDEO_CodingVC1 = 0x01000000, /**< Windows Media Video (WMV1,WMV2,WMV3)*/
MPI_VIDEO_CodingFLV1, /**< Sorenson H.263 */ MPP_VIDEO_CodingFLV1, /**< Sorenson H.263 */
MPI_VIDEO_CodingDIVX3, /**< DIVX3 */ MPP_VIDEO_CodingDIVX3, /**< DIVX3 */
MPI_VIDEO_CodingVP6, MPP_VIDEO_CodingVP6,
MPI_VIDEO_CodingHEVC, /**< H.265/HEVC */ MPP_VIDEO_CodingHEVC, /**< H.265/HEVC */
MPI_VIDEO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */ MPP_VIDEO_CodingKhronosExtensions = 0x6F000000, /**< Reserved region for introducing Khronos Standard Extensions */
MPI_VIDEO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */ MPP_VIDEO_CodingVendorStartUnused = 0x7F000000, /**< Reserved region for introducing Vendor Extensions */
MPI_VIDEO_CodingMax = 0x7FFFFFFF MPP_VIDEO_CodingMax = 0x7FFFFFFF
} MPI_VIDEO_CODINGTYPE; } MppCodingType;
typedef enum MPI_CODEC_TYPE {
MPI_CODEC_NONE,
MPI_CODEC_DECODER,
MPI_CODEC_ENCODER,
MPI_CODEC_BUTT,
} MPI_CODEC_TYPE;
typedef enum { typedef enum {
MPI_MPP_CMD_BASE = 0, MPP_CMD_BASE = 0,
MPI_MPP_ENABLE_DEINTERLACE, MPP_ENABLE_DEINTERLACE,
MPI_HAL_CMD_BASE = 0x10000, MPP_HAL_CMD_BASE = 0x10000,
MPI_OSAL_CMD_BASE = 0x20000, MPP_OSAL_CMD_BASE = 0x20000,
MPI_OSAL_SET_VPUMEM_CONTEXT, MPP_OSAL_SET_VPUMEM_CONTEXT,
MPI_CODEC_CMD_BASE = 0x30000, MPP_CODEC_CMD_BASE = 0x30000,
MPI_CODEC_INFO_CHANGE, MPP_CODEC_INFO_CHANGE,
MPI_CODEC_SET_DEFAULT_WIDTH_HEIGH, MPP_CODEC_SET_DEFAULT_WIDTH_HEIGH,
MPI_DEC_CMD_BASE = 0x40000, MPP_DEC_CMD_BASE = 0x40000,
MPI_DEC_USE_PRESENT_TIME_ORDER, MPP_DEC_USE_PRESENT_TIME_ORDER,
MPP_DEC_SET_VC1_EXTRA_DATA,
MPP_DEC_SET_VP6_ID,
MPI_ENC_CMD_BASE = 0x50000, MPP_ENC_CMD_BASE = 0x50000,
MPI_ENC_SETCFG, MPP_ENC_SETCFG,
MPI_ENC_GETCFG, MPP_ENC_GETCFG,
MPI_ENC_SETFORMAT, MPP_ENC_SETFORMAT,
MPI_ENC_SETIDRFRAME, MPP_ENC_SETIDRFRAME,
} MPI_CMD; } MpiCmd;
typedef void* MppCtx; typedef void* MppCtx;
typedef void* MppParam; typedef void* MppParam;
/*
* in decoder mode application need to specify the coding type first
* send a stream header to mpi ctx using parameter data / size
* and decoder will try to decode the
*/
typedef struct {
/*
* input source data format
*/
RK_S32 width;
RK_S32 height;
RK_S32 format;
/*
* rate control parameter
*
* rc_mode - rate control mode
* 0 - fix qp mode
* 1 - constant bit rate mode (CBR)
* 2 - variable bit rate mode (VBR)
* bps - target bit rate, unit: bit per second
* fps_in - input frame rate, unit: frame per second
* fps_out - output frame rate, unit: frame per second
* qp - constant qp for fix qp mode
* initial qp for CBR / VBR
* gop - gap between Intra frame
* 0 for only 1 I frame the rest are all P frames
* 1 for all I frame
* 2 for I P I P I P
* 3 for I P P I P P
* etc...
*/
RK_S32 rc_mode;
RK_S32 bps;
RK_S32 fps_in;
RK_S32 fps_out;
RK_S32 qp;
RK_S32 gop;
/*
* stream feature parameter
*/
RK_S32 profile;
RK_S32 level;
RK_S32 cabac_en;
RK_S32 trans8x8_en;
} MppEncConfig;
typedef struct { typedef struct {
RK_U32 size; RK_U32 size;
RK_U32 version; RK_U32 version;
MPP_RET (*init)(MppCtx ctx, MppPacket packet); MPP_RET (*config)(MppCtx ctx, MppEncConfig cfg);
// sync interface // sync interface
MPP_RET (*decode)(MppCtx ctx, MppPacket packet, MppFrame *frame); MPP_RET (*decode)(MppCtx ctx, MppPacket packet, MppFrame *frame);
MPP_RET (*encode)(MppCtx ctx, MppFrame frame, MppPacket *packet); MPP_RET (*encode)(MppCtx ctx, MppFrame frame, MppPacket *packet);
@@ -108,7 +158,7 @@ typedef struct {
MPP_RET (*encode_get_packet)(MppCtx ctx, MppPacket *packet); MPP_RET (*encode_get_packet)(MppCtx ctx, MppPacket *packet);
MPP_RET (*flush)(MppCtx ctx); MPP_RET (*flush)(MppCtx ctx);
MPP_RET (*control)(MppCtx ctx, MPI_CMD cmd, MppParam param); MPP_RET (*control)(MppCtx ctx, MpiCmd cmd, MppParam param);
RK_U32 reserv[16]; RK_U32 reserv[16];
} MppApi; } MppApi;
@@ -121,7 +171,7 @@ extern "C" {
/* /*
* mpp interface * mpp interface
*/ */
MPP_RET mpp_init(MppCtx *ctx, MppApi **mpi); MPP_RET mpp_init(MppCtx *ctx, MppApi **mpi, MppCtxType type, MppCodingType coding);
MPP_RET mpp_deinit(MppCtx ctx); MPP_RET mpp_deinit(MppCtx ctx);
#ifdef __cplusplus #ifdef __cplusplus

20
mpp/mpi.cpp
View File

@@ -24,10 +24,10 @@
#include "mpp_mem.h" #include "mpp_mem.h"
#include "mpi_impl.h" #include "mpi_impl.h"
static MPP_RET mpi_init(MppCtx ctx, MppPacket packet) static MPP_RET mpi_config(MppCtx ctx, MppEncConfig cfg)
{ {
(void)ctx; (void)ctx;
(void)packet; (void)cfg;
MPI_FUNCTION_ENTER(); MPI_FUNCTION_ENTER();
MPI_FUNCTION_LEAVE(); MPI_FUNCTION_LEAVE();
@@ -105,7 +105,7 @@ static MPP_RET mpi_flush(MppCtx ctx)
return MPP_OK; return MPP_OK;
} }
static MPP_RET mpi_control(MppCtx ctx, MPI_CMD cmd, MppParam param) static MPP_RET mpi_control(MppCtx ctx, MpiCmd cmd, MppParam param)
{ {
(void)ctx; (void)ctx;
(void)cmd; (void)cmd;
@@ -119,7 +119,7 @@ static MPP_RET mpi_control(MppCtx ctx, MPI_CMD cmd, MppParam param)
static MppApi mpp_api = { static MppApi mpp_api = {
sizeof(mpp_api), sizeof(mpp_api),
1, 1,
mpi_init, mpi_config,
mpi_decode, mpi_decode,
mpi_encode, mpi_encode,
mpi_decode_put_packet, mpi_decode_put_packet,
@@ -131,14 +131,16 @@ static MppApi mpp_api = {
{0}, {0},
}; };
MPP_RET mpp_init(MppCtx *ctx, MppApi **mpi) MPP_RET mpp_init(MppCtx *ctx, MppApi **mpi, MppCtxType type, MppCodingType coding)
{ {
MpiImpl *p; MpiImpl *p;
MPI_FUNCTION_ENTER(); MPI_FUNCTION_ENTER();
if (NULL == ctx || NULL == mpi) { if (NULL == ctx || NULL == mpi ||
mpp_err("mpp_init input ctx %p mpi %p found null pointer\n", type >= MPP_CTX_BUTT ||
ctx, mpi); coding >= MPP_VIDEO_CodingMax) {
mpp_err("mpp_init invalid input ctx %p mpi %p type %d coding %d\n",
ctx, mpi, type, coding);
return MPP_ERR_NULL_PTR; return MPP_ERR_NULL_PTR;
} }
@@ -151,6 +153,8 @@ MPP_RET mpp_init(MppCtx *ctx, MppApi **mpi)
memset(p, 0, sizeof(*p)); memset(p, 0, sizeof(*p));
p->api = &mpp_api; p->api = &mpp_api;
p->check = p; p->check = p;
p->type = type;
p->coding = coding;
*ctx = p; *ctx = p;
*mpi = p->api; *mpi = p->api;

3
mpp/mpi_impl.h
View File

@@ -36,6 +36,9 @@ typedef struct MpiImpl_t MpiImpl;
struct MpiImpl_t { struct MpiImpl_t {
MpiImpl *check; MpiImpl *check;
MppCtxType type;
MppCodingType coding;
MppApi *api; MppApi *api;
void *ctx; void *ctx;
}; };

19
test/mpi_test.c
View File

@@ -36,6 +36,7 @@ int main()
MPP_RET ret; MPP_RET ret;
MppCtx ctx = NULL; MppCtx ctx = NULL;
MppApi *mpi = NULL; MppApi *mpi = NULL;
MppEncConfig cfg;
MppPacket dec_in = NULL; MppPacket dec_in = NULL;
MppFrame dec_out = NULL; MppFrame dec_out = NULL;
@@ -43,7 +44,7 @@ int main()
MppFrame enc_in = NULL; MppFrame enc_in = NULL;
MppPacket enc_out = NULL; MppPacket enc_out = NULL;
MPI_CMD cmd = MPI_MPP_CMD_BASE; MpiCmd cmd = MPP_CMD_BASE;
MppParam param = NULL; MppParam param = NULL;
RK_S32 i; RK_S32 i;
@@ -63,17 +64,13 @@ 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); ret = mpp_init(&ctx, &mpi, MPP_CTX_DEC, MPP_VIDEO_CodingAVC);
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;
} }
ret = mpi->init(ctx, dec_in); // NOTE: decoder do not need control function
if (MPP_OK != ret) {
mpp_err("mpi->init failed\n");
goto MPP_TEST_FAILED;
}
ret = mpi->control(ctx, cmd, param); ret = mpi->control(ctx, cmd, param);
if (MPP_OK != ret) { if (MPP_OK != ret) {
@@ -155,15 +152,17 @@ 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); ret = mpp_init(&ctx, &mpi, MPP_CTX_ENC, MPP_VIDEO_CodingAVC);
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;
} }
ret = mpi->init(ctx, dec_in); memset(&cfg, 0, sizeof(cfg));
ret = mpi->config(ctx, cfg);
if (MPP_OK != ret) { if (MPP_OK != ret) {
mpp_err("mpi->init failed\n"); mpp_err("mpi->config failed\n");
goto MPP_TEST_FAILED; goto MPP_TEST_FAILED;
} }