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

[format]: use astyle to format all source file

Browse Source 
git-svn-id: https://10.10.10.66:8443/svn/MediaProcessPlatform/trunk/mpp@96 6e48237b-75ef-9749-8fc9-41990f28c85a
This commit is contained in:
ChenHengming
2015-08-13 02:26:39 +00:00
parent d1a1891f70
commit 3057548e07
12 changed files with 212 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
inc/vpu_api.h
View File

@@ -22,8 +22,7 @@
#define VPU_API_NOPTS_VALUE (0x8000000000000000LL) #define VPU_API_NOPTS_VALUE (0x8000000000000000LL)
typedef enum VPU_API_CMD typedef enum VPU_API_CMD {
{
VPU_API_ENC_SETCFG, VPU_API_ENC_SETCFG,
VPU_API_ENC_GETCFG, VPU_API_ENC_GETCFG,
VPU_API_ENC_SETFORMAT, VPU_API_ENC_SETFORMAT,
@@ -35,8 +34,7 @@ typedef enum VPU_API_CMD
VPU_API_SET_INFO_CHANGE, VPU_API_SET_INFO_CHANGE,
} VPU_API_CMD; } VPU_API_CMD;
typedef struct typedef struct {
{
RK_U32 TimeLow; RK_U32 TimeLow;
RK_U32 TimeHigh; RK_U32 TimeHigh;
} TIME_STAMP; } TIME_STAMP;
@@ -48,8 +46,7 @@ typedef struct VPUMem {
RK_U32 *offset; RK_U32 *offset;
} VPUMemLinear_t; } VPUMemLinear_t;
typedef struct tVPU_FRAME typedef struct tVPU_FRAME {
{
RK_U32 FrameBusAddr[2]; // 0: Y address; 1: UV address; RK_U32 FrameBusAddr[2]; // 0: Y address; 1: UV address;
RK_U32 FrameWidth; // buffer horizontal stride RK_U32 FrameWidth; // buffer horizontal stride
RK_U32 FrameHeight; // buffer vertical stride RK_U32 FrameHeight; // buffer vertical stride
@@ -110,8 +107,7 @@ typedef struct EncoderOut {
} EncoderOut_t; } EncoderOut_t;
typedef enum typedef enum {
{
VPU_H264ENC_YUV420_PLANAR = 0, /* YYYY... UUUU... VVVV */ VPU_H264ENC_YUV420_PLANAR = 0, /* YYYY... UUUU... VVVV */
VPU_H264ENC_YUV420_SEMIPLANAR = 1, /* YYYY... UVUVUV... */ VPU_H264ENC_YUV420_SEMIPLANAR = 1, /* YYYY... UVUVUV... */
VPU_H264ENC_YUV422_INTERLEAVED_YUYV = 2, /* YUYVYUYV... */ VPU_H264ENC_YUV422_INTERLEAVED_YUYV = 2, /* YUYVYUYV... */
@@ -181,8 +177,7 @@ typedef enum VPU_API_ERR{
VPU_API_ERR_BUTT, VPU_API_ERR_BUTT,
} VPU_API_ERR; } VPU_API_ERR;
typedef struct EncParameter typedef struct EncParameter {
{
RK_S32 width; RK_S32 width;
RK_S32 height; RK_S32 height;
RK_S32 rc_mode; RK_S32 rc_mode;

3
mpp/legacy/vpu_api_legacy.h
View File

@@ -19,7 +19,8 @@
#include "vpu_api.h" #include "vpu_api.h"
class VpuApi { class VpuApi
{
public: public:
VpuApi(); VpuApi();
~VpuApi(); ~VpuApi();

6
osal/inc/mpp_list.h
View File

@@ -31,7 +31,8 @@
typedef void *(*node_destructor)(void *); typedef void *(*node_destructor)(void *);
struct mpp_list_node; struct mpp_list_node;
class mpp_list { class mpp_list
{
public: public:
mpp_list(node_destructor func); mpp_list(node_destructor func);
~mpp_list(); ~mpp_list();
@@ -77,8 +78,7 @@ private:
extern "C" { extern "C" {
#endif #endif
struct list_head struct list_head {
{
struct list_head *next, *prev; struct list_head *next, *prev;
}; };

3
test/vpu_api_test.c
View File

@@ -236,8 +236,7 @@ static RK_S32 readBytesFromFile(RK_U8* buf, RK_S32 aBytes, FILE* file)
} }
RK_S32 ret = (RK_S32)fread(buf, 1, aBytes, file); RK_S32 ret = (RK_S32)fread(buf, 1, aBytes, file);
if(ret != aBytes) if (ret != aBytes) {
{
mpp_log("read %d bytes from file fail\n", aBytes); mpp_log("read %d bytes from file fail\n", aBytes);
return -1; return -1;
} }