diff options
| author | Linux Build Service Account <lnxbuild@qualcomm.com> | 2010-08-18 12:39:02 -0700 |
|---|---|---|
| committer | QuIC Gerrit Code Review <code-review@quicinc.com> | 2010-08-18 12:39:02 -0700 |
| commit | 599f9b0a201284522c466c32520347c4b0bdbf8f (patch) | |
| tree | 11e157e4ddd5577226eec8fd490289ecc57d9e32 | |
| parent | 98bb22e8502baf5c2fdb01b86c7e4ad659d044a4 (diff) | |
| parent | 50ba036b4b1b820397e9426130476a0087faf66f (diff) | |
| download | bionic-599f9b0a201284522c466c32520347c4b0bdbf8f.zip bionic-599f9b0a201284522c466c32520347c4b0bdbf8f.tar.gz bionic-599f9b0a201284522c466c32520347c4b0bdbf8f.tar.bz2 | |
Merge "bionic: Added support for NV12_2K aligned." into froyo
| -rw-r--r-- | libc/kernel/common/linux/msm_vidc_enc.h | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/libc/kernel/common/linux/msm_vidc_enc.h b/libc/kernel/common/linux/msm_vidc_enc.h index 9de4953..e5b8d8a 100644 --- a/libc/kernel/common/linux/msm_vidc_enc.h +++ b/libc/kernel/common/linux/msm_vidc_enc.h @@ -74,35 +74,35 @@ #define VEN_PROFILE_H264_HIGH 5 #define VEN_PROFILE_H263_BASELINE 6 -#define VEN_LEVEL_MPEG4_0 0x1 -#define VEN_LEVEL_MPEG4_1 0x2 -#define VEN_LEVEL_MPEG4_2 0x3 -#define VEN_LEVEL_MPEG4_3 0x4 -#define VEN_LEVEL_MPEG4_4 0x5 -#define VEN_LEVEL_MPEG4_5 0x6 -#define VEN_LEVEL_MPEG4_3b 0x7 -#define VEN_LEVEL_MPEG4_6 0x8 - -#define VEN_LEVEL_H264_1 0x9 -#define VEN_LEVEL_H264_1b 0xA -#define VEN_LEVEL_H264_1p1 0xB -#define VEN_LEVEL_H264_1p2 0xC -#define VEN_LEVEL_H264_1p3 0xD -#define VEN_LEVEL_H264_2 0xE -#define VEN_LEVEL_H264_2p1 0xF -#define VEN_LEVEL_H264_2p2 0x10 -#define VEN_LEVEL_H264_3 0x11 -#define VEN_LEVEL_H264_3p1 0x12 -#define VEN_LEVEL_H264_4 0x13 - -#define VEN_LEVEL_H263_10 0x14 -#define VEN_LEVEL_H263_20 0x15 -#define VEN_LEVEL_H263_30 0x16 -#define VEN_LEVEL_H263_40 0x17 -#define VEN_LEVEL_H263_45 0x18 -#define VEN_LEVEL_H263_50 0x19 -#define VEN_LEVEL_H263_60 0x1A -#define VEN_LEVEL_H263_70 0x1B +#define VEN_LEVEL_MPEG4_0 0x1 +#define VEN_LEVEL_MPEG4_1 0x2 +#define VEN_LEVEL_MPEG4_2 0x3 +#define VEN_LEVEL_MPEG4_3 0x4 +#define VEN_LEVEL_MPEG4_4 0x5 +#define VEN_LEVEL_MPEG4_5 0x6 +#define VEN_LEVEL_MPEG4_3b 0x7 +#define VEN_LEVEL_MPEG4_6 0x8 + +#define VEN_LEVEL_H264_1 0x9 +#define VEN_LEVEL_H264_1b 0xA +#define VEN_LEVEL_H264_1p1 0xB +#define VEN_LEVEL_H264_1p2 0xC +#define VEN_LEVEL_H264_1p3 0xD +#define VEN_LEVEL_H264_2 0xE +#define VEN_LEVEL_H264_2p1 0xF +#define VEN_LEVEL_H264_2p2 0x10 +#define VEN_LEVEL_H264_3 0x11 +#define VEN_LEVEL_H264_3p1 0x12 +#define VEN_LEVEL_H264_4 0x13 + +#define VEN_LEVEL_H263_10 0x14 +#define VEN_LEVEL_H263_20 0x15 +#define VEN_LEVEL_H263_30 0x16 +#define VEN_LEVEL_H263_40 0x17 +#define VEN_LEVEL_H263_45 0x18 +#define VEN_LEVEL_H263_50 0x19 +#define VEN_LEVEL_H263_60 0x1A +#define VEN_LEVEL_H263_70 0x1B #define VEN_ENTROPY_MODEL_CAVLC 1 #define VEN_ENTROPY_MODEL_CABAC 2 @@ -131,6 +131,7 @@ #define VEN_INPUTFMT_NV12 1 #define VEN_INPUTFMT_NV21 2 +#define VEN_INPUTFMT_NV12_16M2KA 3 #define VEN_ROTATION_0 1 #define VEN_ROTATION_90 2 @@ -400,4 +401,3 @@ struct venc_msg{ unsigned long msgdata_size; }; #endif - |