summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/camera/CameraParameters.h53
-rw-r--r--include/media/AudioRecord.h6
-rw-r--r--include/media/MediaPlayerInterface.h1
-rw-r--r--include/media/MediaProfiles.h5
-rw-r--r--include/ui/EventHub.h3
-rw-r--r--include/ui/Overlay.h2
-rw-r--r--include/utils/Asset.h6
7 files changed, 65 insertions, 11 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h
index 5ea83a5..dde56a9 100644
--- a/include/camera/CameraParameters.h
+++ b/include/camera/CameraParameters.h
@@ -25,6 +25,12 @@ namespace android {
class CameraParameters
{
public:
+ enum {
+ CAMERA_ORIENTATION_UNKNOWN = 0,
+ CAMERA_ORIENTATION_PORTRAIT = 1,
+ CAMERA_ORIENTATION_LANDSCAPE = 2,
+ };
+
CameraParameters();
CameraParameters(const String8 &params) { unflatten(params); }
~CameraParameters();
@@ -52,6 +58,9 @@ public:
void setPictureFormat(const char *format);
const char *getPictureFormat() const;
+ int getOrientation() const;
+ void setOrientation(int orientation);
+
void dump() const;
status_t dump(int fd, const Vector<String16>& args) const;
@@ -95,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.
@@ -128,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.
@@ -292,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.
@@ -299,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
@@ -310,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;
};
@@ -317,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,
diff --git a/include/media/MediaPlayerInterface.h b/include/media/MediaPlayerInterface.h
index 9e606d9..a50ce35 100644
--- a/include/media/MediaPlayerInterface.h
+++ b/include/media/MediaPlayerInterface.h
@@ -45,6 +45,7 @@ enum player_type {
// The shared library with the test player is passed passed as an
// argument to the 'test:' url in the setDataSource call.
TEST_PLAYER = 5,
+ FLAC_PLAYER = 6,
};
diff --git a/include/media/MediaProfiles.h b/include/media/MediaProfiles.h
index a4eea2a..5354937 100644
--- a/include/media/MediaProfiles.h
+++ b/include/media/MediaProfiles.h
@@ -24,8 +24,9 @@
namespace android {
enum camcorder_quality {
- CAMCORDER_QUALITY_LOW = 0,
- CAMCORDER_QUALITY_HIGH = 1
+ CAMCORDER_QUALITY_LOW = 0,
+ CAMCORDER_QUALITY_HIGH = 1,
+ CAMCORDER_QUALITY_FRONT = 2
};
enum video_decoder {
diff --git a/include/ui/EventHub.h b/include/ui/EventHub.h
index 3b18c77..3896485 100644
--- a/include/ui/EventHub.h
+++ b/include/ui/EventHub.h
@@ -57,7 +57,8 @@ public:
CLASS_TOUCHSCREEN = 0x00000004,
CLASS_TRACKBALL = 0x00000008,
CLASS_TOUCHSCREEN_MT= 0x00000010,
- CLASS_DPAD = 0x00000020
+ CLASS_DPAD = 0x00000020,
+ CLASS_MOUSE = 0x00000040
};
uint32_t getDeviceClasses(int32_t deviceId) const;
diff --git a/include/ui/Overlay.h b/include/ui/Overlay.h
index a9ae1c4..9156e80 100644
--- a/include/ui/Overlay.h
+++ b/include/ui/Overlay.h
@@ -1,5 +1,6 @@
/*
* Copyright (C) 2007 The Android Open Source Project
+ * Copyright (c) 2009, Code Aurora Forum. All rights reserved.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -91,6 +92,7 @@ public:
/* set the buffer attributes */
status_t setParameter(int param, int value);
+ status_t setFd(int fd);
/* returns the address of a given buffer if supported, NULL otherwise. */
void* getBufferAddress(overlay_buffer_t buffer);
diff --git a/include/utils/Asset.h b/include/utils/Asset.h
index 5908bcc..b2697d4 100644
--- a/include/utils/Asset.h
+++ b/include/utils/Asset.h
@@ -63,11 +63,7 @@ public:
enum {
/* data larger than this does not get uncompressed into a buffer */
-#ifdef HAVE_ANDROID_OS
- UNCOMPRESS_DATA_MAX = 1 * 1024 * 1024
-#else
- UNCOMPRESS_DATA_MAX = 2 * 1024 * 1024
-#endif
+ UNCOMPRESS_DATA_MAX = 3 * 1024 * 1024
};
/*
generated by cgit v1.1 at 2025-08-22 06:44:57 +0000