diff options
author | Wu-cheng Li <wuchengli@google.com> | 2010-08-24 09:01:27 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2010-08-24 09:01:27 -0700 |
commit | 10d3d28bdd0004dec5cc7963ec4a73f096fe93d2 (patch) | |
tree | 14073185f90d0c39e4c36beac8ecb7713a4a5340 /include/camera | |
parent | 8f3e6aa2951358c0dea593a2448171a3f97cc0eb (diff) | |
parent | 846f79b30e249ebca7d95442907723a0d14601fa (diff) | |
download | frameworks_av-10d3d28bdd0004dec5cc7963ec4a73f096fe93d2.zip frameworks_av-10d3d28bdd0004dec5cc7963ec4a73f096fe93d2.tar.gz frameworks_av-10d3d28bdd0004dec5cc7963ec4a73f096fe93d2.tar.bz2 |
am 346b6126: am 97a56269: Merge "Add camera fps range API." into gingerbread
Merge commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e'
* commit '346b6126d54bda4ddc705b27f49004b5cf3a2b3e':
Add camera fps range API.
Diffstat (limited to 'include/camera')
-rw-r--r-- | include/camera/CameraParameters.h | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/include/camera/CameraParameters.h b/include/camera/CameraParameters.h index 4bc1799..a5c7874 100644 --- a/include/camera/CameraParameters.h +++ b/include/camera/CameraParameters.h @@ -61,6 +61,7 @@ public: void getSupportedPreviewSizes(Vector<Size> &sizes) const; void setPreviewFrameRate(int fps); int getPreviewFrameRate() const; + void getPreviewFpsRange(int *min_fps, int *max_fps) const; void setPreviewFormat(const char *format); const char *getPreviewFormat() const; void setPictureSize(int width, int height); @@ -82,6 +83,20 @@ public: // Supported preview frame sizes in pixels. // Example value: "800x600,480x320". Read only. static const char KEY_SUPPORTED_PREVIEW_SIZES[]; + // The current minimum and maximum preview fps. This controls the rate of + // preview frames received (CAMERA_MSG_PREVIEW_FRAME). The minimum and + // maximum fps must be one of the elements from + // KEY_SUPPORTED_PREVIEW_FPS_RANGE parameter. + // Example value: "10500,26623" + static const char KEY_PREVIEW_FPS_RANGE[]; + // The supported preview fps (frame-per-second) ranges. Each range contains + // a minimum fps and maximum fps. If minimum fps equals to maximum fps, the + // camera outputs frames in fixed frame rate. If not, the camera outputs + // frames in auto frame rate. The actual frame rate fluctuates between the + // minimum and the maximum. The list has at least one element. The list is + // sorted from small to large (first by maximum fps and then minimum fps). + // Example value: "(10500,26623),(15000,26623),(30000,30000)" + static const char KEY_SUPPORTED_PREVIEW_FPS_RANGE[]; // The image format for preview frames. See CAMERA_MSG_PREVIEW_FRAME in // frameworks/base/include/camera/Camera.h. // Example value: "yuv420sp" or PIXEL_FORMAT_XXX constants. Read/write. |