Revert "kitakami-common: camera: Kang from ether"

This reverts commit b443cfb522e272c7b19ee85a8c1b9cb273b97d9a.

camera/Android.mk

-include $(call all-subdir-makefiles)

camera/CleanSpec.mk

-# Copyright (C) 2007 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.
-#
-
-# If you don't need to do a full clean build but would like to touch
-# a file or delete some intermediate files, add a clean step to the end
-# of the list.  These steps will only be run once, if they haven't been
-# run before.
-#
-# E.g.:
-#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
-#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
-#
-# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
-# files that are missing or have been moved.
-#
-# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
-# Use $(OUT_DIR) to refer to the "out" directory.
-#
-# If you need to re-do something that's already mentioned, just copy
-# the command and add it to the bottom of the list.  E.g., if a change
-# that you made last week required touching a file and a change you
-# made today requires touching the same file, just copy the old
-# touch step and add it to the end of the list.
-#
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-
-# For example:
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
-#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
-#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-
-$(call add-clean-step, find $(OUT_DIR) -name "camera.msm8994*" -print0 | xargs -0 rm -rf)

camera/QCamera2/Android.mk

-LOCAL_PATH:= $(call my-dir)
-
-include $(CLEAR_VARS)
-
-LOCAL_SRC_FILES := \
-    util/QCameraCmdThread.cpp \
-    util/QCameraQueue.cpp \
-    util/QCameraFlash.cpp \
-    QCamera2Hal.cpp \
-    QCamera2Factory.cpp
-
-#HAL 3.0 source
-LOCAL_SRC_FILES += \
-    HAL3/QCamera3HWI.cpp \
-    HAL3/QCamera3Mem.cpp \
-    HAL3/QCamera3Stream.cpp \
-    HAL3/QCamera3Channel.cpp \
-    HAL3/QCamera3VendorTags.cpp \
-    HAL3/QCamera3PostProc.cpp \
-    HAL3/QCamera3CropRegionMapper.cpp
-
-#HAL 1.0 source
-LOCAL_SRC_FILES += \
-    HAL/QCamera2HWI.cpp \
-    HAL/QCameraMem.cpp \
-    HAL/QCameraStateMachine.cpp \
-    HAL/QCameraChannel.cpp \
-    HAL/QCameraStream.cpp \
-    HAL/QCameraPostProc.cpp \
-    HAL/QCamera2HWICallbacks.cpp \
-    HAL/QCameraParameters.cpp \
-    HAL/QCameraThermalAdapter.cpp
-
-LOCAL_CFLAGS := -Wall -Wextra -Werror
-LOCAL_CFLAGS += -DHAS_MULTIMEDIA_HINTS
-
-ifeq ($(TARGET_USES_AOSP),true)
-LOCAL_CFLAGS += -DVANILLA_HAL
-endif
-
-LOCAL_CFLAGS += -DVENDOR_EDIT
-
-#use media extension
-ifeq ($(TARGET_USES_MEDIA_EXTENSIONS), true)
-LOCAL_CFLAGS += -DUSE_MEDIA_EXTENSIONS
-endif
-
-#HAL 1.0 Flags
-LOCAL_CFLAGS += -DDEFAULT_DENOISE_MODE_ON -DHAL3
-
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/stack/common \
-    frameworks/native/include/media/hardware \
-    frameworks/native/include/media/openmax \
-    $(call project-path-for,qcom-media)/libstagefrighthw \
-    system/media/camera/include \
-    $(LOCAL_PATH)/../mm-image-codec/qexif \
-    $(LOCAL_PATH)/../mm-image-codec/qomx_core \
-    $(LOCAL_PATH)/util \
-    $(TARGET_OUT_HEADERS)/qcom/display
-
-#HAL 1.0 Include paths
-LOCAL_C_INCLUDES += \
-    frameworks/native/include/media/hardware \
-    $(LOCAL_PATH)/HAL
-
-LOCAL_HEADER_LIBRARIES := generated_kernel_headers
-
-
-LOCAL_SHARED_LIBRARIES := libcamera_client liblog libhardware libutils libcutils libdl
-LOCAL_SHARED_LIBRARIES += libmmcamera_interface libmmjpeg_interface libui libcamera_metadata
-LOCAL_SHARED_LIBRARIES += libqdMetaData libstagefrighthw
-
-LOCAL_MODULE_RELATIVE_PATH := hw
-LOCAL_MODULE := camera.$(TARGET_BOARD_PLATFORM)
-LOCAL_MODULE_TAGS := optional
-LOCAL_VENDOR_MODULE := true
-
-LOCAL_32_BIT_ONLY := true
-include $(BUILD_SHARED_LIBRARY)
-
-include $(call first-makefiles-under,$(LOCAL_PATH))

camera/QCamera2/HAL/QCameraAllocator.h

-/* Copyright (c) 2012-2015, The Linux Foundataion. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *     * Redistributions of source code must retain the above copyright
- *       notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- *       copyright notice, this list of conditions and the following
- *       disclaimer in the documentation and/or other materials provided
- *       with the distribution.
- *     * Neither the name of The Linux Foundation nor the names of its
- *       contributors may be used to endorse or promote products derived
- *       from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
- * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- */
-
-#ifndef __QCAMERA_ALLOCATOR__
-#define __QCAMERA_ALLOCATOR__
-
-extern "C" {
-#include <mm_camera_interface.h>
-}
-
-namespace qcamera {
-
-class QCameraMemory;
-class QCameraHeapMemory;
-
-class QCameraAllocator {
-public:
-    virtual QCameraMemory *allocateStreamBuf(cam_stream_type_t stream_type,
-            size_t size, int stride, int scanline, uint8_t &bufferCnt) = 0;
-    virtual int32_t allocateMoreStreamBuf(QCameraMemory *mem_obj,
-            size_t size, uint8_t &bufferCnt) = 0;
-    virtual QCameraHeapMemory *allocateStreamInfoBuf(cam_stream_type_t stream_type) = 0;
-    virtual QCameraHeapMemory *allocateMiscBuf(cam_stream_info_t *streamInfo) = 0;
-    virtual QCameraMemory *allocateStreamUserBuf(cam_stream_info_t *streamInfo) = 0;
-    virtual ~QCameraAllocator() {}
-};
-
-}; /* namespace qcamera */
-#endif /* __QCAMERA_ALLOCATOR__ */