diff options
author | Mathias Agopian <mathias@google.com> | 2011-03-25 18:57:22 -0700 |
---|---|---|
committer | Mathias Agopian <mathias@google.com> | 2011-03-25 18:57:22 -0700 |
commit | 70fdb9e9011b43826aba4ea277a46d481676c525 (patch) | |
tree | f2c12b8562248035e253962b4b3aa342f4b948db | |
parent | 8338c01276b39870a361b0f4313a4bcd0f4a45e4 (diff) | |
download | msm7k-70fdb9e9011b43826aba4ea277a46d481676c525.tar.gz |
get rid of this unused opencore module
Change-Id: I608e0c437fdfc456fcd598943a7fc621002ffe0a
-rw-r--r-- | libopencorehw/Android.mk | 51 | ||||
-rw-r--r-- | libopencorehw/MODULE_LICENSE_APACHE2 | 0 | ||||
-rw-r--r-- | libopencorehw/NOTICE | 189 | ||||
-rw-r--r-- | libopencorehw/android_surface_output_msm72xx.cpp | 263 | ||||
-rw-r--r-- | libopencorehw/android_surface_output_msm72xx.h | 77 |
5 files changed, 0 insertions, 580 deletions
diff --git a/libopencorehw/Android.mk b/libopencorehw/Android.mk deleted file mode 100644 index 07b7eed..0000000 --- a/libopencorehw/Android.mk +++ /dev/null @@ -1,51 +0,0 @@ -# -# Copyright (C) 2009 The Android Open Source Project -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# - -ifneq ($(BUILD_WITHOUT_PV),true) - -LOCAL_PATH := $(call my-dir) -include $(CLEAR_VARS) - -# Set up the OpenCore variables. -include external/opencore/Config.mk -LOCAL_C_INCLUDES := $(PV_INCLUDES) - -LOCAL_SRC_FILES := \ - android_surface_output_msm72xx.cpp - -LOCAL_CFLAGS := $(PV_CFLAGS_MINUS_VISIBILITY) - -LOCAL_SHARED_LIBRARIES := \ - libutils \ - libbinder \ - libcutils \ - libui \ - libhardware\ - libandroid_runtime \ - libmedia \ - libskia \ - libopencore_common \ - libicuuc \ - libopencore_player \ - libsurfaceflinger_client - -LOCAL_MODULE := libopencorehw - -LOCAL_LDLIBS += - -include $(BUILD_SHARED_LIBRARY) - -endif diff --git a/libopencorehw/MODULE_LICENSE_APACHE2 b/libopencorehw/MODULE_LICENSE_APACHE2 deleted file mode 100644 index e69de29..0000000 --- a/libopencorehw/MODULE_LICENSE_APACHE2 +++ /dev/null diff --git a/libopencorehw/NOTICE b/libopencorehw/NOTICE deleted file mode 100644 index a94ca1f..0000000 --- a/libopencorehw/NOTICE +++ /dev/null @@ -1,189 +0,0 @@ - Copyright (c) 2009, The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. - - - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - - TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - - 1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - - 2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - - 3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - - 4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - - 5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - - 6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - - 7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - - 8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - - 9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - - END OF TERMS AND CONDITIONS - diff --git a/libopencorehw/android_surface_output_msm72xx.cpp b/libopencorehw/android_surface_output_msm72xx.cpp deleted file mode 100644 index 584b4f7..0000000 --- a/libopencorehw/android_surface_output_msm72xx.cpp +++ /dev/null @@ -1,263 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 2009 Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ - -//#define LOG_NDEBUG 0 -#define LOG_TAG "VideoMio72xx" -#include <utils/Log.h> - -#include "android_surface_output_msm72xx.h" -#include <media/PVPlayer.h> - -#define PLATFORM_PRIVATE_PMEM 1 - -#if HAVE_ANDROID_OS -#include <linux/android_pmem.h> -#endif - -using namespace android; - -static const char* pmem_adsp = "/dev/pmem_adsp"; -static const char* pmem = "/dev/pmem"; - -OSCL_EXPORT_REF AndroidSurfaceOutputMsm72xx::AndroidSurfaceOutputMsm72xx() : - AndroidSurfaceOutput() -{ - mHardwareCodec = false; -} - -OSCL_EXPORT_REF AndroidSurfaceOutputMsm72xx::~AndroidSurfaceOutputMsm72xx() -{ -} - -// create a frame buffer for software codecs -OSCL_EXPORT_REF bool AndroidSurfaceOutputMsm72xx::initCheck() -{ - - // initialize only when we have all the required parameters - if (((iVideoParameterFlags & VIDEO_SUBFORMAT_VALID) == 0) || !checkVideoParameterFlags()) - return mInitialized; - - // release resources if previously initialized - closeFrameBuf(); - - // reset flags in case display format changes in the middle of a stream - resetVideoParameterFlags(); - - // copy parameters in case we need to adjust them - int displayWidth = iVideoDisplayWidth; - int displayHeight = iVideoDisplayHeight; - int frameWidth = iVideoWidth; - int frameHeight = iVideoHeight; - int frameSize; - - // MSM72xx hardware codec uses semi-planar format - if (iVideoSubFormat == PVMF_MIME_YUV420_SEMIPLANAR_YVU) { - LOGV("using hardware codec"); - mHardwareCodec = true; - // Workaround for tearing from SF - // But please make sure that the number of unique output - // buffers are more than 2; otherwise, the video playback - // will freeze due to starvation. - mNumberOfFramesToHold = 2; - } else { - LOGV("using software codec"); - - // YUV420 frames are 1.5 bytes/pixel - frameSize = (frameWidth * frameHeight * 3) / 2; - - // create frame buffer heap - sp<MemoryHeapBase> master = new MemoryHeapBase(pmem_adsp, frameSize * kBufferCount); - if (master->heapID() < 0) { - LOGE("Error creating frame buffer heap"); - return false; - } - master->setDevice(pmem); - sp<MemoryHeapPmem> heap = new MemoryHeapPmem(master, 0); - heap->slap(); - mBufferHeap = ISurface::BufferHeap(displayWidth, displayHeight, - frameWidth, frameHeight, HAL_PIXEL_FORMAT_YCrCb_420_SP, heap); - master.clear(); - mSurface->registerBuffers(mBufferHeap); - - // create frame buffers - for (int i = 0; i < kBufferCount; i++) { - mFrameBuffers[i] = i * frameSize; - } - - LOGV("video = %d x %d", displayWidth, displayHeight); - LOGV("frame = %d x %d", frameWidth, frameHeight); - LOGV("frame #bytes = %d", frameSize); - - // register frame buffers with SurfaceFlinger - mFrameBufferIndex = 0; - } - - mInitialized = true; - LOGV("sendEvent(MEDIA_SET_VIDEO_SIZE, %d, %d)", iVideoDisplayWidth, iVideoDisplayHeight); - mPvPlayer->sendEvent(MEDIA_SET_VIDEO_SIZE, iVideoDisplayWidth, iVideoDisplayHeight); - return mInitialized; -} - -PVMFStatus AndroidSurfaceOutputMsm72xx::writeFrameBuf(uint8* aData, uint32 aDataLen, const PvmiMediaXferHeader& data_header_info) -{ - // OK to drop frames if no surface - if (mSurface == 0) return PVMFSuccess; - - // hardware codec - if (mHardwareCodec) { - - // initialize frame buffer heap - if (mBufferHeap.heap == 0) { - LOGV("initializing for hardware"); - LOGV("private data pointer is 0%p\n", data_header_info.private_data_ptr); - - // check for correct video format - if (iVideoSubFormat != PVMF_MIME_YUV420_SEMIPLANAR_YVU) return PVMFFailure; - - uint32 fd; - if (!getPmemFd(data_header_info.private_data_ptr, &fd)) { - LOGE("Error getting pmem heap from private_data_ptr"); - return PVMFFailure; - } - - // ugly hack to pass an sp<MemoryHeapBase> as an int - sp<MemoryHeapBase> master = (MemoryHeapBase *) fd; - master->setDevice(pmem); - - // create new reference - uint32_t heap_flags = master->getFlags() & MemoryHeapBase::NO_CACHING; - sp<MemoryHeapPmem> heap = new MemoryHeapPmem(master, heap_flags); - heap->slap(); - - // register frame buffers with SurfaceFlinger - mBufferHeap = ISurface::BufferHeap(iVideoDisplayWidth, iVideoDisplayHeight, - iVideoWidth, iVideoHeight, HAL_PIXEL_FORMAT_YCrCb_420_SP, heap); - master.clear(); - mSurface->registerBuffers(mBufferHeap); - } - - // get pmem offset and post to SurfaceFlinger - if (!getOffset(data_header_info.private_data_ptr, &mOffset)) { - LOGE("Error getting pmem offset from private_data_ptr"); - return PVMFFailure; - } - mSurface->postBuffer(mOffset); - } else { - // software codec - if (++mFrameBufferIndex == kBufferCount) mFrameBufferIndex = 0; - convertFrame(aData, static_cast<uint8*>(mBufferHeap.heap->base()) + mFrameBuffers[mFrameBufferIndex], aDataLen); - // post to SurfaceFlinger - mSurface->postBuffer(mFrameBuffers[mFrameBufferIndex]); - } - - return PVMFSuccess; -} - -// post the last video frame to refresh screen after pause -void AndroidSurfaceOutputMsm72xx::postLastFrame() -{ - // ignore if no surface or heap - if ((mSurface == NULL) || (mBufferHeap.heap == NULL)) return; - - if (mHardwareCodec) { - mSurface->postBuffer(mOffset); - } else { - mSurface->postBuffer(mFrameBuffers[mFrameBufferIndex]); - } -} - -bool AndroidSurfaceOutputMsm72xx::getPmemFd(OsclAny *private_data_ptr, uint32 *pmemFD) -{ - PLATFORM_PRIVATE_LIST *listPtr = NULL; - PLATFORM_PRIVATE_PMEM_INFO *pmemInfoPtr = NULL; - bool returnType = false; - LOGV("in getPmemfd - privatedataptr=%p\n",private_data_ptr); - listPtr = (PLATFORM_PRIVATE_LIST*) private_data_ptr; - - for (uint32 i=0;i<listPtr->nEntries;i++) - { - if(listPtr->entryList->type == PLATFORM_PRIVATE_PMEM) - { - LOGV("in getPmemfd - entry type = %d\n",listPtr->entryList->type); - pmemInfoPtr = (PLATFORM_PRIVATE_PMEM_INFO*) (listPtr->entryList->entry); - returnType = true; - if(pmemInfoPtr){ - *pmemFD = pmemInfoPtr->pmem_fd; - LOGV("in getPmemfd - pmemFD = %d\n",*pmemFD); - } - break; - } - } - return returnType; -} - -bool AndroidSurfaceOutputMsm72xx::getOffset(OsclAny *private_data_ptr, uint32 *offset) -{ - PLATFORM_PRIVATE_LIST *listPtr = NULL; - PLATFORM_PRIVATE_PMEM_INFO *pmemInfoPtr = NULL; - bool returnType = false; - - listPtr = (PLATFORM_PRIVATE_LIST*) private_data_ptr; - LOGV("in getOffset: listPtr = %p\n",listPtr); - for (uint32 i=0;i<listPtr->nEntries;i++) - { - if(listPtr->entryList->type == PLATFORM_PRIVATE_PMEM) - { - LOGV(" in getOffset: entrytype = %d\n",listPtr->entryList->type); - - pmemInfoPtr = (PLATFORM_PRIVATE_PMEM_INFO*) (listPtr->entryList->entry); - returnType = true; - if(pmemInfoPtr){ - *offset = pmemInfoPtr->offset; - LOGV("in getOffset: offset = %d\n",*offset); - } - break; - } - } - return returnType; -} - -static inline void* byteOffset(void* p, size_t offset) { return (void*)((uint8_t*)p + offset); } - -void AndroidSurfaceOutputMsm72xx::convertFrame(void* src, void* dst, size_t len) -{ - // copy the Y plane - size_t y_plane_size = iVideoWidth * iVideoHeight; - //LOGV("len=%u, y_plane_size=%u", len, y_plane_size); - memcpy(dst, src, y_plane_size + iVideoWidth); - - // re-arrange U's and V's - uint16_t* pu = (uint16_t*)byteOffset(src, y_plane_size); - uint16_t* pv = (uint16_t*)byteOffset(pu, y_plane_size / 4); - uint32_t* p = (uint32_t*)byteOffset(dst, y_plane_size); - - int count = y_plane_size / 8; - //LOGV("u = %p, v = %p, p = %p, count = %d", pu, pv, p, count); - do { - uint32_t u = *pu++; - uint32_t v = *pv++; - *p++ = ((u & 0xff) << 8) | ((u & 0xff00) << 16) | (v & 0xff) | ((v & 0xff00) << 8); - } while (--count); -} - -// factory function for playerdriver linkage -extern "C" AndroidSurfaceOutputMsm72xx* createVideoMio() -{ - return new AndroidSurfaceOutputMsm72xx(); -} - diff --git a/libopencorehw/android_surface_output_msm72xx.h b/libopencorehw/android_surface_output_msm72xx.h deleted file mode 100644 index 56c9695..0000000 --- a/libopencorehw/android_surface_output_msm72xx.h +++ /dev/null @@ -1,77 +0,0 @@ -/* ------------------------------------------------------------------ - * Copyright (C) 2009 Android Open Source Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either - * express or implied. - * See the License for the specific language governing permissions - * and limitations under the License. - * ------------------------------------------------------------------- - */ - -#ifndef ANDROID_SURFACE_OUTPUT_MSM72XXH_INCLUDED -#define ANDROID_SURFACE_OUTPUT_MSM72XXH_INCLUDED - -#include "android_surface_output.h" - -// support for shared contiguous physical memory -#include <binder/MemoryHeapPmem.h> - -// data structures for tunneling buffers -typedef struct PLATFORM_PRIVATE_PMEM_INFO -{ - /* pmem file descriptor */ - uint32 pmem_fd; - uint32 offset; -} PLATFORM_PRIVATE_PMEM_INFO; - -typedef struct PLATFORM_PRIVATE_ENTRY -{ - /* Entry type */ - uint32 type; - - /* Pointer to platform specific entry */ - OsclAny* entry; -} PLATFORM_PRIVATE_ENTRY; - -typedef struct PLATFORM_PRIVATE_LIST -{ - /* Number of entries */ - uint32 nEntries; - - /* Pointer to array of platform specific entries * - * Contiguous block of PLATFORM_PRIVATE_ENTRY elements */ - PLATFORM_PRIVATE_ENTRY* entryList; -} PLATFORM_PRIVATE_LIST; - - -class AndroidSurfaceOutputMsm72xx : public AndroidSurfaceOutput -{ -public: - AndroidSurfaceOutputMsm72xx(); - - // frame buffer interface - virtual bool initCheck(); - virtual PVMFStatus writeFrameBuf(uint8* aData, uint32 aDataLen, const PvmiMediaXferHeader& data_header_info); - virtual void postLastFrame(); - - OSCL_IMPORT_REF ~AndroidSurfaceOutputMsm72xx(); - -private: - bool getPmemFd(OsclAny *private_data_ptr, uint32 *pmemFD); - bool getOffset(OsclAny *private_data_ptr, uint32 *offset); - void convertFrame(void* src, void* dst, size_t len); - - // hardware frame buffer support - bool mHardwareCodec; - uint32 mOffset; -}; - -#endif // ANDROID_SURFACE_OUTPUT_MSM72XX_H_INCLUDED |