50fe430994
Inherit as much as possible from camera.device@3.2 - Refactor CameraDeviceSession@3.2 implementation to separate out the HIDL session interface from the main implementation object. This avoids multiple inheritance issues - Create CameraDeviceSession@3.3 with support for the new overrideDataspace field - Add virtual factory method for CameraDevice to create the right version of Session. - Create CameraDevice@3.3, which overrides createSession to return a CameraDeviceSession@3.3. - Add system property to override selection of which minor HIDL version is used for legal HAL version 3.x; set the default to the newest available minor version. Test: Camera CTS passes on device using @3.3. Bug: 62358514 Change-Id: I497e4bc0de798b56ecdb2ea6467b79afccaf89f7
65 lines
2.3 KiB
C++
65 lines
2.3 KiB
C++
/*
|
|
* Copyright (C) 2017 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.
|
|
*/
|
|
|
|
#define LOG_TAG "android.hardware.camera.device@3.3-convert-impl"
|
|
#include <log/log.h>
|
|
|
|
#include "include/convert.h"
|
|
|
|
namespace android {
|
|
namespace hardware {
|
|
namespace camera {
|
|
namespace device {
|
|
namespace V3_3 {
|
|
namespace implementation {
|
|
|
|
using ::android::hardware::graphics::common::V1_0::Dataspace;
|
|
using ::android::hardware::graphics::common::V1_0::PixelFormat;
|
|
using ::android::hardware::camera::device::V3_2::BufferUsageFlags;
|
|
|
|
void convertToHidl(const Camera3Stream* src, HalStream* dst) {
|
|
dst->overrideDataSpace = src->data_space;
|
|
dst->v3_2.id = src->mId;
|
|
dst->v3_2.overrideFormat = (PixelFormat) src->format;
|
|
dst->v3_2.maxBuffers = src->max_buffers;
|
|
if (src->stream_type == CAMERA3_STREAM_OUTPUT) {
|
|
dst->v3_2.consumerUsage = (BufferUsageFlags)0;
|
|
dst->v3_2.producerUsage = (BufferUsageFlags)src->usage;
|
|
} else if (src->stream_type == CAMERA3_STREAM_INPUT) {
|
|
dst->v3_2.producerUsage = (BufferUsageFlags)0;
|
|
dst->v3_2.consumerUsage = (BufferUsageFlags)src->usage;
|
|
} else {
|
|
//Should not reach here per current HIDL spec, but we might end up adding
|
|
// bi-directional stream to HIDL.
|
|
ALOGW("%s: Stream type %d is not currently supported!",
|
|
__FUNCTION__, src->stream_type);
|
|
}
|
|
}
|
|
|
|
void convertToHidl(const camera3_stream_configuration_t& src, HalStreamConfiguration* dst) {
|
|
dst->streams.resize(src.num_streams);
|
|
for (uint32_t i = 0; i < src.num_streams; i++) {
|
|
convertToHidl(static_cast<Camera3Stream*>(src.streams[i]), &dst->streams[i]);
|
|
}
|
|
return;
|
|
}
|
|
|
|
} // namespace implementation
|
|
} // namespace V3_3
|
|
} // namespace device
|
|
} // namespace camera
|
|
} // namespace hardware
|
|
} // namespace android
|