diff options
author | Mathias Agopian <mathias@google.com> | 2013-02-14 17:11:27 -0800 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2013-02-15 12:47:35 -0800 |
commit | b1e7cd156ca3e1747374e0d20cdd1ce467210453 (patch) | |
tree | 557f25ff5a0477f0cf0f89d4c21b0291371f09a2 /services/camera | |
parent | 62ad9071cd61fc56355d3c2d25895382003ea362 (diff) | |
download | frameworks_av-b1e7cd156ca3e1747374e0d20cdd1ce467210453.zip frameworks_av-b1e7cd156ca3e1747374e0d20cdd1ce467210453.tar.gz frameworks_av-b1e7cd156ca3e1747374e0d20cdd1ce467210453.tar.bz2 |
Refactoring: Rename SurfaceTextureClient to Surface
Change-Id: I4e8a8b20914cb64edc37abe68233fbc9f2b5d830
Diffstat (limited to 'services/camera')
8 files changed, 13 insertions, 16 deletions
diff --git a/services/camera/libcameraservice/Camera2Client.cpp b/services/camera/libcameraservice/Camera2Client.cpp index 70bf0ac..b9feaf8 100644 --- a/services/camera/libcameraservice/Camera2Client.cpp +++ b/services/camera/libcameraservice/Camera2Client.cpp @@ -22,7 +22,6 @@ #include <utils/Trace.h> #include <cutils/properties.h> -#include <gui/SurfaceTextureClient.h> #include <gui/Surface.h> #include "camera2/Parameters.h" #include "Camera2Client.h" @@ -489,7 +488,7 @@ status_t Camera2Client::setPreviewDisplay( sp<IBinder> binder; sp<ANativeWindow> window; if (surface != 0) { - binder = surface->asBinder(); + binder = surface->getISurfaceTexture()->asBinder(); window = surface; } @@ -508,7 +507,7 @@ status_t Camera2Client::setPreviewTexture( sp<ANativeWindow> window; if (bufferProducer != 0) { binder = bufferProducer->asBinder(); - window = new SurfaceTextureClient(bufferProducer); + window = new Surface(bufferProducer); } return setPreviewWindowL(binder, window); } diff --git a/services/camera/libcameraservice/CameraClient.cpp b/services/camera/libcameraservice/CameraClient.cpp index f9cee0d..5f03a1c 100644 --- a/services/camera/libcameraservice/CameraClient.cpp +++ b/services/camera/libcameraservice/CameraClient.cpp @@ -18,7 +18,6 @@ //#define LOG_NDEBUG 0 #include <cutils/properties.h> -#include <gui/SurfaceTextureClient.h> #include <gui/Surface.h> #include "CameraClient.h" @@ -302,7 +301,7 @@ status_t CameraClient::setPreviewWindow(const sp<IBinder>& binder, status_t CameraClient::setPreviewDisplay(const sp<Surface>& surface) { LOG1("setPreviewDisplay(%p) (pid %d)", surface.get(), getCallingPid()); - sp<IBinder> binder(surface != 0 ? surface->asBinder() : 0); + sp<IBinder> binder(surface != 0 ? surface->getISurfaceTexture()->asBinder() : 0); sp<ANativeWindow> window(surface); return setPreviewWindow(binder, window); } @@ -317,7 +316,7 @@ status_t CameraClient::setPreviewTexture( sp<ANativeWindow> window; if (bufferProducer != 0) { binder = bufferProducer->asBinder(); - window = new SurfaceTextureClient(bufferProducer); + window = new Surface(bufferProducer); } return setPreviewWindow(binder, window); } diff --git a/services/camera/libcameraservice/CameraClient.h b/services/camera/libcameraservice/CameraClient.h index 7da3da7..74829ce 100644 --- a/services/camera/libcameraservice/CameraClient.h +++ b/services/camera/libcameraservice/CameraClient.h @@ -124,7 +124,7 @@ private: // Ensures atomicity among the public methods mutable Mutex mLock; - // This is a binder of Surface or SurfaceTextureClient. + // This is a binder of Surface or Surface. sp<IBinder> mSurface; sp<ANativeWindow> mPreviewWindow; diff --git a/services/camera/libcameraservice/CameraService.cpp b/services/camera/libcameraservice/CameraService.cpp index 124d24d..717e159 100644 --- a/services/camera/libcameraservice/CameraService.cpp +++ b/services/camera/libcameraservice/CameraService.cpp @@ -28,7 +28,6 @@ #include <binder/MemoryHeapBase.h> #include <cutils/atomic.h> #include <cutils/properties.h> -#include <gui/SurfaceTextureClient.h> #include <gui/Surface.h> #include <hardware/hardware.h> #include <media/AudioSystem.h> diff --git a/services/camera/libcameraservice/camera2/CallbackProcessor.cpp b/services/camera/libcameraservice/camera2/CallbackProcessor.cpp index 307cfab..c4055e0 100644 --- a/services/camera/libcameraservice/camera2/CallbackProcessor.cpp +++ b/services/camera/libcameraservice/camera2/CallbackProcessor.cpp @@ -22,7 +22,7 @@ #include <utils/Trace.h> #include "CallbackProcessor.h" -#include <gui/SurfaceTextureClient.h> +#include <gui/Surface.h> #include "../Camera2Device.h" #include "../Camera2Client.h" @@ -65,7 +65,7 @@ status_t CallbackProcessor::updateStream(const Parameters ¶ms) { mCallbackConsumer = new CpuConsumer(kCallbackHeapCount); mCallbackConsumer->setFrameAvailableListener(this); mCallbackConsumer->setName(String8("Camera2Client::CallbackConsumer")); - mCallbackWindow = new SurfaceTextureClient( + mCallbackWindow = new Surface( mCallbackConsumer->getProducerInterface()); } diff --git a/services/camera/libcameraservice/camera2/JpegProcessor.cpp b/services/camera/libcameraservice/camera2/JpegProcessor.cpp index 6280f83..1ec5694 100644 --- a/services/camera/libcameraservice/camera2/JpegProcessor.cpp +++ b/services/camera/libcameraservice/camera2/JpegProcessor.cpp @@ -26,7 +26,7 @@ #include <utils/Trace.h> #include "JpegProcessor.h" -#include <gui/SurfaceTextureClient.h> +#include <gui/Surface.h> #include "../Camera2Device.h" #include "../Camera2Client.h" @@ -82,7 +82,7 @@ status_t JpegProcessor::updateStream(const Parameters ¶ms) { mCaptureConsumer = new CpuConsumer(1); mCaptureConsumer->setFrameAvailableListener(this); mCaptureConsumer->setName(String8("Camera2Client::CaptureConsumer")); - mCaptureWindow = new SurfaceTextureClient( + mCaptureWindow = new Surface( mCaptureConsumer->getProducerInterface()); // Create memory for API consumption mCaptureHeap = new MemoryHeapBase(maxJpegSize.data.i32[0], 0, diff --git a/services/camera/libcameraservice/camera2/StreamingProcessor.cpp b/services/camera/libcameraservice/camera2/StreamingProcessor.cpp index 6ea27b2..a0d1093 100644 --- a/services/camera/libcameraservice/camera2/StreamingProcessor.cpp +++ b/services/camera/libcameraservice/camera2/StreamingProcessor.cpp @@ -20,7 +20,7 @@ #include <utils/Log.h> #include <utils/Trace.h> -#include <gui/SurfaceTextureClient.h> +#include <gui/Surface.h> #include <media/hardware/MetadataBufferType.h> #include "StreamingProcessor.h" @@ -284,7 +284,7 @@ status_t StreamingProcessor::updateRecordingStream(const Parameters ¶ms) { true); mRecordingConsumer->setFrameAvailableListener(this); mRecordingConsumer->setName(String8("Camera2-RecordingConsumer")); - mRecordingWindow = new SurfaceTextureClient( + mRecordingWindow = new Surface( mRecordingConsumer->getProducerInterface()); // Allocate memory later, since we don't know buffer size until receipt } diff --git a/services/camera/libcameraservice/camera2/ZslProcessor.cpp b/services/camera/libcameraservice/camera2/ZslProcessor.cpp index 9584028..900c099 100644 --- a/services/camera/libcameraservice/camera2/ZslProcessor.cpp +++ b/services/camera/libcameraservice/camera2/ZslProcessor.cpp @@ -29,7 +29,7 @@ #include <utils/Trace.h> #include "ZslProcessor.h" -#include <gui/SurfaceTextureClient.h> +#include <gui/Surface.h> #include "../Camera2Device.h" #include "../Camera2Client.h" @@ -124,7 +124,7 @@ status_t ZslProcessor::updateStream(const Parameters ¶ms) { true); mZslConsumer->setFrameAvailableListener(this); mZslConsumer->setName(String8("Camera2Client::ZslConsumer")); - mZslWindow = new SurfaceTextureClient( + mZslWindow = new Surface( mZslConsumer->getProducerInterface()); } |