diff options
Diffstat (limited to 'services/camera/libcameraservice/api1/client2')
8 files changed, 13 insertions, 13 deletions
diff --git a/services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp b/services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp index 143cc61..5f4fb22 100644 --- a/services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp +++ b/services/camera/libcameraservice/api1/client2/CallbackProcessor.cpp @@ -55,7 +55,7 @@ void CallbackProcessor::onFrameAvailable(const BufferItem& /*item*/) { } status_t CallbackProcessor::setCallbackWindow( - sp<ANativeWindow> callbackWindow) { + sp<Surface> callbackWindow) { ATRACE_CALL(); status_t res; @@ -115,7 +115,7 @@ status_t CallbackProcessor::updateStream(const Parameters ¶ms) { BufferQueue::createBufferQueue(&producer, &consumer); mCallbackConsumer = new CpuConsumer(consumer, kCallbackHeapCount); mCallbackConsumer->setFrameAvailableListener(this); - mCallbackConsumer->setName(String8("Camera2Client::CallbackConsumer")); + mCallbackConsumer->setName(String8("Camera2-CallbackConsumer")); mCallbackWindow = new Surface(producer); } diff --git a/services/camera/libcameraservice/api1/client2/CallbackProcessor.h b/services/camera/libcameraservice/api1/client2/CallbackProcessor.h index 7fdc329..a290536 100644 --- a/services/camera/libcameraservice/api1/client2/CallbackProcessor.h +++ b/services/camera/libcameraservice/api1/client2/CallbackProcessor.h @@ -47,7 +47,7 @@ class CallbackProcessor: void onFrameAvailable(const BufferItem& item); // Set to NULL to disable the direct-to-app callback window - status_t setCallbackWindow(sp<ANativeWindow> callbackWindow); + status_t setCallbackWindow(sp<Surface> callbackWindow); status_t updateStream(const Parameters ¶ms); status_t deleteStream(); int getStreamId() const; @@ -73,7 +73,7 @@ class CallbackProcessor: int mCallbackStreamId; static const size_t kCallbackHeapCount = 6; sp<CpuConsumer> mCallbackConsumer; - sp<ANativeWindow> mCallbackWindow; + sp<Surface> mCallbackWindow; sp<Camera2Heap> mCallbackHeap; int mCallbackHeapId; size_t mCallbackHeapHead, mCallbackHeapFree; diff --git a/services/camera/libcameraservice/api1/client2/JpegProcessor.cpp b/services/camera/libcameraservice/api1/client2/JpegProcessor.cpp index 88987f9..bd9786f 100644 --- a/services/camera/libcameraservice/api1/client2/JpegProcessor.cpp +++ b/services/camera/libcameraservice/api1/client2/JpegProcessor.cpp @@ -87,7 +87,7 @@ status_t JpegProcessor::updateStream(const Parameters ¶ms) { BufferQueue::createBufferQueue(&producer, &consumer); mCaptureConsumer = new CpuConsumer(consumer, 1); mCaptureConsumer->setFrameAvailableListener(this); - mCaptureConsumer->setName(String8("Camera2Client::CaptureConsumer")); + mCaptureConsumer->setName(String8("Camera2-JpegConsumer")); mCaptureWindow = new Surface(producer); } diff --git a/services/camera/libcameraservice/api1/client2/JpegProcessor.h b/services/camera/libcameraservice/api1/client2/JpegProcessor.h index 2040b30..fbdae11 100644 --- a/services/camera/libcameraservice/api1/client2/JpegProcessor.h +++ b/services/camera/libcameraservice/api1/client2/JpegProcessor.h @@ -70,8 +70,8 @@ class JpegProcessor: int mCaptureStreamId; sp<CpuConsumer> mCaptureConsumer; - sp<ANativeWindow> mCaptureWindow; - sp<MemoryHeapBase> mCaptureHeap; + sp<Surface> mCaptureWindow; + sp<MemoryHeapBase> mCaptureHeap; virtual bool threadLoop(); diff --git a/services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp b/services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp index 36d143b..66d7b00 100644 --- a/services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp +++ b/services/camera/libcameraservice/api1/client2/StreamingProcessor.cpp @@ -64,7 +64,7 @@ StreamingProcessor::~StreamingProcessor() { deleteRecordingStream(); } -status_t StreamingProcessor::setPreviewWindow(sp<ANativeWindow> window) { +status_t StreamingProcessor::setPreviewWindow(sp<Surface> window) { ATRACE_CALL(); status_t res; diff --git a/services/camera/libcameraservice/api1/client2/StreamingProcessor.h b/services/camera/libcameraservice/api1/client2/StreamingProcessor.h index 42e9e7a..e0cad3a 100644 --- a/services/camera/libcameraservice/api1/client2/StreamingProcessor.h +++ b/services/camera/libcameraservice/api1/client2/StreamingProcessor.h @@ -43,7 +43,7 @@ class StreamingProcessor: StreamingProcessor(sp<Camera2Client> client); ~StreamingProcessor(); - status_t setPreviewWindow(sp<ANativeWindow> window); + status_t setPreviewWindow(sp<Surface> window); bool haveValidPreviewWindow() const; @@ -108,7 +108,7 @@ class StreamingProcessor: int32_t mPreviewRequestId; int mPreviewStreamId; CameraMetadata mPreviewRequest; - sp<ANativeWindow> mPreviewWindow; + sp<Surface> mPreviewWindow; // Recording-related members static const nsecs_t kWaitDuration = 50000000; // 50 ms @@ -117,7 +117,7 @@ class StreamingProcessor: int mRecordingStreamId; int mRecordingFrameCount; sp<BufferItemConsumer> mRecordingConsumer; - sp<ANativeWindow> mRecordingWindow; + sp<Surface> mRecordingWindow; CameraMetadata mRecordingRequest; sp<camera2::Camera2Heap> mRecordingHeap; diff --git a/services/camera/libcameraservice/api1/client2/ZslProcessor.cpp b/services/camera/libcameraservice/api1/client2/ZslProcessor.cpp index d8500df..0b79b31 100644 --- a/services/camera/libcameraservice/api1/client2/ZslProcessor.cpp +++ b/services/camera/libcameraservice/api1/client2/ZslProcessor.cpp @@ -139,7 +139,7 @@ status_t ZslProcessor::updateStream(const Parameters ¶ms) { GRALLOC_USAGE_HW_CAMERA_ZSL, kZslBufferDepth); mZslConsumer->setFrameAvailableListener(this); - mZslConsumer->setName(String8("Camera2Client::ZslConsumer")); + mZslConsumer->setName(String8("Camera2-ZslConsumer")); mZslWindow = new Surface(producer); } diff --git a/services/camera/libcameraservice/api1/client2/ZslProcessor.h b/services/camera/libcameraservice/api1/client2/ZslProcessor.h index 5f50d7b..5870bd3 100644 --- a/services/camera/libcameraservice/api1/client2/ZslProcessor.h +++ b/services/camera/libcameraservice/api1/client2/ZslProcessor.h @@ -101,7 +101,7 @@ class ZslProcessor: int mZslStreamId; int mZslReprocessStreamId; sp<BufferItemConsumer> mZslConsumer; - sp<ANativeWindow> mZslWindow; + sp<Surface> mZslWindow; struct ZslPair { BufferItem buffer; |