diff options
| author | tbalden <illespal@gmail.com> | 2013-03-23 23:06:45 +0100 |
|---|---|---|
| committer | tbalden <illespal@gmail.com> | 2013-04-14 11:01:38 +0200 |
| commit | ff2064e7dcad3c85005fc4564e04fde184240df9 (patch) | |
| tree | 52dd63087c9954b038196439420e91c843dcab8c /services/camera/libcameraservice/CameraClient.cpp | |
| parent | 203e28ca88001f2a0f4db7a3018977c687333941 (diff) | |
| download | frameworks_av-ff2064e7dcad3c85005fc4564e04fde184240df9.zip frameworks_av-ff2064e7dcad3c85005fc4564e04fde184240df9.tar.gz frameworks_av-ff2064e7dcad3c85005fc4564e04fde184240df9.tar.bz2 | |
Camera: QCOM legacy definitions,HTC cam switch,NO_UPDATE_PREVIEW
Updating Camera parameters, and service with several
compatibility patches:
1., QCOM legacy CameraParameters and functions:
Adding these will make ICS qcomm camera blobs work on JB 4.2.
Use BOARD_USES_QCOM_LEGACY_CAM_PARAMS := true in BoardConfig
to use this.
Also fixes the problem of legacy qcom
camera blobs with recent libcameraservice QCOM_HARDWARE changes,
where the orientation is messed up on first
preview: the fix is leaving out setPreviewWindow(window) for
legacy qcomm cam blobs.
2., Also adding NO_UPDATE_PREVIEW flag for legacy purposes.
3., Adding adding the set orientation patch:
Always set buffers orientation when setting the qcom camera preview window
Fixes the rotated preview on TouchPad
https://github.com/CyanogenMod/android_frameworks_base/commit/1a8e41a3c7434737db89b604352575f8b3109e7a
4., camera: Full support for HTC camera switch
5., Adding more parameters for HTC Explorer
Change-Id: I2bfc72b8ef027665356788f1db7f96b31d037dbe
Diffstat (limited to 'services/camera/libcameraservice/CameraClient.cpp')
| -rw-r--r-- | services/camera/libcameraservice/CameraClient.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp index 1cdb938..967562d 100644 --- a/services/camera/libcameraservice/CameraClient.cpp +++ b/services/camera/libcameraservice/CameraClient.cpp @@ -251,8 +251,10 @@ void CameraClient::disconnect() { // Release the held ANativeWindow resources. if (mPreviewWindow != 0) { #ifdef QCOM_HARDWARE +#ifndef NO_UPDATE_PREVIEW mHardware->setPreviewWindow(0); #endif +#endif disconnectWindow(mPreviewWindow); mPreviewWindow = 0; #ifndef QCOM_HARDWARE @@ -297,9 +299,14 @@ status_t CameraClient::setPreviewWindow(const sp<IBinder>& binder, result = mHardware->setPreviewWindow(window); } #ifdef QCOM_HARDWARE +#ifndef NO_UPDATE_PREVIEW } else { + if (window != 0) { + native_window_set_buffers_transform(window.get(), mOrientation); + } result = mHardware->setPreviewWindow(window); #endif +#endif } if (result == NO_ERROR) { |