diff options
| author | Eino-Ville Talvala <etalvala@google.com> | 2015-06-09 21:53:48 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-09 21:53:49 +0000 |
| commit | 6021de00076de9e358b3d557b58f79d7bb067ecd (patch) | |
| tree | b775945443d8b1bbb3ead9cc531240d326eb00da /services/camera/libcameraservice/CameraFlashlight.cpp | |
| parent | 416d4a8ad177a48bcb25aa3a32c4bdfaf6227014 (diff) | |
| parent | 727d172137b4f32681c098de8e2623c0b65a6406 (diff) | |
| download | frameworks_av-6021de00076de9e358b3d557b58f79d7bb067ecd.zip frameworks_av-6021de00076de9e358b3d557b58f79d7bb067ecd.tar.gz frameworks_av-6021de00076de9e358b3d557b58f79d7bb067ecd.tar.bz2 | |
Merge "CameraService: Add consumer name to output stream dumpsys" into mnc-dev
Diffstat (limited to 'services/camera/libcameraservice/CameraFlashlight.cpp')
| -rw-r--r-- | services/camera/libcameraservice/CameraFlashlight.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/services/camera/libcameraservice/CameraFlashlight.cpp b/services/camera/libcameraservice/CameraFlashlight.cpp index 8613ac6..280bb9d 100644 --- a/services/camera/libcameraservice/CameraFlashlight.cpp +++ b/services/camera/libcameraservice/CameraFlashlight.cpp @@ -359,7 +359,7 @@ CameraDeviceClientFlashControl::~CameraDeviceClientFlashControl() { delete mMetadata; } - mAnw.clear(); + mSurface.clear(); mSurfaceTexture.clear(); mProducer.clear(); mConsumer.clear(); @@ -395,11 +395,11 @@ status_t CameraDeviceClientFlashControl::initializeSurface( return res; } - mAnw = new Surface(mProducer, /*useAsync*/ true); - if (mAnw == NULL) { + mSurface = new Surface(mProducer, /*useAsync*/ true); + if (mSurface == NULL) { return NO_MEMORY; } - res = device->createStream(mAnw, width, height, format, + res = device->createStream(mSurface, width, height, format, HAL_DATASPACE_UNKNOWN, CAMERA3_STREAM_ROTATION_0, &mStreamId); if (res) { return res; @@ -653,7 +653,7 @@ CameraHardwareInterfaceFlashControl::CameraHardwareInterfaceFlashControl( CameraHardwareInterfaceFlashControl::~CameraHardwareInterfaceFlashControl() { disconnectCameraDevice(); - mAnw.clear(); + mSurface.clear(); mSurfaceTexture.clear(); mProducer.clear(); mConsumer.clear(); @@ -810,18 +810,18 @@ status_t CameraHardwareInterfaceFlashControl::initializePreviewWindow( return res; } - mAnw = new Surface(mProducer, /*useAsync*/ true); - if (mAnw == NULL) { + mSurface = new Surface(mProducer, /*useAsync*/ true); + if (mSurface == NULL) { return NO_MEMORY; } - res = native_window_api_connect(mAnw.get(), NATIVE_WINDOW_API_CAMERA); + res = native_window_api_connect(mSurface.get(), NATIVE_WINDOW_API_CAMERA); if (res) { ALOGE("%s: Unable to connect to native window", __FUNCTION__); return res; } - return device->setPreviewWindow(mAnw); + return device->setPreviewWindow(mSurface); } status_t CameraHardwareInterfaceFlashControl::connectCameraDevice( @@ -870,7 +870,7 @@ status_t CameraHardwareInterfaceFlashControl::disconnectCameraDevice() { CameraParameters::FLASH_MODE_OFF); mDevice->setParameters(mParameters); mDevice->stopPreview(); - status_t res = native_window_api_disconnect(mAnw.get(), + status_t res = native_window_api_disconnect(mSurface.get(), NATIVE_WINDOW_API_CAMERA); if (res) { ALOGW("%s: native_window_api_disconnect failed: %s (%d)", |