diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-06 15:14:46 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-10-06 15:14:46 +0200 |
commit | 4f80da5f81b712cfc3144ea0af7309591584fd75 (patch) | |
tree | 273dc1349415df47f019e2fa2dbb3cfa05ab4b81 | |
parent | cfd1f3907f8810a63c5aaece3f4f492046beeaa7 (diff) | |
download | libfsl-vpu-4f80da5f81b712cfc3144ea0af7309591584fd75.tar.gz libfsl-vpu-4f80da5f81b712cfc3144ea0af7309591584fd75.tar.xz |
Lindent
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | src/vpu_io.c | 79 | ||||
-rw-r--r-- | src/vpu_lib.c | 256 |
2 files changed, 185 insertions, 150 deletions
diff --git a/src/vpu_io.c b/src/vpu_io.c index 6bf9ee4..5c8765c 100644 --- a/src/vpu_io.c +++ b/src/vpu_io.c @@ -45,12 +45,14 @@ unsigned int system_rev; int IOSystemShutdown(void); -int isVpuInitialized(void) +int +isVpuInitialized(void) { return VpuReadReg(BIT_CUR_PC) != 0; } -static int get_system_rev() +static int +get_system_rev() { FILE *fp; char buf[1024]; @@ -64,9 +66,9 @@ static int get_system_rev() return ret; } - nread = fread(buf, 1, sizeof(buf), fp); + nread = fread(buf, 1, sizeof (buf), fp); fclose(fp); - if ((nread == 0) || (nread == sizeof(buf))) { + if ((nread == 0) || (nread == sizeof (buf))) { fclose(fp); return ret; } @@ -87,9 +89,10 @@ static int get_system_rev() } /* make consideration for both register and physical mem access */ -inline unsigned long *reg_map(unsigned long offset) +inline unsigned long * +reg_map(unsigned long offset) { - return (unsigned long *)(offset + (unsigned long)vpu_reg_base); + return (unsigned long *) (offset + (unsigned long) vpu_reg_base); } /*! @@ -106,7 +109,8 @@ inline unsigned long *reg_map(unsigned long offset) * @li 0 System initialization success. * @li -1 System initialization failure. */ -int IOSystemInit(void *callback) +int +IOSystemInit(void *callback) { int ret; @@ -126,11 +130,11 @@ int IOSystemInit(void *callback) return -1; } - vpu_reg_base = (unsigned long)mmap(NULL, BIT_REG_MARGIN, - PROT_READ | PROT_WRITE, - MAP_SHARED, vpu_fd, 0); + vpu_reg_base = (unsigned long) mmap(NULL, BIT_REG_MARGIN, + PROT_READ | PROT_WRITE, + MAP_SHARED, vpu_fd, 0); - if ((void *)vpu_reg_base == MAP_FAILED) { + if ((void *) vpu_reg_base == MAP_FAILED) { printf("Can't map register\n"); close(vpu_fd); vpu_fd = -1; @@ -138,7 +142,7 @@ int IOSystemInit(void *callback) } bit_work_addr.size = WORK_BUF_SIZE + PARA_BUF_SIZE + - CODE_BUF_SIZE + PARA_BUF2_SIZE; + CODE_BUF_SIZE + PARA_BUF2_SIZE; if (IOGetPhyMem(&bit_work_addr) != 0) goto err; @@ -169,14 +173,15 @@ int IOSystemInit(void *callback) * @li 0 System shutting down success. * @li -1 System shutting down failure. */ -int IOSystemShutdown(void) +int +IOSystemShutdown(void) { IOFreeVirtMem(&bit_work_addr); IOFreePhyMem(&bit_work_addr); VpuWriteReg(BIT_INT_ENABLE, 0); /* PIC_RUN irq disable */ - if (munmap((void *)vpu_reg_base, BIT_REG_MARGIN) != 0) + if (munmap((void *) vpu_reg_base, BIT_REG_MARGIN) != 0) printf("munmap failed\n"); if (vpu_fd >= 0) { @@ -187,18 +192,20 @@ int IOSystemShutdown(void) return 0; } -unsigned long VpuWriteReg(unsigned long addr, unsigned int data) +unsigned long +VpuWriteReg(unsigned long addr, unsigned int data) { unsigned long *reg_addr = reg_map(addr); - *(volatile unsigned long *)reg_addr = data; + *(volatile unsigned long *) reg_addr = data; return 0; } -unsigned long VpuReadReg(unsigned long addr) +unsigned long +VpuReadReg(unsigned long addr) { unsigned long *reg_addr = reg_map(addr); - return *(volatile unsigned long *)reg_addr; + return *(volatile unsigned long *) reg_addr; } /*! @@ -219,7 +226,8 @@ unsigned long VpuReadReg(unsigned long addr) * @li -1 Allocation memory failure. */ static unsigned int sz_alloc; -int IOGetPhyMem(vpu_mem_desc * buff) +int +IOGetPhyMem(vpu_mem_desc * buff) { if (ioctl(vpu_fd, VPU_IOC_PHYMEM_ALLOC, buff) < 0) { printf("mem allocation failed!\n"); @@ -246,7 +254,8 @@ int IOGetPhyMem(vpu_mem_desc * buff) * @li 0 Freeing memory success. * @li -1 Freeing memory failure. */ -int IOFreePhyMem(vpu_mem_desc * buff) +int +IOFreePhyMem(vpu_mem_desc * buff) { if (buff->phy_addr != 0) { dprintf(3, "%s: phy addr = %08lx\n", __func__, buff->phy_addr); @@ -265,13 +274,14 @@ int IOFreePhyMem(vpu_mem_desc * buff) * * @return user space address. */ -int IOGetVirtMem(vpu_mem_desc * buff) +int +IOGetVirtMem(vpu_mem_desc * buff) { unsigned long va_addr; - va_addr = (unsigned long)mmap(NULL, buff->size, PROT_READ | PROT_WRITE, - MAP_SHARED, vpu_fd, buff->phy_addr); - if ((void *)va_addr == MAP_FAILED) { + va_addr = (unsigned long) mmap(NULL, buff->size, PROT_READ | PROT_WRITE, + MAP_SHARED, vpu_fd, buff->phy_addr); + if ((void *) va_addr == MAP_FAILED) { buff->virt_uaddr = 0; return -1; } @@ -289,10 +299,11 @@ int IOGetVirtMem(vpu_mem_desc * buff) * @li 0 Success * @li Others Failure */ -int IOFreeVirtMem(vpu_mem_desc * buff) +int +IOFreeVirtMem(vpu_mem_desc * buff) { if (buff->virt_uaddr != 0) { - if (munmap((void *)buff->virt_uaddr, buff->size) != 0) + if (munmap((void *) buff->virt_uaddr, buff->size) != 0) printf("munmap failed\n"); } @@ -300,7 +311,8 @@ int IOFreeVirtMem(vpu_mem_desc * buff) return 0; } -int IOWaitForInt(int timeout_in_ms) +int +IOWaitForInt(int timeout_in_ms) { int ret = 0; if (timeout_in_ms < 0) { @@ -321,7 +333,8 @@ int IOWaitForInt(int timeout_in_ms) * @li 0 Success * @li Others Failure */ -int IOLHD(int disable) +int +IOLHD(int disable) { int ret = 0; if (disable < 0) { @@ -332,7 +345,7 @@ int IOLHD(int disable) printf("File Descriptor is not valid.\n"); } - ret= ioctl(vpu_fd, VPU_IOC_LHD, disable); + ret = ioctl(vpu_fd, VPU_IOC_LHD, disable); return ret; } @@ -341,13 +354,13 @@ int IOLHD(int disable) * @brief * When the system starts up, resetting is needed in advance. */ -void ResetVpu(void) +void +ResetVpu(void) { unsigned long *reg_addr = reg_map(BIT_CODE_RESET); - (*(volatile unsigned long *)reg_addr) |= 0x1; + (*(volatile unsigned long *) reg_addr) |= 0x1; usleep(10); - (*(volatile unsigned long *)reg_addr) &= ~0x1; + (*(volatile unsigned long *) reg_addr) &= ~0x1; return; } - diff --git a/src/vpu_lib.c b/src/vpu_lib.c index 0efdef3..5ec4fa7 100644 --- a/src/vpu_lib.c +++ b/src/vpu_lib.c @@ -99,12 +99,14 @@ extern int IOSystemShutdown(void); * @li 0: VPU hardware is idle. * @li Non-zero value: VPU hardware is busy processing a frame. */ -int vpu_IsBusy() +int +vpu_IsBusy() { return VpuReadReg(BIT_BUSY_FLAG) != 0; } -int vpu_WaitForInt(int timeout_in_ms) +int +vpu_WaitForInt(int timeout_in_ms) { return IOWaitForInt(timeout_in_ms); } @@ -113,9 +115,10 @@ int vpu_WaitForInt(int timeout_in_ms) * Fix MPEG4 issue on MX27 TO2.0; * This issue has been fixed on MX27 TO2.1, thus no need to call this function. */ -int vpu_ESDMISC_LHD(int disable) +int +vpu_ESDMISC_LHD(int disable) { - return IOLHD(disable); + return IOLHD(disable); } /*! @@ -127,7 +130,8 @@ int vpu_ESDMISC_LHD(int disable) * * @return This function always returns RETCODE_SUCCESS. */ -RetCode vpu_Init(void *cb) +RetCode +vpu_Init(void *cb) { int err; volatile Uint32 data; @@ -145,26 +149,26 @@ RetCode vpu_Init(void *cb) paraBuffer = workBuffer + WORK_BUF_SIZE + PARA_BUF2_SIZE; virt_codeBuf = (Uint32) (bit_work_addr.virt_uaddr); - virt_paraBuf = (unsigned long *)(virt_codeBuf + CODE_BUF_SIZE + - WORK_BUF_SIZE + PARA_BUF2_SIZE); - virt_paraBuf2 = (unsigned long *)(virt_codeBuf + CODE_BUF_SIZE + - WORK_BUF_SIZE); + virt_paraBuf = (unsigned long *) (virt_codeBuf + CODE_BUF_SIZE + + WORK_BUF_SIZE + PARA_BUF2_SIZE); + virt_paraBuf2 = (unsigned long *) (virt_codeBuf + CODE_BUF_SIZE + + WORK_BUF_SIZE); /* Copy full Microcode to Code Buffer allocated on SDRAM */ if (cpu_is_mx27_rev(CHIP_REV_2_0) > 0) { - for (i = 0; i < sizeof(bit_code2) / sizeof(bit_code2[0]); - i += 2) { - data = (unsigned int)((bit_code2[i] << 16) | - bit_code2[i + 1]); - ((unsigned int *)virt_codeBuf)[i / 2] = data; + for (i = 0; i < sizeof (bit_code2) / sizeof (bit_code2[0]); + i += 2) { + data = (unsigned int) ((bit_code2[i] << 16) | + bit_code2[i + 1]); + ((unsigned int *) virt_codeBuf)[i / 2] = data; } } else { - for (i = 0; i < sizeof(bit_code) / sizeof(bit_code[0]); - i += 2) { - data = (unsigned int)((bit_code[i] << 16) | - bit_code[i + 1]); + for (i = 0; i < sizeof (bit_code) / sizeof (bit_code[0]); + i += 2) { + data = (unsigned int) ((bit_code[i] << 16) | + bit_code[i + 1]); - ((unsigned int *)virt_codeBuf)[i / 2] = data; + ((unsigned int *) virt_codeBuf)[i / 2] = data; } } @@ -208,7 +212,8 @@ RetCode vpu_Init(void *cb) return RETCODE_SUCCESS; } -void vpu_UnInit(void) +void +vpu_UnInit(void) { IOSystemShutdown(); } @@ -216,7 +221,8 @@ void vpu_UnInit(void) /*! * @brief Get VPU Firmware Version. */ -RetCode vpu_GetVersionInfo(vpu_versioninfo * verinfo) +RetCode +vpu_GetVersionInfo(vpu_versioninfo * verinfo) { Uint32 ver; Uint16 pn, version; @@ -298,7 +304,8 @@ RetCode vpu_GetVersionInfo(vpu_versioninfo * verinfo) * passed does not satisfy conditions described in the paragraph for * EncOpenParam type. */ -RetCode vpu_EncOpen(EncHandle * pHandle, EncOpenParam * pop) +RetCode +vpu_EncOpen(EncHandle * pHandle, EncOpenParam * pop) { CodecInst *pCodecInst; EncInfo *pEncInfo; @@ -373,7 +380,8 @@ RetCode vpu_EncOpen(EncHandle * pHandle, EncOpenParam * pop) * @li RETCODE_INVALID_HANDLE encHandle is invalid. * @li RETCODE_FRAME_NOT_COMPLETE A frame has not been finished. */ -RetCode vpu_EncClose(EncHandle handle) +RetCode +vpu_EncClose(EncHandle handle) { CodecInst *pCodecInst; EncInfo *pEncInfo; @@ -415,7 +423,8 @@ RetCode vpu_EncClose(EncHandle handle) * @li RETCODE_FRAME_NOT_COMPLETE A frame has not been finished * @li RETCODE_INVALID_PARAM initialInfo is a null pointer. */ -RetCode vpu_EncGetInitialInfo(EncHandle handle, EncInitialInfo * info) +RetCode +vpu_EncGetInitialInfo(EncHandle handle, EncInitialInfo * info) { CodecInst *pCodecInst; EncInfo *pEncInfo; @@ -458,9 +467,9 @@ RetCode vpu_EncGetInitialInfo(EncHandle handle, EncInitialInfo * info) encOP.EncStdParam.mp4Param.mp4_reversibleVlcEnable << 1 | encOP.EncStdParam.mp4Param.mp4_dataPartitionEnable; data |= ((encOP.EncStdParam.mp4Param.mp4_hecEnable > 0) - ? 1 : 0) << 5; + ? 1 : 0) << 5; data |= ((encOP.EncStdParam.mp4Param.mp4_verid == 2) - ? 0 : 1) << 6; + ? 0 : 1) << 6; VpuWriteReg(CMD_ENC_SEQ_MP4_PARA, data); } else if (encOP.bitstreamFormat == STD_H263) { VpuWriteReg(CMD_ENC_SEQ_COD_STD, 1); @@ -481,7 +490,7 @@ RetCode vpu_EncGetInitialInfo(EncHandle handle, EncInitialInfo * info) } data = encOP.slicemode.sliceSize << 2 | - encOP.slicemode.sliceSizeMode << 1 | encOP.slicemode.sliceMode; + encOP.slicemode.sliceSizeMode << 1 | encOP.slicemode.sliceMode; VpuWriteReg(CMD_ENC_SEQ_SLICE_MODE, data); VpuWriteReg(CMD_ENC_SEQ_GOP_NUM, encOP.gopSize); @@ -522,7 +531,7 @@ RetCode vpu_EncGetInitialInfo(EncHandle handle, EncInitialInfo * info) } - VpuWriteReg(CMD_ENC_SEQ_FMO, data); /* FIXME */ + VpuWriteReg(CMD_ENC_SEQ_FMO, data); /* FIXME */ VpuWriteReg(BIT_BUSY_FLAG, 0x1); BitIssueCommand(pCodecInst->instIndex, pCodecInst->codecMode, SEQ_INIT); @@ -558,8 +567,9 @@ RetCode vpu_EncGetInitialInfo(EncHandle handle, EncInitialInfo * info) * @li RETCODE_INSUFFICIENT_FRAME_BUFFERS num is smaller than requested. * @li RETCODE_INVALID_STRIDE stride is smaller than the picture width. */ -RetCode vpu_EncRegisterFrameBuffer(EncHandle handle, - FrameBuffer * bufArray, int num, int stride) +RetCode +vpu_EncRegisterFrameBuffer(EncHandle handle, + FrameBuffer * bufArray, int num, int stride) { CodecInst *pCodecInst; EncInfo *pEncInfo; @@ -620,9 +630,10 @@ RetCode vpu_EncRegisterFrameBuffer(EncHandle handle, return RETCODE_SUCCESS; } -RetCode vpu_EncGetBitstreamBuffer(EncHandle handle, - PhysicalAddress * prdPrt, - PhysicalAddress * pwrPtr, Uint32 * size) +RetCode +vpu_EncGetBitstreamBuffer(EncHandle handle, + PhysicalAddress * prdPrt, + PhysicalAddress * pwrPtr, Uint32 * size) { CodecInst *pCodecInst; EncInfo *pEncInfo; @@ -665,7 +676,8 @@ RetCode vpu_EncGetBitstreamBuffer(EncHandle handle, return RETCODE_SUCCESS; } -RetCode vpu_EncUpdateBitstreamBuffer(EncHandle handle, Uint32 size) +RetCode +vpu_EncUpdateBitstreamBuffer(EncHandle handle, Uint32 size) { CodecInst *pCodecInst; EncInfo *pEncInfo; @@ -723,7 +735,8 @@ RetCode vpu_EncUpdateBitstreamBuffer(EncHandle handle, Uint32 size) * @li RETCODE_INVALID_FRAME_BUFFER skipPicture in EncParam is 0 * and sourceFrame in EncParam is a null pointer. */ -RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param) +RetCode +vpu_EncStartOneFrame(EncHandle handle, EncParam * param) { CodecInst *pCodecInst; EncInfo *pEncInfo; @@ -828,7 +841,7 @@ RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param) if (pEncInfo->dynamicAllocEnable == 1) { VpuWriteReg(CMD_ENC_PIC_BB_START, param->picStreamBufferAddr); VpuWriteReg(CMD_ENC_PIC_BB_SIZE, - param->picStreamBufferSize / 1024); + param->picStreamBufferSize / 1024); } VpuWriteReg(BIT_BUSY_FLAG, 0x1); @@ -851,7 +864,8 @@ RetCode vpu_EncStartOneFrame(EncHandle handle, EncParam * param) * @li RETCODE_WRONG_CALL_SEQUENCE Wrong calling sequence. * @li RETCODE_INVALID_PARAM info is a null pointer. */ -RetCode vpu_EncGetOutputInfo(EncHandle handle, EncOutputInfo * info) +RetCode +vpu_EncGetOutputInfo(EncHandle handle, EncOutputInfo * info) { CodecInst *pCodecInst; EncInfo *pEncInfo; @@ -893,12 +907,12 @@ RetCode vpu_EncGetOutputInfo(EncHandle handle, EncOutputInfo * info) } info->numOfSlices = VpuReadReg(RET_ENC_PIC_SLICE_NUM); - info->sliceInfo = (Uint32 *)((Uint32)virt_paraBuf + 0x1200); + info->sliceInfo = (Uint32 *) ((Uint32) virt_paraBuf + 0x1200); info->mbInfo = virt_paraBuf; info->bitstreamWrapAround = VpuReadReg(RET_ENC_PIC_FLAG); if (pCodecInst->codecMode == MP4_ENC && - pEncInfo->openParam.mbQpReport == 1) { + pEncInfo->openParam.mbQpReport == 1) { int widthInMB; int heightInMB; int readPnt; @@ -908,7 +922,7 @@ RetCode vpu_EncGetOutputInfo(EncHandle handle, EncOutputInfo * info) int j; Uint32 val, val1, val2; - virt_mbQpAddr = (Uint32 *)((Uint32) virt_paraBuf + 0x1300); + virt_mbQpAddr = (Uint32 *) ((Uint32) virt_paraBuf + 0x1300); widthInMB = pEncInfo->openParam.picWidth / 16; heightInMB = pEncInfo->openParam.picHeight / 16; writePnt = 0; @@ -945,7 +959,8 @@ RetCode vpu_EncGetOutputInfo(EncHandle handle, EncOutputInfo * info) * @li RETCODE_INVALID_HANDLE encHandle is invalid. * @li RETCODE_FRAME_NOT_COMPLETE A frame has not been finished */ -RetCode vpu_EncGiveCommand(EncHandle handle, CodecCommand cmd, void *param) +RetCode +vpu_EncGiveCommand(EncHandle handle, CodecCommand cmd, void *param) { CodecInst *pCodecInst; EncInfo *pEncInfo; @@ -1013,7 +1028,7 @@ RetCode vpu_EncGiveCommand(EncHandle handle, CodecCommand cmd, void *param) return RETCODE_INVALID_PARAM; } - angle = *(int *)param; + angle = *(int *) param; if (angle != 0 && angle != 90 && angle != 180 && angle != 270) { return RETCODE_INVALID_PARAM; @@ -1156,93 +1171,93 @@ RetCode vpu_EncGiveCommand(EncHandle handle, CodecCommand cmd, void *param) case ENC_SET_GOP_NUMBER: { - int *pGopNumber =(int *)param; + int *pGopNumber = (int *) param; if (pCodecInst->codecMode != MP4_ENC && - pCodecInst->codecMode != AVC_ENC ) { + pCodecInst->codecMode != AVC_ENC) { return RETCODE_INVALID_COMMAND; } - if (*pGopNumber < 0 || *pGopNumber > 60) { + if (*pGopNumber < 0 || *pGopNumber > 60) { return RETCODE_INVALID_PARAM; } - SetGopNumber(handle, (Uint32 *)pGopNumber); + SetGopNumber(handle, (Uint32 *) pGopNumber); break; } case ENC_SET_INTRA_QP: { - int *pIntraQp =(int *)param; + int *pIntraQp = (int *) param; if (pCodecInst->codecMode != MP4_ENC && - pCodecInst->codecMode != AVC_ENC ) { + pCodecInst->codecMode != AVC_ENC) { return RETCODE_INVALID_COMMAND; } if (pCodecInst->codecMode == MP4_ENC) { - if(*pIntraQp < 1 || *pIntraQp > 31) + if (*pIntraQp < 1 || *pIntraQp > 31) return RETCODE_INVALID_PARAM; } if (pCodecInst->codecMode == AVC_ENC) { - if(*pIntraQp < 0 || *pIntraQp > 51) + if (*pIntraQp < 0 || *pIntraQp > 51) return RETCODE_INVALID_PARAM; } - SetIntraQp(handle, (Uint32 *)pIntraQp); + SetIntraQp(handle, (Uint32 *) pIntraQp); break; } case ENC_SET_BITRATE: { - int *pBitrate = (int *)param; + int *pBitrate = (int *) param; if (pCodecInst->codecMode != MP4_ENC && - pCodecInst->codecMode != AVC_ENC ) { + pCodecInst->codecMode != AVC_ENC) { return RETCODE_INVALID_COMMAND; } - if (*pBitrate < 0 || *pBitrate> 32767) { + if (*pBitrate < 0 || *pBitrate > 32767) { return RETCODE_INVALID_PARAM; } - SetBitrate(handle, (Uint32 *)pBitrate); + SetBitrate(handle, (Uint32 *) pBitrate); break; } case ENC_SET_FRAME_RATE: { - int *pFramerate = (int *)param; + int *pFramerate = (int *) param; if (pCodecInst->codecMode != MP4_ENC && - pCodecInst->codecMode != AVC_ENC ) { + pCodecInst->codecMode != AVC_ENC) { return RETCODE_INVALID_COMMAND; } if (*pFramerate <= 0) { return RETCODE_INVALID_PARAM; } - SetFramerate(handle, (Uint32 *)pFramerate); + SetFramerate(handle, (Uint32 *) pFramerate); break; } case ENC_SET_INTRA_MB_REFRESH_NUMBER: { - int *pIntraRefreshNum =(int *)param; - SetIntraRefreshNum(handle, (Uint32 *)pIntraRefreshNum); + int *pIntraRefreshNum = (int *) param; + SetIntraRefreshNum(handle, (Uint32 *) pIntraRefreshNum); break; } case ENC_SET_SLICE_INFO: { - EncSliceMode *pSliceMode = (EncSliceMode *)param; + EncSliceMode *pSliceMode = (EncSliceMode *) param; if (pSliceMode->sliceMode < 0 || - pSliceMode->sliceMode > 1) { + pSliceMode->sliceMode > 1) { return RETCODE_INVALID_PARAM; } if (pSliceMode->sliceSizeMode < 0 - || pSliceMode->sliceSizeMode > 1) { + || pSliceMode->sliceSizeMode > 1) { return RETCODE_INVALID_PARAM; } - SetSliceMode(handle, (EncSliceMode *)pSliceMode); + SetSliceMode(handle, (EncSliceMode *) pSliceMode); break; } @@ -1285,7 +1300,8 @@ RetCode vpu_EncGiveCommand(EncHandle handle, CodecCommand cmd, void *param) * @li RETCODE_FAILURE Failed in acquisition of a decoder instance. * @li RETCODE_INVALID_PARAM pop is a null pointer or invalid. */ -RetCode vpu_DecOpen(DecHandle * pHandle, DecOpenParam * pop) +RetCode +vpu_DecOpen(DecHandle * pHandle, DecOpenParam * pop) { CodecInst *pCodecInst; DecInfo *pDecInfo; @@ -1335,8 +1351,7 @@ RetCode vpu_DecOpen(DecHandle * pHandle, DecOpenParam * pop) pDecInfo->filePlayEnable = pop->filePlayEnable; if (pop->filePlayEnable == 1) { - pDecInfo->picSrcSize = (pop->picWidth << 10) | - pop->picHeight; + pDecInfo->picSrcSize = (pop->picWidth << 10) | pop->picHeight; pDecInfo->dynamicAllocEnable = pop->dynamicAllocEnable; } @@ -1359,7 +1374,8 @@ RetCode vpu_DecOpen(DecHandle * pHandle, DecOpenParam * pop) * @li RETCODE_INVALID_HANDLE decHandle is invalid. * @li RETCODE_FRAME_NOT_COMPLETE A frame has not been finished. */ -RetCode vpu_DecClose(DecHandle handle) +RetCode +vpu_DecClose(DecHandle handle) { CodecInst *pCodecInst; DecInfo *pDecInfo; @@ -1386,7 +1402,8 @@ RetCode vpu_DecClose(DecHandle handle) return RETCODE_SUCCESS; } -RetCode vpu_DecSetEscSeqInit(DecHandle handle, int escape) +RetCode +vpu_DecSetEscSeqInit(DecHandle handle, int escape) { CodecInst *pCodecInst; DecInfo *pDecInfo; @@ -1418,7 +1435,8 @@ RetCode vpu_DecSetEscSeqInit(DecHandle handle, int escape) * @li RETCODE_FRAME_NOT_COMPLETE A frame has not been finished. * @li RETCODE_WRONG_CALL_SEQUENCE Wrong calling sequence. */ -RetCode vpu_DecGetInitialInfo(DecHandle handle, DecInitialInfo * info) +RetCode +vpu_DecGetInitialInfo(DecHandle handle, DecInitialInfo * info) { CodecInst *pCodecInst; DecInfo *pDecInfo; @@ -1454,12 +1472,12 @@ RetCode vpu_DecGetInitialInfo(DecHandle handle, DecInitialInfo * info) if (pDecInfo->filePlayEnable == 1) { VpuWriteReg(CMD_DEC_SEQ_START_BYTE, - pDecInfo->openParam.streamStartByteOffset); + pDecInfo->openParam.streamStartByteOffset); } val = ((pDecInfo->dynamicAllocEnable << 3) & 0x8) | - ((pDecInfo->filePlayEnable << 2) & 0x4) | - ((pDecInfo->openParam.reorderEnable << 1) & 0x2); + ((pDecInfo->filePlayEnable << 2) & 0x4) | + ((pDecInfo->openParam.reorderEnable << 1) & 0x2); val |= (pDecInfo->openParam.qpReport & 0x1); @@ -1467,9 +1485,9 @@ RetCode vpu_DecGetInitialInfo(DecHandle handle, DecInitialInfo * info) if (pCodecInst->codecMode == AVC_DEC) { VpuWriteReg(CMD_DEC_SEQ_PS_BB_START, - pDecInfo->openParam.psSaveBuffer); + pDecInfo->openParam.psSaveBuffer); VpuWriteReg(CMD_DEC_SEQ_PS_BB_SIZE, - (pDecInfo->openParam.psSaveBufferSize / 1024)); + (pDecInfo->openParam.psSaveBufferSize / 1024)); } VpuWriteReg(CMD_DEC_SEQ_SRC_SIZE, pDecInfo->picSrcSize); @@ -1501,8 +1519,7 @@ RetCode vpu_DecGetInitialInfo(DecHandle handle, DecInitialInfo * info) info->minFrameBufferCount = VpuReadReg(RET_DEC_SEQ_FRAME_NEED); info->frameBufDelay = VpuReadReg(RET_DEC_SEQ_FRAME_DELAY); - info->nextDecodedIdxNum = - VpuReadReg(RET_DEC_SEQ_NEXT_FRAME_NUM); + info->nextDecodedIdxNum = VpuReadReg(RET_DEC_SEQ_NEXT_FRAME_NUM); if (pCodecInst->codecMode == AVC_DEC) { val = VpuReadReg(RET_DEC_SEQ_CROP_LEFT_RIGHT); @@ -1513,14 +1530,12 @@ RetCode vpu_DecGetInitialInfo(DecHandle handle, DecInitialInfo * info) info->picCropRect.top = 0; info->picCropRect.bottom = 0; } else { - info->picCropRect.left = - ((val >> 10) & 0x3FF) * 2; + info->picCropRect.left = ((val >> 10) & 0x3FF) * 2; info->picCropRect.right = - info->picWidth - ((val & 0x3FF ) * 2); - info->picCropRect.top = - ((val2>>10) & 0x3FF )*2; + info->picWidth - ((val & 0x3FF) * 2); + info->picCropRect.top = ((val2 >> 10) & 0x3FF) * 2; info->picCropRect.bottom = - info->picHeight - ((val2 & 0x3FF ) *2); + info->picHeight - ((val2 & 0x3FF) * 2); } val = (info->picWidth * info->picHeight * 3 / 2) / 1024; @@ -1552,9 +1567,10 @@ RetCode vpu_DecGetInitialInfo(DecHandle handle, DecInitialInfo * info) * the value requested by vpu_DecGetInitialInfo(). * @li RETCODE_INVALID_STRIDE stride is less than the picture width. */ -RetCode vpu_DecRegisterFrameBuffer(DecHandle handle, - FrameBuffer * bufArray, int num, int stride, - DecBufInfo *pBufInfo) +RetCode +vpu_DecRegisterFrameBuffer(DecHandle handle, + FrameBuffer * bufArray, int num, int stride, + DecBufInfo * pBufInfo) { CodecInst *pCodecInst; DecInfo *pDecInfo; @@ -1609,9 +1625,10 @@ RetCode vpu_DecRegisterFrameBuffer(DecHandle handle, if (pCodecInst->codecMode == AVC_DEC) { VpuWriteReg(CMD_SET_FRAME_SLICE_BB_START, - pBufInfo->avcSliceBufInfo.sliceSaveBuffer); + pBufInfo->avcSliceBufInfo.sliceSaveBuffer); VpuWriteReg(CMD_SET_FRAME_SLICE_BB_SIZE, - (pBufInfo->avcSliceBufInfo.sliceSaveBufferSize / 1024)); + (pBufInfo->avcSliceBufInfo.sliceSaveBufferSize / + 1024)); } VpuWriteReg(BIT_BUSY_FLAG, 0x1); @@ -1635,9 +1652,10 @@ RetCode vpu_DecRegisterFrameBuffer(DecHandle handle, * @li RETCODE_INVALID_HANDLE decHandle is invalid. * @li RETCODE_INVALID_PARAM buf or size is invalid. */ -RetCode vpu_DecGetBitstreamBuffer(DecHandle handle, - PhysicalAddress * paRdPtr, - PhysicalAddress * paWrPtr, Uint32 * size) +RetCode +vpu_DecGetBitstreamBuffer(DecHandle handle, + PhysicalAddress * paRdPtr, + PhysicalAddress * paWrPtr, Uint32 * size) { CodecInst *pCodecInst; DecInfo *pDecInfo; @@ -1685,7 +1703,8 @@ RetCode vpu_DecGetBitstreamBuffer(DecHandle handle, * @li RETCODE_INVALID_HANDLE decHandle is invalid. * @li RETCODE_INVALID_PARAM Invalid input parameters. */ -RetCode vpu_DecUpdateBitstreamBuffer(DecHandle handle, Uint32 size) +RetCode +vpu_DecUpdateBitstreamBuffer(DecHandle handle, Uint32 size) { CodecInst *pCodecInst; DecInfo *pDecInfo; @@ -1746,7 +1765,8 @@ RetCode vpu_DecUpdateBitstreamBuffer(DecHandle handle, Uint32 size) * @li RETCODE_FRAME_NOT_COMPLETE A frame has not been finished. * @li RETCODE_WRONG_CALL_SEQUENCE Wrong calling sequence. */ -RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param) +RetCode +vpu_DecStartOneFrame(DecHandle handle, DecParam * param) { CodecInst *pCodecInst; DecInfo *pDecInfo; @@ -1821,8 +1841,7 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param) pDecInfo->rotatorOutput.bufCb); VpuWriteReg(CMD_DEC_PIC_ROT_ADDR_CR, pDecInfo->rotatorOutput.bufCr); - VpuWriteReg(CMD_DEC_PIC_ROT_STRIDE, - pDecInfo->rotatorStride); + VpuWriteReg(CMD_DEC_PIC_ROT_STRIDE, pDecInfo->rotatorStride); } VpuWriteReg(CMD_DEC_PIC_ROT_MODE, rotMir); @@ -1832,14 +1851,14 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param) pDecInfo->openParam.mp4DeblkEnable == 1) { if (pDecInfo->deBlockingFilterOutputValid) { VpuWriteReg(CMD_DEC_PIC_DBK_ADDR_Y, - pDecInfo->deBlockingFilterOutput. - bufY); + pDecInfo-> + deBlockingFilterOutput.bufY); VpuWriteReg(CMD_DEC_PIC_DBK_ADDR_CB, - pDecInfo->deBlockingFilterOutput. - bufCb); + pDecInfo-> + deBlockingFilterOutput.bufCb); VpuWriteReg(CMD_DEC_PIC_DBK_ADDR_CR, - pDecInfo->deBlockingFilterOutput. - bufCr); + pDecInfo-> + deBlockingFilterOutput.bufCr); } else return RETCODE_DEBLOCKING_OUTPUT_NOT_SET; } @@ -1860,8 +1879,8 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param) if (pCodecInst->codecMode == AVC_DEC) { if (pDecInfo->openParam.reorderEnable == 1) { VpuWriteReg(CMD_DEC_DISPLAY_REORDER, - param->dispReorderBuf << 1 | - VpuReadReg(CMD_DEC_DISPLAY_REORDER)); + param->dispReorderBuf << 1 | + VpuReadReg(CMD_DEC_DISPLAY_REORDER)); } } @@ -1894,7 +1913,8 @@ RetCode vpu_DecStartOneFrame(DecHandle handle, DecParam * param) * @li RETCODE_WRONG_CALL_SEQUENCE Wrong calling sequence. * @li RETCODE_INVALID_PARAM Info is an invalid pointer. */ -RetCode vpu_DecGetOutputInfo(DecHandle handle, DecOutputInfo * info) +RetCode +vpu_DecGetOutputInfo(DecHandle handle, DecOutputInfo * info) { CodecInst *pCodecInst; DecInfo *pDecInfo; @@ -1921,9 +1941,9 @@ RetCode vpu_DecGetOutputInfo(DecHandle handle, DecOutputInfo * info) } info->notSufficientPsBuffer = - (VpuReadReg(RET_DEC_PIC_SUCCESS) >> 3) & 0x1; + (VpuReadReg(RET_DEC_PIC_SUCCESS) >> 3) & 0x1; info->notSufficientSliceBuffer = - (VpuReadReg(RET_DEC_PIC_SUCCESS) >> 2) & 0x1; + (VpuReadReg(RET_DEC_PIC_SUCCESS) >> 2) & 0x1; if ((VpuReadReg(RET_DEC_PIC_SUCCESS) & 0x01) == 0) { pendingInstDec = 0; @@ -1939,12 +1959,12 @@ RetCode vpu_DecGetOutputInfo(DecHandle handle, DecOutputInfo * info) int i; val = VpuReadReg(RET_DEC_PIC_NEXT_IDX); - for (i = 0 ; i < 3 ; i++) { + for (i = 0; i < 3; i++) { if (i < pDecInfo->initialInfo.nextDecodedIdxNum) { - info->indexFrameNextDecoded[i] = - ((val >> (i * 5)) & 0x1f); - } else { - info->indexFrameNextDecoded[i] = -1; + info->indexFrameNextDecoded[i] = + ((val >> (i * 5)) & 0x1f); + } else { + info->indexFrameNextDecoded[i] = -1; } } @@ -1982,7 +2002,8 @@ RetCode vpu_DecGetOutputInfo(DecHandle handle, DecOutputInfo * info) return RETCODE_SUCCESS; } -RetCode vpu_DecBitBufferFlush(DecHandle handle) +RetCode +vpu_DecBitBufferFlush(DecHandle handle) { CodecInst *pCodecInst; DecInfo *pDecInfo; @@ -2016,7 +2037,8 @@ RetCode vpu_DecBitBufferFlush(DecHandle handle) return RETCODE_SUCCESS; } -RetCode vpu_DecClrDispFlag(DecHandle handle, int index) +RetCode +vpu_DecClrDispFlag(DecHandle handle, int index) { CodecInst *pCodecInst; DecInfo *pDecInfo; @@ -2056,7 +2078,8 @@ RetCode vpu_DecClrDispFlag(DecHandle handle, int index) * @li RETCODE_INVALID_HANDLE decHandle is invalid. * @li RETCODE_FRAME_NOT_COMPLETE A frame has not been finished. */ -RetCode vpu_DecGiveCommand(DecHandle handle, CodecCommand cmd, void *param) +RetCode +vpu_DecGiveCommand(DecHandle handle, CodecCommand cmd, void *param) { CodecInst *pCodecInst; DecInfo *pDecInfo; @@ -2137,7 +2160,7 @@ RetCode vpu_DecGiveCommand(DecHandle handle, CodecCommand cmd, void *param) if (param == 0) { return RETCODE_INVALID_PARAM; } - angle = *(int *)param; + angle = *(int *) param; if (angle != 0 && angle != 90 && angle != 180 && angle != 270) { return RETCODE_INVALID_PARAM; @@ -2181,7 +2204,7 @@ RetCode vpu_DecGiveCommand(DecHandle handle, CodecCommand cmd, void *param) if (param == 0) { return RETCODE_INVALID_PARAM; } - stride = *(int *)param; + stride = *(int *) param; if (stride % 8 != 0 || stride == 0) { return RETCODE_INVALID_STRIDE; } @@ -2253,7 +2276,6 @@ RetCode vpu_DecGiveCommand(DecHandle handle, CodecCommand cmd, void *param) break; } - default: return RETCODE_INVALID_COMMAND; } |