diff options
| author | Priya Komarlingam <knspriya@codeaurora.org> | 2010-06-23 19:37:21 -0700 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2010-07-18 08:21:06 -0400 |
| commit | e3f019874c4e6f7ee9d6d4f7ef1b8e514e57d0b3 (patch) | |
| tree | 1af81e3561c2fc52837b0d19913555fb283d676b /include | |
| parent | 8edf4f8e4047dafa8e1f3dad4e21cdd48ca4081d (diff) | |
| download | frameworks_base-e3f019874c4e6f7ee9d6d4f7ef1b8e514e57d0b3.zip frameworks_base-e3f019874c4e6f7ee9d6d4f7ef1b8e514e57d0b3.tar.gz frameworks_base-e3f019874c4e6f7ee9d6d4f7ef1b8e514e57d0b3.tar.bz2 | |
frameworks/base: compilation changes
camera changes and audio changes for compilation
Change-Id: Ic1ed590eed00e2c7093e6b2f9dc5188b6aee4926
Diffstat (limited to 'include')
| -rw-r--r-- | include/camera/CameraParameters.h | 44 | ||||
| -rw-r--r-- | include/media/AudioRecord.h | 6 |
2 files changed, 47 insertions, 3 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 68fe5e7..dde56a9 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -104,6 +104,10 @@ public: // The height (in pixels) of EXIF thumbnail in Jpeg picture. // Example value: "384". Read/write. static const char KEY_JPEG_THUMBNAIL_HEIGHT[]; + + //++TODO is the following parameter is needed when jpeg thumbnail is available + static const char KEY_SUPPORTED_THUMBNAIL_SIZES[]; + // Supported EXIF thumbnail sizes (width x height). 0x0 means not thumbnail // in EXIF. // Example value: "512x384,320x240,0x0". Read only. @@ -137,6 +141,33 @@ public: // GPS altitude. This will be stored in JPEG EXIF header. // Example value: "21.0". Write only. static const char KEY_GPS_ALTITUDE[]; + + static const char KEY_GPS_LATITUDE_REF[]; + static const char KEY_GPS_LONGITUDE_REF[]; + static const char KEY_GPS_ALTITUDE_REF[]; + static const char KEY_GPS_STATUS[]; + static const char KEY_EXIF_DATETIME[]; + + static const char KEY_AUTO_EXPOSURE[]; + static const char KEY_SUPPORTED_AUTO_EXPOSURE[]; + static const char KEY_ISO_MODE[]; + static const char KEY_SUPPORTED_ISO_MODES[]; + static const char KEY_LENSSHADE[] ; + static const char KEY_SUPPORTED_LENSSHADE_MODES[] ; + static const char KEY_SHARPNESS[]; + static const char KEY_MAX_SHARPNESS[]; + static const char KEY_CONTRAST[]; + static const char KEY_MAX_CONTRAST[]; + static const char KEY_SATURATION[]; + static const char KEY_MAX_SATURATION[]; + + // Values for auto exposure settings. + static const char AUTO_EXPOSURE_FRAME_AVG[]; + static const char AUTO_EXPOSURE_CENTER_WEIGHTED[]; + static const char AUTO_EXPOSURE_SPOT_METERING[]; + + + // GPS timestamp (UTC in seconds since January 1, 1970). This should be // stored in JPEG EXIF header. // Example value: "1251192757". Write only. @@ -301,6 +332,7 @@ public: static const char PIXEL_FORMAT_YUV422I[]; // YUY2 static const char PIXEL_FORMAT_RGB565[]; static const char PIXEL_FORMAT_JPEG[]; + static const char PIXEL_FORMAT_RAW[]; // Values for focus mode settings. // Auto-focus mode. @@ -308,6 +340,7 @@ public: // Focus is set at infinity. Applications should not call // CameraHardwareInterface.autoFocus in this mode. static const char FOCUS_MODE_INFINITY[]; + static const char FOCUS_MODE_NORMAL[]; static const char FOCUS_MODE_MACRO[]; // Focus is fixed. The camera is always in this mode if the focus is not // adjustable. If the camera has auto-focus, this mode can fix the @@ -319,6 +352,16 @@ public: // CameraHardwareInterface.autoFocus in this mode. static const char FOCUS_MODE_EDOF[]; + static const char ISO_AUTO[]; + static const char ISO_HJR[] ; + static const char ISO_100[]; + static const char ISO_200[] ; + static const char ISO_400[]; + static const char ISO_800[]; + static const char ISO_1600[]; + // Values for Lens Shading + static const char LENSSHADE_ENABLE[] ; + static const char LENSSHADE_DISABLE[] ; private: DefaultKeyedVector<String8,String8> mMap; }; @@ -326,3 +369,4 @@ private: }; // namespace android #endif + diff --git a/include/media/AudioRecord.h b/include/media/AudioRecord.h index 92bc126..18347d5 100644 --- a/include/media/AudioRecord.h +++ b/include/media/AudioRecord.h @@ -129,9 +129,9 @@ public: */ enum record_flags { - RECORD_AGC_ENABLE = AudioSystem::AGC_ENABLE, - RECORD_NS_ENABLE = AudioSystem::NS_ENABLE, - RECORD_IIR_ENABLE = AudioSystem::TX_IIR_ENABLE + RECORD_AGC_ENABLE = 0x0001, // AudioSystem::AGC_ENABLE, + RECORD_NS_ENABLE = 0x0002, // AudioSystem::NS_ENABLE, + RECORD_IIR_ENABLE = 0x0004, // AudioSystem::TX_IIR_ENABLE }; AudioRecord(int inputSource, |