diff options
| author | Yin-Chia Yeh <yinchiayeh@google.com> | 2014-06-18 10:51:34 -0700 |
|---|---|---|
| committer | Yin-Chia Yeh <yinchiayeh@google.com> | 2014-06-20 15:27:33 -0700 |
| commit | cd8fce8fbe0f515e53a0ea0f50b739cf42ee57a4 (patch) | |
| tree | 1ae578c40cd358b4dd59dc9f4dbb4a9cc1d2418b /services/camera/libcameraservice/api1/Camera2Client.cpp | |
| parent | f5fe801c6e00d99e5dcf15cdbfd3bc5402715089 (diff) | |
| download | frameworks_av-cd8fce8fbe0f515e53a0ea0f50b739cf42ee57a4.zip frameworks_av-cd8fce8fbe0f515e53a0ea0f50b739cf42ee57a4.tar.gz frameworks_av-cd8fce8fbe0f515e53a0ea0f50b739cf42ee57a4.tar.bz2 | |
Camera2: get stream configs by device verison
Starting from device version 3.2, the following tags:
ANDROID_SCALER_AVAILABLE_FORMATS
ANDROID_SCALER_AVAILABLE_JPEG_MIN_DURATIONS
ANDROID_SCALER_AVAILABLE_JPEG_SIZES
ANDROID_SCALER_AVAILABLE_PROCESSED_MIN_DURATIONS
ANDROID_SCALER_AVAILABLE_PROCESSED_SIZES
ANDROID_SCALER_AVAILABLE_RAW_MIN_DURATIONS
ANDROID_SCALER_AVAILABLE_RAW_SIZES
are deprecated and replaced by:
ANDROID_SCALER_AVAILABLE_STREAM_CONFIGURATIONS
Change-Id: Iadc34af0ea985a16a25759d7a9a3eb4845c486fd
Diffstat (limited to 'services/camera/libcameraservice/api1/Camera2Client.cpp')
| -rw-r--r-- | services/camera/libcameraservice/api1/Camera2Client.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/services/camera/libcameraservice/api1/Camera2Client.cpp b/services/camera/libcameraservice/api1/Camera2Client.cpp index 0447979..a6f5a6c 100644 --- a/services/camera/libcameraservice/api1/Camera2Client.cpp +++ b/services/camera/libcameraservice/api1/Camera2Client.cpp @@ -53,12 +53,10 @@ Camera2Client::Camera2Client(const sp<CameraService>& cameraService, int cameraFacing, int clientPid, uid_t clientUid, - int servicePid, - int deviceVersion): + int servicePid): Camera2ClientBase(cameraService, cameraClient, clientPackageName, cameraId, cameraFacing, clientPid, clientUid, servicePid), - mParameters(cameraId, cameraFacing), - mDeviceVersion(deviceVersion) + mParameters(cameraId, cameraFacing) { ATRACE_CALL(); @@ -80,7 +78,7 @@ status_t Camera2Client::initialize(camera_module_t *module) { SharedParameters::Lock l(mParameters); - res = l.mParameters.initialize(&(mDevice->info())); + res = l.mParameters.initialize(&(mDevice->info()), mDeviceVersion); if (res != OK) { ALOGE("%s: Camera %d: unable to build defaults: %s (%d)", __FUNCTION__, mCameraId, strerror(-res), res); |