Merge "Add Frontend Status Types and tuning for IPTV"

This commit is contained in:
Sadiq Sada
2023-02-08 01:08:19 +00:00
committed by Android (Google) Code Review
5 changed files with 87 additions and 1 deletions

View File

@@ -45,4 +45,5 @@ union FrontendCapabilities {
android.hardware.tv.tuner.FrontendIsdbsCapabilities isdbsCaps;
android.hardware.tv.tuner.FrontendIsdbs3Capabilities isdbs3Caps;
android.hardware.tv.tuner.FrontendIsdbtCapabilities isdbtCaps;
@nullable android.hardware.tv.tuner.FrontendIptvCapabilities iptvCaps;
}

View File

@@ -0,0 +1,39 @@
/*
* Copyright 2023 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.
*/
///////////////////////////////////////////////////////////////////////////////
// THIS FILE IS IMMUTABLE. DO NOT EDIT IN ANY CASE. //
///////////////////////////////////////////////////////////////////////////////
// This file is a snapshot of an AIDL file. Do not edit it manually. There are
// two cases:
// 1). this is a frozen version file - do not edit this in any case.
// 2). this is a 'current' file. If you make a backwards compatible change to
// the interface (from the latest frozen version), the build system will
// prompt you to update this file with `m <name>-update-api`.
//
// You must not make a backward incompatible change to any AIDL file built
// with the aidl_interface module type with versions property set. The module
// type is used to build AIDL files in a way that they can be used across
// independently updatable components of the system. If a device is shipped
// with such a backward incompatible change, it has a high risk of breaking
// later when a module using the interface is updated, e.g., Mainline modules.
package android.hardware.tv.tuner;
/* @hide */
@VintfStability
parcelable FrontendIptvCapabilities {
int protocolCap;
}

View File

@@ -23,6 +23,7 @@ import android.hardware.tv.tuner.FrontendDtmbCapabilities;
import android.hardware.tv.tuner.FrontendDvbcCapabilities;
import android.hardware.tv.tuner.FrontendDvbsCapabilities;
import android.hardware.tv.tuner.FrontendDvbtCapabilities;
import android.hardware.tv.tuner.FrontendIptvCapabilities;
import android.hardware.tv.tuner.FrontendIsdbs3Capabilities;
import android.hardware.tv.tuner.FrontendIsdbsCapabilities;
import android.hardware.tv.tuner.FrontendIsdbtCapabilities;
@@ -51,4 +52,6 @@ union FrontendCapabilities {
FrontendIsdbs3Capabilities isdbs3Caps;
FrontendIsdbtCapabilities isdbtCaps;
@nullable FrontendIptvCapabilities iptvCaps;
}

View File

@@ -0,0 +1,29 @@
/*
* Copyright 2023 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.
*/
package android.hardware.tv.tuner;
/**
* Capabilities for IPTV Frontend.
* @hide
*/
@VintfStability
parcelable FrontendIptvCapabilities {
/**
* Transmission protocols for IPTV (UDP / RTP) defined in FrontendIptvSettingsProtocol.
*/
int protocolCap;
}

View File

@@ -164,6 +164,17 @@ Frontend::Frontend(FrontendType type, int32_t id) {
};
break;
}
case FrontendType::IPTV: {
mFrontendCaps.set<FrontendCapabilities::Tag::iptvCaps>(FrontendIptvCapabilities());
mFrontendStatusCaps = {
FrontendStatusType::IPTV_CONTENT_URL,
FrontendStatusType::IPTV_PACKETS_LOST,
FrontendStatusType::IPTV_PACKETS_RECEIVED,
FrontendStatusType::IPTV_AVERAGE_JITTER_MS,
FrontendStatusType::IPTV_WORST_JITTER_MS,
};
break;
}
default: {
break;
}
@@ -210,7 +221,10 @@ Frontend::~Frontend() {
static_cast<int32_t>(Result::INVALID_STATE));
}
mTuner->frontendStartTune(mId);
if (mType != FrontendType::IPTV) {
mTuner->frontendStartTune(mId);
}
mCallback->onEvent(FrontendEventType::LOCKED);
mIsLocked = true;