Commit 3c4e4c1c authored by Dafna Hirschfeld's avatar Dafna Hirschfeld
Browse files

replace CodecInst with struct CodecInst


Signed-off-by: Dafna Hirschfeld's avatarDafna Hirschfeld <dafna.hirschfeld@collabora.com>
parent 459aaec0
......@@ -1032,8 +1032,8 @@ int vdi_init(unsigned long coreIdx)
#endif
for (i = 0; i < MAX_NUM_INSTANCE; i++) {
pCodecInst = (int *)vdi->pvip->codecInstPool[i];
pCodecInst[1] = i; // indicate instIndex of CodecInst
pCodecInst[0] = 0; // indicate inUse of CodecInst
pCodecInst[1] = i; // indicate instIndex of struct CodecInst
pCodecInst[0] = 0; // indicate inUse of struct CodecInst
}
vdi->pvip->instance_pool_inited = 1;
}
......
......@@ -94,7 +94,7 @@ typedef enum {
} MemTypes;
typedef struct vpu_instance_pool_t {
unsigned char codecInstPool[MAX_NUM_INSTANCE][MAX_INST_HANDLE_SIZE]; // Since VDI don't know the size of CodecInst structure, VDI should have the enough space not to overflow.
unsigned char codecInstPool[MAX_NUM_INSTANCE][MAX_INST_HANDLE_SIZE]; // Since VDI don't know the size of struct CodecInst structure, VDI should have the enough space not to overflow.
#ifdef CNM_FPGA_PLATFORM
char reserved[32];
#endif /* CNM_FPGA_PLATFORM */
......
......@@ -175,7 +175,7 @@ enum RetCode ProductVpuClearInterrupt(uint32_t coreIdx, uint32_t flags)
return ret;
}
enum RetCode ProductVpuDecBuildUpOpenParam(CodecInst* pCodec, struct DecOpenParam* param)
enum RetCode ProductVpuDecBuildUpOpenParam(struct CodecInst* pCodec, struct DecOpenParam* param)
{
int32_t productId;
uint32_t coreIdx;
......@@ -195,7 +195,7 @@ enum RetCode ProductVpuDecBuildUpOpenParam(CodecInst* pCodec, struct DecOpenPara
return ret;
}
PhysicalAddress ProductVpuDecGetRdPtr(CodecInst* instance)
PhysicalAddress ProductVpuDecGetRdPtr(struct CodecInst* instance)
{
int32_t productId;
uint32_t coreIdx;
......@@ -228,7 +228,7 @@ PhysicalAddress ProductVpuDecGetRdPtr(CodecInst* instance)
return retRdPtr;
}
enum RetCode ProductVpuEncBuildUpOpenParam(CodecInst* pCodec, struct EncOpenParam* param)
enum RetCode ProductVpuEncBuildUpOpenParam(struct CodecInst* pCodec, struct EncOpenParam* param)
{
int32_t productId;
uint32_t coreIdx;
......@@ -310,7 +310,7 @@ enum RetCode ProductVpuDecCheckOpenParam(struct DecOpenParam* param)
return RETCODE_SUCCESS;
}
enum RetCode ProductVpuDecInitSeq(CodecInst* instance)
enum RetCode ProductVpuDecInitSeq(struct CodecInst* instance)
{
int productId;
enum RetCode ret = RETCODE_NOT_FOUND_VPU_DEVICE;
......@@ -328,7 +328,7 @@ enum RetCode ProductVpuDecInitSeq(CodecInst* instance)
return ret;
}
enum RetCode ProductVpuDecFiniSeq(CodecInst* instance)
enum RetCode ProductVpuDecFiniSeq(struct CodecInst* instance)
{
int productId;
enum RetCode ret = RETCODE_NOT_FOUND_VPU_DEVICE;
......@@ -346,7 +346,7 @@ enum RetCode ProductVpuDecFiniSeq(CodecInst* instance)
return ret;
}
enum RetCode ProductVpuDecGetSeqInfo(CodecInst* instance, struct DecInitialInfo* info)
enum RetCode ProductVpuDecGetSeqInfo(struct CodecInst* instance, struct DecInitialInfo* info)
{
int productId;
enum RetCode ret = RETCODE_NOT_FOUND_VPU_DEVICE;
......@@ -364,7 +364,7 @@ enum RetCode ProductVpuDecGetSeqInfo(CodecInst* instance, struct DecInitialInfo*
return ret;
}
enum RetCode ProductVpuDecCheckCapability(CodecInst* instance)
enum RetCode ProductVpuDecCheckCapability(struct CodecInst* instance)
{
struct DecInfo* pDecInfo;
struct VpuAttr* pAttr = &g_VpuCoreAttributes[instance->coreIdx];
......@@ -386,7 +386,7 @@ enum RetCode ProductVpuDecCheckCapability(CodecInst* instance)
return RETCODE_SUCCESS;
}
enum RetCode ProductVpuDecode(CodecInst* instance, struct DecParam* option)
enum RetCode ProductVpuDecode(struct CodecInst* instance, struct DecParam* option)
{
int productId;
enum RetCode ret = RETCODE_NOT_FOUND_VPU_DEVICE;
......@@ -404,7 +404,7 @@ enum RetCode ProductVpuDecode(CodecInst* instance, struct DecParam* option)
return ret;
}
enum RetCode ProductVpuDecGetResult(CodecInst* instance, struct DecOutputInfo* result)
enum RetCode ProductVpuDecGetResult(struct CodecInst* instance, struct DecOutputInfo* result)
{
int productId;
enum RetCode ret = RETCODE_NOT_FOUND_VPU_DEVICE;
......@@ -427,7 +427,7 @@ enum RetCode ProductVpuDecGetResult(CodecInst* instance, struct DecOutputInfo*
/************************************************************************/
enum RetCode ProductVpuDecSetBitstreamFlag(
CodecInst* instance,
struct CodecInst* instance,
BOOL running,
int32_t size
)
......@@ -461,7 +461,7 @@ enum RetCode ProductVpuDecSetBitstreamFlag(
* \param stride stride of framebuffer in pixel.
*/
enum RetCode ProductVpuAllocateFramebuffer(
CodecInst* inst, struct FrameBuffer* fbArr, enum TiledMapType mapType, int32_t num,
struct CodecInst* inst, struct FrameBuffer* fbArr, enum TiledMapType mapType, int32_t num,
int32_t stride, int32_t height, enum FrameBufferFormat format,
BOOL cbcrInterleave, BOOL nv21, int32_t endian,
vpu_buffer_t* vb, int32_t gdiIndex,
......@@ -544,7 +544,7 @@ enum RetCode ProductVpuAllocateFramebuffer(
return ret;
}
enum RetCode ProductVpuRegisterFramebuffer(CodecInst* instance)
enum RetCode ProductVpuRegisterFramebuffer(struct CodecInst* instance)
{
enum RetCode ret = RETCODE_FAILURE;
struct FrameBuffer* fb;
......@@ -595,7 +595,7 @@ enum RetCode ProductVpuRegisterFramebuffer(CodecInst* instance)
return ret;
}
int32_t ProductCalculateFrameBufSize(CodecInst* inst, int32_t productId, int32_t stride, int32_t height, enum TiledMapType mapType, enum FrameBufferFormat format, BOOL interleave)
int32_t ProductCalculateFrameBufSize(struct CodecInst* inst, int32_t productId, int32_t stride, int32_t height, enum TiledMapType mapType, enum FrameBufferFormat format, BOOL interleave)
{
int32_t size_dpb_lum, size_dpb_chr, size_dpb_all;
......@@ -610,21 +610,21 @@ int32_t ProductCalculateFrameBufSize(CodecInst* inst, int32_t productId, int32_t
return size_dpb_all;
}
enum RetCode ProductVpuDecClrDispFlag(CodecInst* instance, uint32_t index)
enum RetCode ProductVpuDecClrDispFlag(struct CodecInst* instance, uint32_t index)
{
enum RetCode ret = RETCODE_SUCCESS;
ret = Wave5DecClrDispFlag(instance, index);
return ret;
}
enum RetCode ProductVpuDecSetDispFlag(CodecInst* instance, uint32_t index)
enum RetCode ProductVpuDecSetDispFlag(struct CodecInst* instance, uint32_t index)
{
enum RetCode ret = RETCODE_SUCCESS;
ret = Wave5DecSetDispFlag(instance, index);
return ret;
}
enum RetCode ProductVpuGetBandwidth(CodecInst* instance, struct VPUBWData* data)
enum RetCode ProductVpuGetBandwidth(struct CodecInst* instance, struct VPUBWData* data)
{
if (data == 0) {
return RETCODE_INVALID_PARAM;
......@@ -637,7 +637,7 @@ enum RetCode ProductVpuGetBandwidth(CodecInst* instance, struct VPUBWData* data)
}
enum RetCode ProductVpuGetDebugInfo(CodecInst* instance, struct VPUDebugInfo* info)
enum RetCode ProductVpuGetDebugInfo(struct CodecInst* instance, struct VPUDebugInfo* info)
{
if (info == 0) {
return RETCODE_INVALID_PARAM;
......@@ -652,7 +652,7 @@ enum RetCode ProductVpuGetDebugInfo(CodecInst* instance, struct VPUDebugInfo* in
/************************************************************************/
/* ENCODER */
/************************************************************************/
enum RetCode ProductVpuEncGetSrcBufFlag(CodecInst* instance, uint32_t* flag)
enum RetCode ProductVpuEncGetSrcBufFlag(struct CodecInst* instance, uint32_t* flag)
{
if (instance->productId < PRODUCT_ID_521)
return RETCODE_INVALID_COMMAND;
......@@ -1044,7 +1044,7 @@ enum RetCode ProductVpuEncCheckOpenParam(struct EncOpenParam* pop)
return RETCODE_SUCCESS;
}
enum RetCode ProductVpuEncFiniSeq(CodecInst* instance)
enum RetCode ProductVpuEncFiniSeq(struct CodecInst* instance)
{
enum RetCode ret = RETCODE_NOT_FOUND_VPU_DEVICE;
......@@ -1060,7 +1060,7 @@ enum RetCode ProductVpuEncFiniSeq(CodecInst* instance)
return ret;
}
enum RetCode ProductVpuEncode(CodecInst* instance, struct EncParam* param)
enum RetCode ProductVpuEncode(struct CodecInst* instance, struct EncParam* param)
{
enum RetCode ret = RETCODE_NOT_FOUND_VPU_DEVICE;
......@@ -1079,7 +1079,7 @@ enum RetCode ProductVpuEncode(CodecInst* instance, struct EncParam* param)
return ret;
}
enum RetCode ProductVpuEncGetResult(CodecInst* instance, struct EncOutputInfo* result)
enum RetCode ProductVpuEncGetResult(struct CodecInst* instance, struct EncOutputInfo* result)
{
enum RetCode ret = RETCODE_NOT_FOUND_VPU_DEVICE;
......@@ -1096,7 +1096,7 @@ enum RetCode ProductVpuEncGetResult(CodecInst* instance, struct EncOutputInfo* r
return ret;
}
enum RetCode ProductVpuEncInitSeq(CodecInst* instance)
enum RetCode ProductVpuEncInitSeq(struct CodecInst* instance)
{
int productId;
enum RetCode ret = RETCODE_NOT_FOUND_VPU_DEVICE;
......@@ -1114,7 +1114,7 @@ enum RetCode ProductVpuEncInitSeq(CodecInst* instance)
return ret;
}
enum RetCode ProductVpuEncGetSeqInfo(CodecInst* instance, struct EncInitialInfo* info)
enum RetCode ProductVpuEncGetSeqInfo(struct CodecInst* instance, struct EncInitialInfo* info)
{
int productId;
enum RetCode ret = RETCODE_NOT_FOUND_VPU_DEVICE;
......
......@@ -66,7 +66,7 @@ extern enum RetCode ProductVpuReset(
);
extern enum RetCode ProductVpuAllocateFramebuffer(
CodecInst* instance,
struct CodecInst* instance,
struct FrameBuffer* fbArr,
enum TiledMapType mapType,
int32_t num,
......@@ -82,11 +82,11 @@ extern enum RetCode ProductVpuAllocateFramebuffer(
);
extern enum RetCode ProductVpuRegisterFramebuffer(
CodecInst* instance
struct CodecInst* instance
);
extern int32_t ProductCalculateFrameBufSize(
CodecInst* inst,
struct CodecInst* inst,
int32_t productId,
int32_t stride,
int32_t height,
......@@ -96,13 +96,13 @@ extern int32_t ProductCalculateFrameBufSize(
);
extern enum RetCode ProductVpuGetBandwidth(
CodecInst* instance,
struct CodecInst* instance,
struct VPUBWData* data
);
extern enum RetCode ProductVpuGetDebugInfo(
CodecInst* instance,
struct CodecInst* instance,
struct VPUDebugInfo* info
);
......@@ -119,7 +119,7 @@ extern void ProductCalculateFrameBufSizeInfo(
/* DECODER */
/************************************************************************/
extern enum RetCode ProductVpuDecBuildUpOpenParam(
CodecInst* instance,
struct CodecInst* instance,
struct DecOpenParam* param
);
......@@ -128,50 +128,50 @@ extern enum RetCode ProductVpuDecCheckOpenParam(
);
extern enum RetCode ProductVpuDecInitSeq(
CodecInst* instance
struct CodecInst* instance
);
extern enum RetCode ProductVpuDecFiniSeq(
CodecInst* instance
struct CodecInst* instance
);
extern enum RetCode ProductVpuDecSetBitstreamFlag(
CodecInst* instance,
struct CodecInst* instance,
BOOL running,
int32_t size
);
extern enum RetCode ProductVpuDecGetSeqInfo(
CodecInst* instance,
struct CodecInst* instance,
struct DecInitialInfo* info
);
extern enum RetCode ProductVpuDecCheckCapability(
CodecInst* instance
struct CodecInst* instance
);
extern enum RetCode ProductVpuDecode(
CodecInst* instance,
struct CodecInst* instance,
struct DecParam* option
);
extern enum RetCode ProductVpuDecGetResult(
CodecInst* instance,
struct CodecInst* instance,
struct DecOutputInfo* result
);
extern enum RetCode ProductVpuDecClrDispFlag(
CodecInst* instance,
struct CodecInst* instance,
uint32_t index
);
extern enum RetCode ProductVpuDecSetDispFlag(
CodecInst* instance,
struct CodecInst* instance,
uint32_t dispFlag
);
extern PhysicalAddress ProductVpuDecGetRdPtr(
CodecInst* instance
struct CodecInst* instance
);
/************************************************************************/
......@@ -179,12 +179,12 @@ extern PhysicalAddress ProductVpuDecGetRdPtr(
/************************************************************************/
extern enum RetCode ProductVpuEncBuildUpOpenParam(
CodecInst* pCodec,
struct CodecInst* pCodec,
struct EncOpenParam* param
);
extern enum RetCode ProductVpuEncFiniSeq(
CodecInst* instance
struct CodecInst* instance
);
extern enum RetCode ProductVpuEncCheckOpenParam(
......@@ -192,31 +192,31 @@ extern enum RetCode ProductVpuEncCheckOpenParam(
);
extern enum RetCode ProductVpuEncode(
CodecInst* instance,
struct CodecInst* instance,
struct EncParam* param
);
extern enum RetCode ProductVpuEncGetResult(
CodecInst* instance,
struct CodecInst* instance,
struct EncOutputInfo* result
);
extern enum RetCode ProductVpuEncInitSeq(
CodecInst* instance
struct CodecInst* instance
);
extern enum RetCode ProductVpuEncGetSeqInfo(
CodecInst* instance,
struct CodecInst* instance,
struct EncInitialInfo* info
);
extern enum RetCode ProductVpuEncChangeParam(
CodecInst* instance,
struct CodecInst* instance,
void* param
);
extern enum RetCode ProductVpuEncGetSrcBufFlag(
CodecInst* instance,
struct CodecInst* instance,
uint32_t* data
);
......
......@@ -25,7 +25,7 @@ static int s_bitCodeSize[MAX_NUM_VPU_CORE] = {0,};
uint32_t __VPU_BUSY_TIMEOUT = VPU_BUSY_CHECK_TIMEOUT;
static enum RetCode CheckDecInstanceValidity(CodecInst* pCodecInst)
static enum RetCode CheckDecInstanceValidity(struct CodecInst* pCodecInst)
{
enum RetCode ret;
......@@ -57,7 +57,7 @@ int32_t VPU_IsInit(uint32_t coreIdx)
void VPU_ClearInterruptEx(VpuHandle handle, int32_t intrFlag)
{
CodecInst *pCodecInst;
struct CodecInst *pCodecInst;
pCodecInst = handle;
......@@ -170,7 +170,7 @@ enum RetCode VPU_GetVersionInfo(uint32_t coreIdx, uint32_t *versionInfo, uint32_
enum RetCode VPU_DecOpen(DecHandle* pHandle, struct DecOpenParam* pop)
{
CodecInst * pCodecInst;
struct CodecInst * pCodecInst;
struct DecInfo* pDecInfo;
enum RetCode ret;
......@@ -302,7 +302,7 @@ enum RetCode VPU_DecOpen(DecHandle* pHandle, struct DecOpenParam* pop)
enum RetCode VPU_DecClose(DecHandle handle)
{
CodecInst * pCodecInst;
struct CodecInst * pCodecInst;
struct DecInfo * pDecInfo;
enum RetCode ret;
int i;
......@@ -385,7 +385,7 @@ enum RetCode VPU_DecClose(DecHandle handle)
enum RetCode VPU_DecIssueSeqInit(DecHandle handle)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
enum RetCode ret;
struct VpuAttr* pAttr;
......@@ -421,7 +421,7 @@ enum RetCode VPU_DecIssueSeqInit(DecHandle handle)
enum RetCode VPU_DecCompleteSeqInit(DecHandle handle, struct DecInitialInfo * info)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct DecInfo* pDecInfo;
enum RetCode ret;
struct VpuAttr* pAttr;
......@@ -472,7 +472,7 @@ enum RetCode VPU_DecCompleteSeqInit(DecHandle handle, struct DecInitialInfo * in
static enum RetCode DecRegisterFrameBuffer(DecHandle handle, struct FrameBuffer *bufArray, int numFbsForDecoding, int numFbsForWTL, int stride, int height, int mapType)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct DecInfo* pDecInfo;
int32_t i;
enum RetCode ret;
......@@ -543,7 +543,7 @@ static enum RetCode DecRegisterFrameBuffer(DecHandle handle, struct FrameBuffer
vb = &pDecInfo->vbFrame;
fb = &pDecInfo->frameBufPool[0];
ret = ProductVpuAllocateFramebuffer(
(CodecInst*)handle, fb, (enum TiledMapType)mapType, numFbsForDecoding, stride, height, format,
(struct CodecInst*)handle, fb, (enum TiledMapType)mapType, numFbsForDecoding, stride, height, format,
pDecInfo->openParam.cbcrInterleave,
pDecInfo->openParam.nv21,
pDecInfo->openParam.frameEndian, vb, 0, FB_TYPE_CODEC);
......@@ -563,7 +563,7 @@ static enum RetCode DecRegisterFrameBuffer(DecHandle handle, struct FrameBuffer
fb = &pDecInfo->frameBufPool[numFbsForDecoding];
ret = ProductVpuAllocateFramebuffer(
(CodecInst*)handle, fb, map, numFbsForWTL, stride, height,
(struct CodecInst*)handle, fb, map, numFbsForWTL, stride, height,
pDecInfo->wtlFormat,
pDecInfo->openParam.cbcrInterleave,
pDecInfo->openParam.nv21,
......@@ -591,7 +591,7 @@ enum RetCode VPU_DecRegisterFrameBufferEx(DecHandle handle, struct FrameBuffer *
enum RetCode VPU_DecGetBitstreamBuffer(DecHandle handle, PhysicalAddress* prdPtr, PhysicalAddress* pwrPtr, uint32_t* size)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct DecInfo* pDecInfo;
PhysicalAddress rdPtr;
PhysicalAddress wrPtr;
......@@ -654,7 +654,7 @@ enum RetCode VPU_DecGetBitstreamBuffer(DecHandle handle, PhysicalAddress* prdPtr
enum RetCode VPU_DecUpdateBitstreamBuffer(DecHandle handle, int size)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct DecInfo* pDecInfo;
PhysicalAddress wrPtr;
PhysicalAddress rdPtr;
......@@ -729,7 +729,7 @@ enum RetCode VPU_DecUpdateBitstreamBuffer(DecHandle handle, int size)
enum RetCode VPU_DecStartOneFrame(DecHandle handle, struct DecParam *param)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct DecInfo* pDecInfo;
uint32_t val = 0;
enum RetCode ret = RETCODE_SUCCESS;
......@@ -740,7 +740,7 @@ enum RetCode VPU_DecStartOneFrame(DecHandle handle, struct DecParam *param)
return ret;
}
pCodecInst = (CodecInst*)handle;
pCodecInst = (struct CodecInst*)handle;
pDecInfo = &pCodecInst->CodecInfo->decInfo;
if (pDecInfo->stride == 0) { // This means frame buffers have not been registered.
......@@ -786,7 +786,7 @@ enum RetCode VPU_DecStartOneFrame(DecHandle handle, struct DecParam *param)
enum RetCode VPU_DecGetOutputInfo(DecHandle handle, struct DecOutputInfo* info)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct DecInfo* pDecInfo;
enum RetCode ret;
struct VpuRect rectInfo;
......@@ -1073,7 +1073,7 @@ enum RetCode VPU_RunMapConverter(void* handle, struct FrameBuffer* frame, Physic
uint32_t mapHeight = 0;
uint32_t frameEndian;
enum RetCode ret = RETCODE_SUCCESS;
CodecInst* instance = (CodecInst*)handle;
struct CodecInst* instance = (struct CodecInst*)handle;
if (PRODUCT_CODE_NOT_W_SERIES(instance->productId)) {
return RETCODE_NOT_SUPPORTED_FEATURE;
......@@ -1130,7 +1130,7 @@ enum RetCode VPU_RunMapConverter(void* handle, struct FrameBuffer* frame, Physic
enum RetCode VPU_DecClrDispFlag(DecHandle handle, int index)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct DecInfo* pDecInfo;
enum RetCode ret = RETCODE_SUCCESS;
int32_t endIndex;
......@@ -1170,7 +1170,7 @@ enum RetCode VPU_DecClrDispFlag(DecHandle handle, int index)
enum RetCode VPU_DecGiveCommand(DecHandle handle, enum CodecCommand cmd, void* param)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct DecInfo* pDecInfo;
enum RetCode ret;
......@@ -1204,7 +1204,7 @@ enum RetCode VPU_DecGiveCommand(DecHandle handle, enum CodecCommand cmd, void* p
enum RetCode VPU_EncOpen(EncHandle* pHandle, struct EncOpenParam * pop)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct EncInfo* pEncInfo;
enum RetCode ret;
......@@ -1247,7 +1247,7 @@ enum RetCode VPU_EncOpen(EncHandle* pHandle, struct EncOpenParam * pop)
enum RetCode VPU_EncClose(EncHandle handle)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct EncInfo* pEncInfo;
enum RetCode ret;
......@@ -1324,7 +1324,7 @@ enum RetCode VPU_EncClose(EncHandle handle)
enum RetCode VPU_EncRegisterFrameBuffer(EncHandle handle, struct FrameBuffer* bufArray, int num, int stride, int height, enum TiledMapType mapType)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct EncInfo* pEncInfo;
int32_t i;
enum RetCode ret;
......@@ -1415,7 +1415,7 @@ enum RetCode VPU_EncStartOneFrame(
struct EncParam * param
)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct EncInfo* pEncInfo;
enum RetCode ret;
struct VpuAttr* pAttr = NULL;
......@@ -1472,7 +1472,7 @@ enum RetCode VPU_EncGetOutputInfo(
struct EncOutputInfo* info
)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct EncInfo* pEncInfo;
enum RetCode ret;
struct VpuAttr* pAttr;
......@@ -1523,7 +1523,7 @@ enum RetCode VPU_EncGiveCommand(
void* param
)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct EncInfo* pEncInfo;
enum RetCode ret;
......@@ -1593,7 +1593,7 @@ enum RetCode VPU_EncGiveCommand(
enum RetCode VPU_EncIssueSeqInit(EncHandle handle)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
enum RetCode ret;
struct VpuAttr* pAttr;
......@@ -1629,7 +1629,7 @@ enum RetCode VPU_EncIssueSeqInit(EncHandle handle)
enum RetCode VPU_EncCompleteSeqInit(EncHandle handle, struct EncInitialInfo * info)
{
CodecInst* pCodecInst;
struct CodecInst* pCodecInst;
struct EncInfo* pEncInfo;
enum RetCode ret;
struct VpuAttr* pAttr;
......
......@@ -1338,11 +1338,11 @@ struct CodecInst;
// decode struct and definition
//------------------------------------------------------------------------------
#define VPU_HANDLE_INSTANCE_NO(_handle) (_handle->instIndex)
#define VPU_HANDLE_CORE_INDEX(_handle) (((CodecInst*)_handle)->coreIdx)
#define VPU_HANDLE_PRODUCT_ID(_handle) (((CodecInst*)_handle)->productId)
#define VPU_CONVERT_WTL_INDEX(_handle, _index) ((((CodecInst*)_handle)->CodecInfo->decInfo).numFbsForDecoding+_index)
#define VPU_HANDLE_TO_DECINFO(_handle) (&(((CodecInst*)_handle)->CodecInfo->decInfo))
#define VPU_HANDLE_TO_ENCINFO(_handle) (&(((CodecInst*)_handle)->CodecInfo->encInfo))
#define VPU_HANDLE_CORE_INDEX(_handle) (((struct CodecInst*)_handle)->coreIdx)
#define VPU_HANDLE_PRODUCT_ID(_handle) (((struct CodecInst*)_handle)->productId)
#define VPU_CONVERT_WTL_INDEX(_handle, _index) ((((struct CodecInst*)_handle)->CodecInfo->decInfo).numFbsForDecoding+_index)
#define VPU_HANDLE_TO_DECINFO(_handle) (&(((struct CodecInst*)_handle)->CodecInfo->decInfo))
#define VPU_HANDLE_TO_ENCINFO(_handle) (&(((struct CodecInst*)_handle)->CodecInfo->encInfo))
/**
* @brief
@verbatim
......@@ -1357,7 +1357,7 @@ typedef struct CodecInst* VpuHandle;
* @brief
@verbatim
This is a dedicated type for decoder handle returned when a decoder instance is
opened. A decoder instance can be referred to by the corresponding handle. CodecInst
opened. A decoder instance can be referred to by the corresponding handle. struct CodecInst
is a type managed internally by API. Application does not need to care about it.
NOTE: This type is vaild for decoder only.
......@@ -2462,7 +2462,7 @@ struct QueueStatusInfo {
* @brief