diff options
| author | James Dong <jdong@google.com> | 2012-08-02 17:24:14 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-02 17:24:14 -0700 |
| commit | 4b5412b6fe136a7391076c53eea6974c664ead91 (patch) | |
| tree | faa2244bb1f59ec711247d1e45ee6048c01be15d /services/camera/libcameraservice/CameraClient.cpp | |
| parent | 76a794f66595390c21639b6af89a6efbfd564e06 (diff) | |
| parent | 903f037ae7e6161818cb3b2d662fd380a9d02499 (diff) | |
| download | frameworks_av-4b5412b6fe136a7391076c53eea6974c664ead91.zip frameworks_av-4b5412b6fe136a7391076c53eea6974c664ead91.tar.gz frameworks_av-4b5412b6fe136a7391076c53eea6974c664ead91.tar.bz2 | |
am 903f037a: am 983cf231: Dynamically configure the number of video buffers used by camera source, if supported
* commit '903f037ae7e6161818cb3b2d662fd380a9d02499':
Dynamically configure the number of video buffers used by camera source, if supported
Diffstat (limited to 'services/camera/libcameraservice/CameraClient.cpp')
| -rw-r--r-- | services/camera/libcameraservice/CameraClient.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp index 54829ef..562384d 100644 --- a/services/camera/libcameraservice/CameraClient.cpp +++ b/services/camera/libcameraservice/CameraClient.cpp @@ -619,6 +619,9 @@ status_t CameraClient::sendCommand(int32_t cmd, int32_t arg1, int32_t arg2) { return OK; } else if (cmd == CAMERA_CMD_PLAY_RECORDING_SOUND) { mCameraService->playSound(CameraService::SOUND_RECORDING); + } else if (cmd == CAMERA_CMD_SET_VIDEO_BUFFER_COUNT) { + // Silently ignore this command + return INVALID_OPERATION; } else if (cmd == CAMERA_CMD_PING) { // If mHardware is 0, checkPidAndHardware will return error. return OK; |