diff options
author | cyanogen <shade@chemlab.org> | 2010-09-23 15:34:41 -0400 |
---|---|---|
committer | cyanogen <shade@chemlab.org> | 2010-09-23 15:34:41 -0400 |
commit | b5d9f64973f06b45423b2216050aa0d2d2513f96 (patch) | |
tree | e633283c360b25b837e48f3e28faa172c701c9ce /libs | |
parent | 850341d63c237c3814bc9ab7490a4c765e214377 (diff) | |
download | frameworks_base-b5d9f64973f06b45423b2216050aa0d2d2513f96.zip frameworks_base-b5d9f64973f06b45423b2216050aa0d2d2513f96.tar.gz frameworks_base-b5d9f64973f06b45423b2216050aa0d2d2513f96.tar.bz2 |
Revert "Camera: Add support for getBufferInfo API"
This reverts commit 57495aafa6ab172c2d2cfe32ca8a4fa57f98cb9b.
Diffstat (limited to 'libs')
-rw-r--r-- | libs/camera/Camera.cpp | 11 | ||||
-rw-r--r-- | libs/camera/ICamera.cpp | 27 |
2 files changed, 0 insertions, 38 deletions
diff --git a/libs/camera/Camera.cpp b/libs/camera/Camera.cpp index d90ac26..30ee7c4 100644 --- a/libs/camera/Camera.cpp +++ b/libs/camera/Camera.cpp @@ -1,8 +1,6 @@ /* ** ** Copyright (C) 2008, The Android Open Source Project -** Copyright (C) 2008 HTC Inc. -** Copyright (C) 2010, Code Aurora Forum. All rights reserved. ** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. @@ -176,15 +174,6 @@ status_t Camera::setPreviewDisplay(const sp<ISurface>& surface) } -status_t Camera::getBufferInfo(sp<IMemory>& Frame, size_t *alignedSize) -{ - LOGV("getBufferInfo"); - sp <ICamera> c = mCamera; - if (c == 0) return NO_INIT; - return c->getBufferInfo(Frame, alignedSize); -} - - // start preview mode status_t Camera::startPreview() { diff --git a/libs/camera/ICamera.cpp b/libs/camera/ICamera.cpp index 48ba361..13673b5 100644 --- a/libs/camera/ICamera.cpp +++ b/libs/camera/ICamera.cpp @@ -1,7 +1,6 @@ /* ** ** Copyright 2008, The Android Open Source Project -** Copyright (C) 2010, Code Aurora Forum. All rights reserved. ** ** Licensed under the Apache License, Version 2.0 (the "License"); ** you may not use this file except in compliance with the License. @@ -46,7 +45,6 @@ enum { STOP_RECORDING, RECORDING_ENABLED, RELEASE_RECORDING_FRAME, - GET_BUFFER_INFO, }; class BpCamera: public BpInterface<ICamera> @@ -88,22 +86,6 @@ public: remote()->transact(SET_PREVIEW_CALLBACK_FLAG, data, &reply); } - - // get the recording buffer information. - status_t getBufferInfo(sp<IMemory>& Frame, size_t *alignedSize) - { - status_t ret; - LOGV("getBufferInfo"); - Parcel data, reply; - data.writeInterfaceToken(ICamera::getInterfaceDescriptor()); - data.writeStrongBinder(Frame->asBinder()); - remote()->transact(GET_BUFFER_INFO, data, &reply); - ret = reply.readInt32(); - *alignedSize = reply.readInt32(); - return ret; - } - - // start preview mode, must call setPreviewDisplay first status_t startPreview() { @@ -287,15 +269,6 @@ status_t BnCamera::onTransact( setPreviewCallbackFlag(callback_flag); return NO_ERROR; } break; - case GET_BUFFER_INFO:{ - LOGV("GET_BUFFER_INFO"); - CHECK_INTERFACE(ICamera, data, reply); - sp<IMemory> Frame = interface_cast<IMemory>(data.readStrongBinder()); - size_t alignedSize; - reply->writeInt32(getBufferInfo(Frame, &alignedSize)); - reply->writeInt32(alignedSize); - return NO_ERROR; - } break; case START_PREVIEW: { LOGV("START_PREVIEW"); CHECK_INTERFACE(ICamera, data, reply); |