diff options
| author | Brint E. Kriebel <bekit@cyngn.com> | 2014-12-23 15:31:01 -0800 |
|---|---|---|
| committer | Brint E. Kriebel <bekit@cyngn.com> | 2014-12-23 15:31:01 -0800 |
| commit | 44bfd087f2317419e1f3fad151d7e3f7079818df (patch) | |
| tree | aede37964d6a455d291065c9d544e91bbdec5d8b /include/media/MediaProfiles.h | |
| parent | 2fa08d8a1e43aaab3986b187a02f425050aae7b9 (diff) | |
| parent | ebdbd54cafa24515b57abf664c4f90f52603ad51 (diff) | |
| download | frameworks_av-44bfd087f2317419e1f3fad151d7e3f7079818df.tar.gz frameworks_av-44bfd087f2317419e1f3fad151d7e3f7079818df.tar.bz2 frameworks_av-44bfd087f2317419e1f3fad151d7e3f7079818df.zip | |
Merge branch 'cm-11.0' into stable/cm-11.0cm-11.0-XNPH05Q-bacon-5229c4ef56stable/cm-11.0-XNF9Xstable/cm-11.0
Diffstat (limited to 'include/media/MediaProfiles.h')
| -rw-r--r-- | include/media/MediaProfiles.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h index f84eed0d8b..1fa1d7dcfd 100644 --- a/include/media/MediaProfiles.h +++ b/include/media/MediaProfiles.h @@ -32,21 +32,16 @@ enum camcorder_quality { CAMCORDER_QUALITY_480P = 4, CAMCORDER_QUALITY_720P = 5, CAMCORDER_QUALITY_1080P = 6, -#ifdef QCOM_HARDWARE CAMCORDER_QUALITY_QVGA = 7, CAMCORDER_QUALITY_FWVGA = 8, CAMCORDER_QUALITY_WVGA = 9, CAMCORDER_QUALITY_VGA = 10, CAMCORDER_QUALITY_WQVGA = 11, +#ifdef QCOM_HARDWARE CAMCORDER_QUALITY_4kUHD = 12, CAMCORDER_QUALITY_4kDCI = 13, CAMCORDER_QUALITY_LIST_END = 13, #else - CAMCORDER_QUALITY_QVGA = 11, - CAMCORDER_QUALITY_FWVGA = 7, - CAMCORDER_QUALITY_WVGA = 8, - CAMCORDER_QUALITY_VGA = 9, - CAMCORDER_QUALITY_WQVGA = 10, CAMCORDER_QUALITY_LIST_END = 11, #endif |