Evolution-x/hardware_interfaces
1
0
Fork 0
mirror of https://github.com/Evolution-X/hardware_interfaces synced 2026-02-01 21:37:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "update connect status along with stream_configuration_change event." am: 1c15423de7

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/hardware/interfaces/+/1532561

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4f95db26b86e45ca9819f0b67577f50de6932b67
This commit is contained in:
Henry Fang
2021-01-15 19:49:56 +00:00
committed by Automerger Merge Worker
parent 41e252fa54 1c15423de7
commit f4866e5baa
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tv/input/1.0/default/TvInput.cpp
View File

@@ -142,7 +142,7 @@ Return<Result> TvInput::closeStream(int32_t deviceId, int32_t streamId) {
// static
void TvInput::notify(struct tv_input_device* __unused, tv_input_event_t* event,
void* __unused) {
void* optionalStatus) {
if (mCallback != nullptr && event != nullptr) {
// Capturing is no longer supported.
if (event->type >= TV_INPUT_EVENT_CAPTURE_SUCCEEDED) {
@@ -154,7 +154,17 @@ void TvInput::notify(struct tv_input_device* __unused, tv_input_event_t* event,
tvInputEvent.deviceInfo.type = static_cast<TvInputType>(
event->device_info.type);
tvInputEvent.deviceInfo.portId = event->device_info.hdmi.port_id;
tvInputEvent.deviceInfo.cableConnectionStatus = CableConnectionStatus::UNKNOWN;
CableConnectionStatus connectionStatus = CableConnectionStatus::UNKNOWN;
if (optionalStatus != nullptr &&
((event->type == TV_INPUT_EVENT_STREAM_CONFIGURATIONS_CHANGED) ||
(event->type == TV_INPUT_EVENT_DEVICE_AVAILABLE))) {
int newStatus = *reinterpret_cast<int*>(optionalStatus);
if (newStatus <= static_cast<int>(CableConnectionStatus::DISCONNECTED) &&
newStatus >= static_cast<int>(CableConnectionStatus::UNKNOWN)) {
connectionStatus = static_cast<CableConnectionStatus>(newStatus);
}
}
tvInputEvent.deviceInfo.cableConnectionStatus = connectionStatus;
// TODO: Ensure the legacy audio type code is the same once audio HAL default
// implementation is ready.
tvInputEvent.deviceInfo.audioType = static_cast<AudioDevice>(