universal7870: rework shims

This commit is contained in:
Astrako 2020-02-28 12:11:49 +01:00 committed by Alejandro
parent 85e3e2ce1d
commit 1634a6f5ee
17 changed files with 410 additions and 151 deletions

View file

@ -1,5 +1,5 @@
#
# Copyright (C) 2019 The LineageOS Project
# Copyright (C) 2018 The LineageOS Project
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@ -16,12 +16,15 @@
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
LOCAL_SRC_FILES := CameraParameters.cpp GraphicBuffer.cpp
LOCAL_SRC_FILES := GraphicBuffer.cpp Fence.cpp
LOCAL_C_INCLUDES := frameworks/native/include
LOCAL_SHARED_LIBRARIES := libui libutils
LOCAL_SHARED_LIBRARIES := libgui_vendor libui
LOCAL_MODULE := libexynoscamera_shim
LOCAL_MODULE_TAGS := optional
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_VENDOR_MODULE := true
LOCAL_PROPRIETARY_MODULE := true
include $(BUILD_SHARED_LIBRARY)

View file

@ -1,52 +0,0 @@
/*
* Copyright (C) 2018 The LineageOS 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.
*/
#include "CameraParameters.h"
namespace android {
const char CameraParameters::PIXEL_FORMAT_YUV420SP_NV21[] = "nv21";
const char CameraParameters::EFFECT_CARTOONIZE[] = "cartoonize";
const char CameraParameters::EFFECT_POINT_RED_YELLOW[] = "point-red-yellow";
const char CameraParameters::EFFECT_POINT_GREEN[] = "point-green";
const char CameraParameters::EFFECT_POINT_BLUE[] = "point-blue";
const char CameraParameters::EFFECT_VINTAGE_COLD[] = "vintage-cold";
const char CameraParameters::EFFECT_VINTAGE_WARM[] = "vintage-warm";
const char CameraParameters::EFFECT_WASHED[] = "washed";
const char CameraParameters::ISO_AUTO[] = "auto";
const char CameraParameters::ISO_NIGHT[] = "night";
const char CameraParameters::ISO_SPORTS[] = "sports";
const char CameraParameters::ISO_6400[] = "6400";
const char CameraParameters::ISO_3200[] = "3200";
const char CameraParameters::ISO_1600[] = "1600";
const char CameraParameters::ISO_800[] = "800";
const char CameraParameters::ISO_400[] = "400";
const char CameraParameters::ISO_200[] = "200";
const char CameraParameters::ISO_100[] = "100";
const char CameraParameters::ISO_80[] = "80";
const char CameraParameters::ISO_50[] = "50";
const char CameraParameters::KEY_SUPPORTED_METERING_MODE[] = "metering-values";
const char CameraParameters::METERING_CENTER[] = "center";
const char CameraParameters::METERING_MATRIX[] = "matrix";
const char CameraParameters::METERING_SPOT[] = "spot";
const char CameraParameters::METERING_OFF[] = "off";
const char CameraParameters::KEY_DYNAMIC_RANGE_CONTROL[] = "dynamic-range-control";
const char CameraParameters::KEY_SUPPORTED_PHASE_AF[] = "phase-af-values";
const char CameraParameters::KEY_PHASE_AF[] = "phase-af";
const char CameraParameters::KEY_SUPPORTED_RT_HDR[] = "rt-hdr-values";
const char CameraParameters::KEY_RT_HDR[] = "rt-hdr";
}; // namespace android

View file

@ -1,54 +0,0 @@
/*
* Copyright (C) 2018 The LineageOS 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.
*/
namespace android {
class CameraParameters
{
public:
static const char PIXEL_FORMAT_YUV420SP_NV21[];
static const char EFFECT_CARTOONIZE[];
static const char EFFECT_POINT_RED_YELLOW[];
static const char EFFECT_POINT_GREEN[];
static const char EFFECT_POINT_BLUE[];
static const char EFFECT_VINTAGE_COLD[];
static const char EFFECT_VINTAGE_WARM[];
static const char EFFECT_WASHED[];
static const char ISO_AUTO[];
static const char ISO_NIGHT[];
static const char ISO_SPORTS[];
static const char ISO_6400[];
static const char ISO_3200[];
static const char ISO_1600[];
static const char ISO_800[];
static const char ISO_400[];
static const char ISO_200[];
static const char ISO_100[];
static const char ISO_80[];
static const char ISO_50[];
static const char KEY_SUPPORTED_METERING_MODE[];
static const char METERING_CENTER[];
static const char METERING_MATRIX[];
static const char METERING_SPOT[];
static const char METERING_OFF[];
static const char KEY_DYNAMIC_RANGE_CONTROL[];
static const char KEY_SUPPORTED_PHASE_AF[];
static const char KEY_PHASE_AF[];
static const char KEY_SUPPORTED_RT_HDR[];
static const char KEY_RT_HDR[];
};
}; // namespace android

View file

@ -0,0 +1,26 @@
/*
* Copyright (C) 2018 The LineageOS 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.
*/
/* status_t android::Fence::wait(int timeout); */
extern "C" int _ZN7android5Fence4waitEi(int timeout);
/* status_t android::Fence::wait(unsigned int timeout); */
extern "C" int _ZN7android5Fence4waitEj(unsigned int timeout)
{
return _ZN7android5Fence4waitEi(static_cast<int>(timeout));
}
extern "C" void _ZN7android5FenceD1Ev() { }

View file

@ -14,11 +14,8 @@
* limitations under the License.
*/
#include <ui/GraphicBuffer.h>
extern "C" void _ZN7android5FenceD1Ev() { }
extern "C" void _ZN7android13GraphicBufferC1EjjijjjP13native_handleb(
const native_handle_t* handle,
android::GraphicBuffer::HandleWrapMethod method,