diff options
| author | Rajiv Kumar <c_rkumar@qualcomm.com> | 2010-08-19 15:11:54 +0530 |
|---|---|---|
| committer | Rajiv Kumar <rkumar@codeaurora.org> | 2010-08-20 14:15:07 +0530 |
| commit | 57f9226888f75a3ebbf70255390449dbe3e649cb (patch) | |
| tree | 85af3d3396d79aea7c801634a2889eb11455775a | |
| parent | a170967bbc7a588c77eaf26d1769878b7d698541 (diff) | |
| download | bionic-57f9226888f75a3ebbf70255390449dbe3e649cb.zip bionic-57f9226888f75a3ebbf70255390449dbe3e649cb.tar.gz bionic-57f9226888f75a3ebbf70255390449dbe3e649cb.tar.bz2 | |
Revert "Revert" bionic: Added support for NV12_2K aligned.
This reverts commit 05313fb203618ae70e25d7935579522ba155801f.
Change-Id: I2d233541a6034be6de6214ffa77a0e301ac24d85
| -rw-r--r-- | libc/kernel/common/linux/msm_vidc_enc.h | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/libc/kernel/common/linux/msm_vidc_enc.h b/libc/kernel/common/linux/msm_vidc_enc.h index 9de4953..1268064 100644 --- a/libc/kernel/common/linux/msm_vidc_enc.h +++ b/libc/kernel/common/linux/msm_vidc_enc.h @@ -74,22 +74,22 @@ #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_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 @@ -130,7 +130,8 @@ #define VEN_FLUSH_ALL 3 #define VEN_INPUTFMT_NV12 1 -#define VEN_INPUTFMT_NV21 2 +#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 - |