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

[legacy] rename VpuApi class to VpuApiLegacy avoid conflict to old vpuai

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@1012 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenSiyong
2016-07-13 03:05:09 +00:00
parent 0b259c5837
commit 7c467a15cc
3 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
mpp/legacy/vpu_api.cpp
View File

@@ -38,7 +38,7 @@ static RK_S32 vpu_api_init(VpuCodecContext *ctx, RK_U8 *extraData, RK_U32 extra_
mpp_log("vpu_api_init fail, input invalid"); mpp_log("vpu_api_init fail, input invalid");
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
} }
VpuApi* api = (VpuApi*)(ctx->vpuApiObj); VpuApiLegacy* api = (VpuApiLegacy*)(ctx->vpuApiObj);
if (api == NULL) { if (api == NULL) {
mpp_log("vpu_api_init fail, vpu api invalid"); mpp_log("vpu_api_init fail, vpu api invalid");
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
@@ -54,7 +54,7 @@ static RK_S32 vpu_api_decode(VpuCodecContext *ctx, VideoPacket_t *pkt, DecoderOu
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
} }
VpuApi* api = (VpuApi*)(ctx->vpuApiObj); VpuApiLegacy* api = (VpuApiLegacy*)(ctx->vpuApiObj);
if (api == NULL) { if (api == NULL) {
mpp_log("vpu_api_decode fail, vpu api invalid"); mpp_log("vpu_api_decode fail, vpu api invalid");
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
@@ -69,7 +69,7 @@ static RK_S32 vpu_api_sendstream(VpuCodecContext *ctx, VideoPacket_t *pkt)
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
} }
VpuApi* api = (VpuApi*)(ctx->vpuApiObj); VpuApiLegacy* api = (VpuApiLegacy*)(ctx->vpuApiObj);
if (api == NULL) { if (api == NULL) {
mpp_log("vpu_api_sendstream fail, vpu api invalid"); mpp_log("vpu_api_sendstream fail, vpu api invalid");
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
@@ -85,7 +85,7 @@ static RK_S32 vpu_api_getframe(VpuCodecContext *ctx, DecoderOut_t *aDecOut)
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
} }
VpuApi* api = (VpuApi*)(ctx->vpuApiObj); VpuApiLegacy* api = (VpuApiLegacy*)(ctx->vpuApiObj);
if (api == NULL) { if (api == NULL) {
mpp_log("vpu_api_getframe fail, vpu api invalid"); mpp_log("vpu_api_getframe fail, vpu api invalid");
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
@@ -101,7 +101,7 @@ static RK_S32 vpu_api_sendframe(VpuCodecContext *ctx, EncInputStream_t *aEncInSt
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
} }
VpuApi* api = (VpuApi*)(ctx->vpuApiObj); VpuApiLegacy* api = (VpuApiLegacy*)(ctx->vpuApiObj);
if (api == NULL) { if (api == NULL) {
mpp_log("vpu_api_sendframe fail, vpu api invalid"); mpp_log("vpu_api_sendframe fail, vpu api invalid");
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
@@ -117,7 +117,7 @@ static RK_S32 vpu_api_getstream(VpuCodecContext *ctx, EncoderOut_t *aEncOut)
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
} }
VpuApi* api = (VpuApi*)(ctx->vpuApiObj); VpuApiLegacy* api = (VpuApiLegacy*)(ctx->vpuApiObj);
if (api == NULL) { if (api == NULL) {
mpp_log("vpu_api_getframe fail, vpu api invalid"); mpp_log("vpu_api_getframe fail, vpu api invalid");
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
@@ -135,7 +135,7 @@ static RK_S32 vpu_api_encode(VpuCodecContext *ctx, EncInputStream_t *aEncInStrm,
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
} }
VpuApi* api = (VpuApi*)(ctx->vpuApiObj); VpuApiLegacy* api = (VpuApiLegacy*)(ctx->vpuApiObj);
if (api == NULL) { if (api == NULL) {
mpp_log("vpu_api_encode fail, vpu api invalid"); mpp_log("vpu_api_encode fail, vpu api invalid");
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
@@ -152,7 +152,7 @@ static RK_S32 vpu_api_flush(VpuCodecContext *ctx)
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
} }
VpuApi* api = (VpuApi*)(ctx->vpuApiObj); VpuApiLegacy* api = (VpuApiLegacy*)(ctx->vpuApiObj);
if (api == NULL) { if (api == NULL) {
mpp_log("vpu_api_flush fail, vpu api invalid"); mpp_log("vpu_api_flush fail, vpu api invalid");
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
@@ -168,7 +168,7 @@ static RK_S32 vpu_api_control(VpuCodecContext *ctx, VPU_API_CMD cmdType, void *p
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
} }
VpuApi* api = (VpuApi*)(ctx->vpuApiObj); VpuApiLegacy* api = (VpuApiLegacy*)(ctx->vpuApiObj);
if (api == NULL) { if (api == NULL) {
mpp_log("vpu_api_decode fail, vpu api invalid"); mpp_log("vpu_api_decode fail, vpu api invalid");
return VPU_API_ERR_UNKNOW; return VPU_API_ERR_UNKNOW;
@@ -289,7 +289,7 @@ RK_S32 vpu_open_context(VpuCodecContext **ctx)
memset(s, 0, sizeof(VpuCodecContext)); memset(s, 0, sizeof(VpuCodecContext));
s->enableparsing = 1; s->enableparsing = 1;
VpuApi* api = new VpuApi(); VpuApiLegacy* api = new VpuApiLegacy();
if (api == NULL) { if (api == NULL) {
mpp_err("Vpu api object has not been properly allocated"); mpp_err("Vpu api object has not been properly allocated");
@@ -345,7 +345,7 @@ RK_S32 vpu_close_context(VpuCodecContext **ctx)
#endif #endif
if (s) { if (s) {
s->flush(s); s->flush(s);
VpuApi* api = (VpuApi*)(s->vpuApiObj); VpuApiLegacy* api = (VpuApiLegacy*)(s->vpuApiObj);
if (s->vpuApiObj) { if (s->vpuApiObj) {
delete api; delete api;
s->vpuApiObj = NULL; s->vpuApiObj = NULL;

24
mpp/legacy/vpu_api_legacy.cpp
View File

@@ -30,7 +30,7 @@
#define MAX_WRITE_HEIGHT (480) #define MAX_WRITE_HEIGHT (480)
#define MAX_WRITE_WIDTH (960) #define MAX_WRITE_WIDTH (960)
VpuApi::VpuApi() VpuApiLegacy::VpuApiLegacy()
{ {
mpp_log_f("in\n"); mpp_log_f("in\n");
mpp_ctx = NULL; mpp_ctx = NULL;
@@ -51,7 +51,7 @@ VpuApi::VpuApi()
mpp_log_f("ok\n"); mpp_log_f("ok\n");
} }
VpuApi::~VpuApi() VpuApiLegacy::~VpuApiLegacy()
{ {
mpp_log_f("in\n"); mpp_log_f("in\n");
if (fp) { if (fp) {
@@ -66,7 +66,7 @@ VpuApi::~VpuApi()
mpp_log_f("ok\n"); mpp_log_f("ok\n");
} }
RK_S32 VpuApi::init(VpuCodecContext *ctx, RK_U8 *extraData, RK_U32 extra_size) RK_S32 VpuApiLegacy::init(VpuCodecContext *ctx, RK_U8 *extraData, RK_U32 extra_size)
{ {
mpp_log_f("in\n"); mpp_log_f("in\n");
MPP_RET ret = MPP_OK; MPP_RET ret = MPP_OK;
@@ -107,7 +107,7 @@ RK_S32 VpuApi::init(VpuCodecContext *ctx, RK_U8 *extraData, RK_U32 extra_size)
return ret; return ret;
} }
RK_S32 VpuApi::flush(VpuCodecContext *ctx) RK_S32 VpuApiLegacy::flush(VpuCodecContext *ctx)
{ {
(void)ctx; (void)ctx;
mpp_log_f("in\n"); mpp_log_f("in\n");
@@ -119,7 +119,7 @@ RK_S32 VpuApi::flush(VpuCodecContext *ctx)
return 0; return 0;
} }
RK_S32 VpuApi::decode(VpuCodecContext *ctx, VideoPacket_t *pkt, DecoderOut_t *aDecOut) RK_S32 VpuApiLegacy::decode(VpuCodecContext *ctx, VideoPacket_t *pkt, DecoderOut_t *aDecOut)
{ {
mpp_log_f("in\n"); mpp_log_f("in\n");
(void)ctx; (void)ctx;
@@ -129,7 +129,7 @@ RK_S32 VpuApi::decode(VpuCodecContext *ctx, VideoPacket_t *pkt, DecoderOut_t *aD
return 0; return 0;
} }
RK_S32 VpuApi::decode_sendstream(VideoPacket_t *pkt) RK_S32 VpuApiLegacy::decode_sendstream(VideoPacket_t *pkt)
{ {
RK_S32 ret = MPP_OK; RK_S32 ret = MPP_OK;
MppPacket mpkt = NULL; MppPacket mpkt = NULL;
@@ -151,7 +151,7 @@ RK_S32 VpuApi::decode_sendstream(VideoPacket_t *pkt)
return ret; return ret;
} }
RK_S32 VpuApi:: decode_getoutframe(DecoderOut_t *aDecOut) RK_S32 VpuApiLegacy:: decode_getoutframe(DecoderOut_t *aDecOut)
{ {
RK_S32 ret = 0; RK_S32 ret = 0;
VPU_FRAME *vframe = (VPU_FRAME *)aDecOut->data; VPU_FRAME *vframe = (VPU_FRAME *)aDecOut->data;
@@ -291,7 +291,7 @@ RK_S32 VpuApi:: decode_getoutframe(DecoderOut_t *aDecOut)
return ret; return ret;
} }
RK_S32 VpuApi::encode(VpuCodecContext *ctx, EncInputStream_t *aEncInStrm, EncoderOut_t *aEncOut) RK_S32 VpuApiLegacy::encode(VpuCodecContext *ctx, EncInputStream_t *aEncInStrm, EncoderOut_t *aEncOut)
{ {
mpp_log_f("in\n"); mpp_log_f("in\n");
(void)ctx; (void)ctx;
@@ -301,7 +301,7 @@ RK_S32 VpuApi::encode(VpuCodecContext *ctx, EncInputStream_t *aEncInStrm, Encode
return 0; return 0;
} }
RK_S32 VpuApi::encoder_sendframe(VpuCodecContext *ctx, EncInputStream_t *aEncInStrm) RK_S32 VpuApiLegacy::encoder_sendframe(VpuCodecContext *ctx, EncInputStream_t *aEncInStrm)
{ {
mpp_log_f("in\n"); mpp_log_f("in\n");
(void)ctx; (void)ctx;
@@ -310,7 +310,7 @@ RK_S32 VpuApi::encoder_sendframe(VpuCodecContext *ctx, EncInputStream_t *aEncInS
return 0; return 0;
} }
RK_S32 VpuApi::encoder_getstream(VpuCodecContext *ctx, EncoderOut_t *aEncOut) RK_S32 VpuApiLegacy::encoder_getstream(VpuCodecContext *ctx, EncoderOut_t *aEncOut)
{ {
mpp_log_f("in\n"); mpp_log_f("in\n");
(void)ctx; (void)ctx;
@@ -319,7 +319,7 @@ RK_S32 VpuApi::encoder_getstream(VpuCodecContext *ctx, EncoderOut_t *aEncOut)
return 0; return 0;
} }
RK_S32 VpuApi::perform(RK_U32 cmd, RK_U32 *data) RK_S32 VpuApiLegacy::perform(RK_U32 cmd, RK_U32 *data)
{ {
mpp_log_f("in\n"); mpp_log_f("in\n");
(void)cmd; (void)cmd;
@@ -342,7 +342,7 @@ static RK_U32 default_align_16(RK_U32 val)
{ {
return MPP_ALIGN(val, 16); return MPP_ALIGN(val, 16);
} }
RK_S32 VpuApi::control(VpuCodecContext *ctx, VPU_API_CMD cmd, void *param) RK_S32 VpuApiLegacy::control(VpuCodecContext *ctx, VPU_API_CMD cmd, void *param)
{ {
mpp_log_f("in\n"); mpp_log_f("in\n");

10
mpp/legacy/vpu_api_legacy.h
View File

@@ -14,19 +14,19 @@
* limitations under the License. * limitations under the License.
*/ */
#ifndef _VPU_API_H_ #ifndef _VPU_API_LEGACY_H_
#define _VPU_API_H_ #define _VPU_API_LEGACY_H_
#include "vpu_api.h" #include "vpu_api.h"
#include "rk_mpi.h" #include "rk_mpi.h"
#include <stdio.h> #include <stdio.h>
#define OMX_BUFFERFLAG_EOS 0x00000001 #define OMX_BUFFERFLAG_EOS 0x00000001
class VpuApi class VpuApiLegacy
{ {
public: public:
VpuApi(); VpuApiLegacy();
~VpuApi(); ~VpuApiLegacy();
RK_S32 init(VpuCodecContext *ctx, RK_U8 *extraData, RK_U32 extra_size); RK_S32 init(VpuCodecContext *ctx, RK_U8 *extraData, RK_U32 extra_size);
RK_S32 flush(VpuCodecContext *ctx); RK_S32 flush(VpuCodecContext *ctx);