From 7408849ad0c596eab86c8156726df4b0d3ce89d0 Mon Sep 17 00:00:00 2001 From: Dongwon Kang Date: Thu, 13 Oct 2016 16:17:01 -0700 Subject: [PATCH] tv.input: add android.hardware.tv.input@1.0-(impl|service) Test: end-to-end test with SW hal implementation Bug: 32096101 Change-Id: Ieae2129ffd90cdd5f4605bd7cbcb2d7c9ed36f42 --- tv/input/1.0/default/Android.mk | 44 ++++ tv/input/1.0/default/TvInput.cpp | 226 ++++++++++++++++++ tv/input/1.0/default/TvInput.h | 75 ++++++ .../android.hardware.tv.input@1.0-service.rc | 4 + tv/input/1.0/default/service.cpp | 31 +++ 5 files changed, 380 insertions(+) create mode 100644 tv/input/1.0/default/Android.mk create mode 100644 tv/input/1.0/default/TvInput.cpp create mode 100644 tv/input/1.0/default/TvInput.h create mode 100644 tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc create mode 100644 tv/input/1.0/default/service.cpp diff --git a/tv/input/1.0/default/Android.mk b/tv/input/1.0/default/Android.mk new file mode 100644 index 0000000000..520b0bf6c8 --- /dev/null +++ b/tv/input/1.0/default/Android.mk @@ -0,0 +1,44 @@ +LOCAL_PATH := $(call my-dir) + +include $(CLEAR_VARS) +LOCAL_MODULE := android.hardware.tv.input@1.0-impl +LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_SRC_FILES := \ + TvInput.cpp \ + +LOCAL_SHARED_LIBRARIES := \ + libbase \ + liblog \ + libhardware \ + libhidl \ + libhwbinder \ + libutils \ + android.hardware.audio.common@2.0 \ + android.hardware.tv.input@1.0 \ + +include $(BUILD_SHARED_LIBRARY) + +include $(CLEAR_VARS) +LOCAL_MODULE_RELATIVE_PATH := hw +LOCAL_MODULE := android.hardware.tv.input@1.0-service +LOCAL_INIT_RC := android.hardware.tv.input@1.0-service.rc +LOCAL_SRC_FILES := \ + service.cpp \ + +LOCAL_SHARED_LIBRARIES := \ + liblog \ + libcutils \ + libdl \ + libbase \ + libutils \ + libhardware_legacy \ + libhardware \ + +LOCAL_SHARED_LIBRARIES += \ + libhwbinder \ + libhidl \ + android.hardware.audio.common@2.0 \ + android.hardware.tv.input@1.0 \ + +include $(BUILD_EXECUTABLE) + diff --git a/tv/input/1.0/default/TvInput.cpp b/tv/input/1.0/default/TvInput.cpp new file mode 100644 index 0000000000..6181ffb81c --- /dev/null +++ b/tv/input/1.0/default/TvInput.cpp @@ -0,0 +1,226 @@ +/* + * Copyright (C) 2016 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.tv.input@1.0-service" +#include + +#include "TvInput.h" + +const native_handle_t kNullNativeHandle{sizeof(native_handle_t), 0, 0, {}}; + +namespace android { +namespace hardware { +namespace tv { +namespace input { +namespace V1_0 { +namespace implementation { + +static_assert(TV_INPUT_TYPE_OTHER_HARDWARE == static_cast(TvInputType::OTHER), + "TvInputType::OTHER must match legacy value."); +static_assert(TV_INPUT_TYPE_TUNER == static_cast(TvInputType::TUNER), + "TvInputType::TUNER must match legacy value."); +static_assert(TV_INPUT_TYPE_COMPOSITE == static_cast(TvInputType::COMPOSITE), + "TvInputType::COMPOSITE must match legacy value."); +static_assert(TV_INPUT_TYPE_SVIDEO == static_cast(TvInputType::SVIDEO), + "TvInputType::SVIDEO must match legacy value."); +static_assert(TV_INPUT_TYPE_SCART == static_cast(TvInputType::SCART), + "TvInputType::SCART must match legacy value."); +static_assert(TV_INPUT_TYPE_COMPONENT == static_cast(TvInputType::COMPONENT), + "TvInputType::COMPONENT must match legacy value."); +static_assert(TV_INPUT_TYPE_VGA == static_cast(TvInputType::VGA), + "TvInputType::VGA must match legacy value."); +static_assert(TV_INPUT_TYPE_DVI == static_cast(TvInputType::DVI), + "TvInputType::DVI must match legacy value."); +static_assert(TV_INPUT_TYPE_HDMI == static_cast(TvInputType::HDMI), + "TvInputType::HDMI must match legacy value."); +static_assert(TV_INPUT_TYPE_DISPLAY_PORT == static_cast(TvInputType::DISPLAY_PORT), + "TvInputType::DISPLAY_PORT must match legacy value."); + +static_assert(TV_INPUT_EVENT_DEVICE_AVAILABLE == static_cast( + TvInputEventType::DEVICE_AVAILABLE), + "TvInputEventType::DEVICE_AVAILABLE must match legacy value."); +static_assert(TV_INPUT_EVENT_DEVICE_UNAVAILABLE == static_cast( + TvInputEventType::DEVICE_UNAVAILABLE), + "TvInputEventType::DEVICE_UNAVAILABLE must match legacy value."); +static_assert(TV_INPUT_EVENT_STREAM_CONFIGURATIONS_CHANGED == static_cast( + TvInputEventType::STREAM_CONFIGURATIONS_CHANGED), + "TvInputEventType::STREAM_CONFIGURATIONS_CHANGED must match legacy value."); + +sp TvInput::mCallback = nullptr; + +TvInput::TvInput(tv_input_device_t* device) : mDevice(device) { + mCallbackOps.notify = &TvInput::notify; +} + +TvInput::~TvInput() { + if (mDevice != nullptr) { + free(mDevice); + } +} + +// Methods from ::android::hardware::tv_input::V1_0::ITvInput follow. +Return TvInput::setCallback(const sp& callback) { + mCallback = callback; + if (mCallback != nullptr) { + mDevice->initialize(mDevice, &mCallbackOps, nullptr); + } + return Void(); +} + +Return TvInput::getStreamConfigurations(int32_t deviceId, getStreamConfigurations_cb cb) { + int32_t configCount = 0; + const tv_stream_config_t* configs = nullptr; + int ret = mDevice->get_stream_configurations(mDevice, deviceId, &configCount, &configs); + Result res = Result::UNKNOWN; + hidl_vec tvStreamConfigs; + if (ret == 0) { + res = Result::OK; + tvStreamConfigs.resize(getSupportedConfigCount(configCount, configs)); + int32_t pos = 0; + for (int32_t i = 0; i < configCount; ++i) { + if (isSupportedStreamType(configs[i].type)) { + tvStreamConfigs[pos].streamId = configs[i].stream_id; + tvStreamConfigs[pos].maxVideoWidth = configs[i].max_video_width; + tvStreamConfigs[pos].maxVideoHeight = configs[i].max_video_height; + ++pos; + } + } + } + cb(res, tvStreamConfigs); + return Void(); +} + +Return TvInput::openStream(int32_t deviceId, int32_t streamId, openStream_cb cb) { + tv_stream_t stream; + stream.stream_id = streamId; + int ret = mDevice->open_stream(mDevice, deviceId, &stream); + Result res = Result::UNKNOWN; + native_handle_t* sidebandStream = nullptr; + if (ret == 0) { + if (isSupportedStreamType(stream.type)) { + res = Result::OK; + sidebandStream = stream.sideband_stream_source_handle; + } + } else { + // TODO(b/30814137) + sidebandStream = const_cast(&kNullNativeHandle); + if (ret == -EBUSY) { + res = Result::NO_RESOURCE; + } else if (ret == -EEXIST) { + res = Result::INVALID_STATE; + } else if (ret == -EINVAL) { + res = Result::INVALID_ARGUMENTS; + } + } + cb(res, sidebandStream); + return Void(); +} + +Return TvInput::closeStream(int32_t deviceId, int32_t streamId) { + int ret = mDevice->close_stream(mDevice, deviceId, streamId); + Result res = Result::UNKNOWN; + if (ret == 0) { + res = Result::OK; + } else if (ret == -ENOENT) { + res = Result::INVALID_STATE; + } else if (ret == -EINVAL) { + res = Result::INVALID_ARGUMENTS; + } + return res; +} + +// static +void TvInput::notify(struct tv_input_device* __unused, tv_input_event_t* event, + void* __unused) { + if (mCallback != nullptr && event != nullptr) { + // Capturing is no longer supported. + if (event->type >= TV_INPUT_EVENT_CAPTURE_SUCCEEDED) { + return; + } + TvInputEvent tvInputEvent; + tvInputEvent.type = static_cast(event->type); + tvInputEvent.deviceInfo.deviceId = event->device_info.device_id; + tvInputEvent.deviceInfo.type = static_cast( + event->device_info.type); + tvInputEvent.deviceInfo.portId = event->device_info.hdmi.port_id; + // TODO: Ensure the legacy audio type code is the same once audio HAL default + // implementation is ready. + tvInputEvent.deviceInfo.audioType = static_cast( + event->device_info.audio_type); + memset(tvInputEvent.deviceInfo.audioAddress.data(), 0, + tvInputEvent.deviceInfo.audioAddress.size()); + const char* address = event->device_info.audio_address; + if (address != nullptr) { + size_t size = strlen(address); + if (size > tvInputEvent.deviceInfo.audioAddress.size()) { + LOG(ERROR) << "Audio address is too long. Address:" << address << ""; + return; + } + for (size_t i = 0; i < size; ++i) { + tvInputEvent.deviceInfo.audioAddress[i] = + static_cast(event->device_info.audio_address[i]); + } + } + mCallback->notify(tvInputEvent); + } +} + +// static +uint32_t TvInput::getSupportedConfigCount(uint32_t configCount, + const tv_stream_config_t* configs) { + uint32_t supportedConfigCount = 0; + for (uint32_t i = 0; i < configCount; ++i) { + if (isSupportedStreamType(configs[i].type)) { + supportedConfigCount++; + } + } + return supportedConfigCount; +} + +// static +bool TvInput::isSupportedStreamType(int type) { + // Buffer producer type is no longer supported. + return type != TV_STREAM_TYPE_BUFFER_PRODUCER; +} + +ITvInput* HIDL_FETCH_ITvInput(const char* name) { + int ret = 0; + const hw_module_t* hw_module = nullptr; + tv_input_device_t* input_device; + ret = hw_get_module(TV_INPUT_HARDWARE_MODULE_ID, &hw_module); + if (ret == 0 && hw_module->methods->open != nullptr) { + ret = hw_module->methods->open(hw_module, TV_INPUT_DEFAULT_DEVICE, + reinterpret_cast(&input_device)); + if (ret == 0) { + return new TvInput(input_device); + } + else { + LOG(ERROR) << "Passthrough failed to load legacy HAL."; + return nullptr; + } + } + else { + LOG(ERROR) << "hw_get_module " << name << " failed: " << ret; + return nullptr; + } +} + +} // namespace implementation +} // namespace V1_0 +} // namespace input +} // namespace tv +} // namespace hardware +} // namespace android diff --git a/tv/input/1.0/default/TvInput.h b/tv/input/1.0/default/TvInput.h new file mode 100644 index 0000000000..81cbb208f6 --- /dev/null +++ b/tv/input/1.0/default/TvInput.h @@ -0,0 +1,75 @@ +/* + * Copyright (C) 2016 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. + */ +#ifndef HIDL_GENERATED_android_hardware_tv_input_V1_0_TvInput_H_ +#define HIDL_GENERATED_android_hardware_tv_input_V1_0_TvInput_H_ + +#include +#include +#include + +#include + +namespace android { +namespace hardware { +namespace tv { +namespace input { +namespace V1_0 { +namespace implementation { + +using ::android::hardware::audio::common::V2_0::AudioDevice; +using ::android::hardware::tv::input::V1_0::ITvInput; +using ::android::hardware::tv::input::V1_0::ITvInputCallback; +using ::android::hardware::tv::input::V1_0::Result; +using ::android::hardware::tv::input::V1_0::TvInputEvent; +using ::android::hardware::tv::input::V1_0::TvStreamConfig; +using ::android::hardware::Return; +using ::android::hardware::Void; +using ::android::hardware::hidl_vec; +using ::android::hardware::hidl_string; +using ::android::sp; + +struct TvInput : public ITvInput { + TvInput(tv_input_device_t* device); + ~TvInput(); + Return setCallback(const sp& callback) override; + Return getStreamConfigurations(int32_t deviceId, + getStreamConfigurations_cb _hidl_cb) override; + Return openStream(int32_t deviceId, int32_t streamId, + openStream_cb _hidl_cb) override; + Return closeStream(int32_t deviceId, int32_t streamId) override; + + static void notify(struct tv_input_device* __unused, tv_input_event_t* event, + void* __unused); + static uint32_t getSupportedConfigCount(uint32_t configCount, + const tv_stream_config_t* configs); + static bool isSupportedStreamType(int type); + + private: + static sp mCallback; + tv_input_callback_ops_t mCallbackOps; + tv_input_device_t* mDevice; +}; + +extern "C" ITvInput* HIDL_FETCH_ITvInput(const char* name); + +} // namespace implementation +} // namespace V1_0 +} // namespace input +} // namespace tv +} // namespace hardware +} // namespace android + +#endif // HIDL_GENERATED_android_hardware_tv_input_V1_0_TvInput_H_ diff --git a/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc b/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc new file mode 100644 index 0000000000..c5bc0b7c88 --- /dev/null +++ b/tv/input/1.0/default/android.hardware.tv.input@1.0-service.rc @@ -0,0 +1,4 @@ +service tv-input-1-0 /system/bin/hw/android.hardware.tv.input@1.0-service + class hal + user system + group system readproc diff --git a/tv/input/1.0/default/service.cpp b/tv/input/1.0/default/service.cpp new file mode 100644 index 0000000000..d59c848b4b --- /dev/null +++ b/tv/input/1.0/default/service.cpp @@ -0,0 +1,31 @@ +/* + * Copyright (C) 2016 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.tv_input@1.0-service" + +#include + +#include + +using android::sp; + +// Generated HIDL files +using android::hardware::tv::input::V1_0::ITvInput; +using android::hardware::defaultPassthroughServiceImplementation; + +int main() { + return defaultPassthroughServiceImplementation("tv.input"); +}