Revert "Add a getAvSyncHwId_64bit in Tuner HAL 1.1 to support 64 bit hw sync id"
This reverts commit 80cb96048b6c07666e508137201b4f2a03a6da34.
Reason for revert: This change is not specifically requested by vendors
Might be unnecessary
Test: make -j44, atest VtsHalTvTunerV1_1TargetTest
Bug: 159058358
Change-Id: I305c17b4778608a59d04d93030f4ec19fa1b7137
diff --git a/tv/tuner/1.1/Android.bp b/tv/tuner/1.1/Android.bp
index 92769f0..6cf47f5 100644
--- a/tv/tuner/1.1/Android.bp
+++ b/tv/tuner/1.1/Android.bp
@@ -4,7 +4,6 @@
name: "android.hardware.tv.tuner@1.1",
root: "android.hardware",
srcs: [
- "IDemux.hal",
"IFilter.hal",
"IFrontend.hal",
"IFilterCallback.hal",
diff --git a/tv/tuner/1.1/IDemux.hal b/tv/tuner/1.1/IDemux.hal
deleted file mode 100644
index 434ecbd..0000000
--- a/tv/tuner/1.1/IDemux.hal
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2020 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@1.1;
-
-import @1.0::IDemux;
-import @1.0::IFilter;
-import @1.0::Result;
-
-/**
- * Demultiplexer(Demux) takes a single multiplexed input and splits it into
- * one or more output.
- */
-interface IDemux extends @1.0::IDemux {
- /**
- * Get a 64-bit hardware sync ID for audio and video.
- *
- * It is used by the client to get the hardware sync ID for audio and video.
- *
- * @param filter the v1_1 filter instance.
- * @return result Result status of the operation.
- * SUCCESS if successful,
- * INVALID_ARGUMENT if failed for a wrong filter ID.
- * UNKNOWN_ERROR if failed for other reasons.
- * @return avSyncHwId the id of hardware A/V sync.
- */
- getAvSyncHwId64Bit(IFilter filter) generates (Result result, uint64_t avSyncHwId);
-};
\ No newline at end of file
diff --git a/tv/tuner/1.1/default/Demux.cpp b/tv/tuner/1.1/default/Demux.cpp
index 007d5eb..66c95dc 100644
--- a/tv/tuner/1.1/default/Demux.cpp
+++ b/tv/tuner/1.1/default/Demux.cpp
@@ -34,49 +34,6 @@
Demux::~Demux() {}
-Return<void> Demux::getAvSyncHwId64Bit(const sp<IFilter>& filter, getAvSyncHwId64Bit_cb _hidl_cb) {
- ALOGV("%s", __FUNCTION__);
-
- uint64_t avSyncHwId = -1;
- uint64_t id;
- Result status;
-
- sp<V1_1::IFilter> filter_v1_1 = V1_1::IFilter::castFrom(filter);
- if (filter_v1_1 != NULL) {
- filter_v1_1->getId64Bit([&](Result result, uint64_t filterId) {
- id = filterId;
- status = result;
- });
- } else {
- filter->getId([&](Result result, uint32_t filterId) {
- id = filterId;
- status = result;
- });
- }
-
- if (status != Result::SUCCESS) {
- ALOGE("[Demux] Can't get 64-bit filter Id.");
- _hidl_cb(Result::INVALID_STATE, avSyncHwId);
- return Void();
- }
-
- if (!mFilters[id]->isMediaFilter()) {
- ALOGE("[Demux] Given filter is not a media filter.");
- _hidl_cb(Result::INVALID_ARGUMENT, avSyncHwId);
- return Void();
- }
-
- if (!mPcrFilterIds.empty()) {
- // Return the lowest pcr filter id in the default implementation as the av sync id
- _hidl_cb(Result::SUCCESS, *mPcrFilterIds.begin());
- return Void();
- }
-
- ALOGE("[Demux] No PCR filter opened.");
- _hidl_cb(Result::INVALID_STATE, avSyncHwId);
- return Void();
-}
-
Return<Result> Demux::setFrontendDataSource(uint32_t frontendId) {
ALOGV("%s", __FUNCTION__);
diff --git a/tv/tuner/1.1/default/Demux.h b/tv/tuner/1.1/default/Demux.h
index 3623d0f..5212eae 100644
--- a/tv/tuner/1.1/default/Demux.h
+++ b/tv/tuner/1.1/default/Demux.h
@@ -17,7 +17,6 @@
#ifndef ANDROID_HARDWARE_TV_TUNER_V1_1_DEMUX_H_
#define ANDROID_HARDWARE_TV_TUNER_V1_1_DEMUX_H_
-#include <android/hardware/tv/tuner/1.1/IDemux.h>
#include <fmq/MessageQueue.h>
#include <math.h>
#include <set>
@@ -49,15 +48,12 @@
class TimeFilter;
class Tuner;
-class Demux : public V1_1::IDemux {
+class Demux : public IDemux {
public:
Demux(uint32_t demuxId, sp<Tuner> tuner);
~Demux();
- virtual Return<void> getAvSyncHwId64Bit(const sp<IFilter>& filter,
- getAvSyncHwId64Bit_cb _hidl_cb) override;
-
virtual Return<Result> setFrontendDataSource(uint32_t frontendId) override;
virtual Return<void> openFilter(const DemuxFilterType& type, uint32_t bufferSize,
diff --git a/tv/tuner/1.1/vts/functional/DemuxTests.cpp b/tv/tuner/1.1/vts/functional/DemuxTests.cpp
index e0600b6..b1d8a0a 100644
--- a/tv/tuner/1.1/vts/functional/DemuxTests.cpp
+++ b/tv/tuner/1.1/vts/functional/DemuxTests.cpp
@@ -38,34 +38,4 @@
auto status = mDemux->close();
mDemux = nullptr;
return AssertionResult(status.isOk());
-}
-
-AssertionResult DemuxTests::getAvSyncId_64bit(sp<IFilter> filter, uint64_t& avSyncHwId) {
- EXPECT_TRUE(mDemux) << "Demux is not opened yet.";
- Result status;
-
- sp<android::hardware::tv::tuner::V1_1::IDemux> demux_v1_1 =
- android::hardware::tv::tuner::V1_1::IDemux::castFrom(mDemux);
- if (demux_v1_1 != NULL) {
- demux_v1_1->getAvSyncHwId64Bit(filter, [&](Result result, uint64_t id) {
- status = result;
- avSyncHwId = id;
- });
- } else {
- ALOGW("[vts] Can't cast IDemux into v1_1.");
- return failure();
- }
-
- return AssertionResult(status == Result::SUCCESS);
-}
-
-AssertionResult DemuxTests::getAvSyncTime(uint32_t avSyncId) {
- EXPECT_TRUE(mDemux) << "Demux is not opened yet.";
- Result status;
- uint64_t syncTime;
- mDemux->getAvSyncTime(avSyncId, [&](Result result, uint64_t time) {
- status = result;
- syncTime = time;
- });
- return AssertionResult(status == Result::SUCCESS);
}
\ No newline at end of file
diff --git a/tv/tuner/1.1/vts/functional/DemuxTests.h b/tv/tuner/1.1/vts/functional/DemuxTests.h
index 393757c..c28d6ca 100644
--- a/tv/tuner/1.1/vts/functional/DemuxTests.h
+++ b/tv/tuner/1.1/vts/functional/DemuxTests.h
@@ -17,7 +17,6 @@
#include <android-base/logging.h>
#include <android/hardware/tv/tuner/1.0/IDemux.h>
#include <android/hardware/tv/tuner/1.0/types.h>
-#include <android/hardware/tv/tuner/1.1/IDemux.h>
#include <android/hardware/tv/tuner/1.1/IFilter.h>
#include <android/hardware/tv/tuner/1.1/ITuner.h>
#include <binder/MemoryDealer.h>
@@ -45,8 +44,6 @@
AssertionResult openDemux(sp<IDemux>& demux, uint32_t& demuxId);
AssertionResult setDemuxFrontendDataSource(uint32_t frontendId);
- AssertionResult getAvSyncId_64bit(sp<IFilter> filter, uint64_t& avSyncHwId);
- AssertionResult getAvSyncTime(uint32_t avSyncId);
AssertionResult closeDemux();
protected:
diff --git a/tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TargetTest.cpp b/tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TargetTest.cpp
index c3df078..a5aab96 100644
--- a/tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TargetTest.cpp
+++ b/tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TargetTest.cpp
@@ -86,41 +86,6 @@
ASSERT_TRUE(mFrontendTests.closeFrontend());
}
-TEST_P(TunerDemuxHidlTest, getAvSyncTime) {
- description("Get the A/V sync time from a PCR filter.");
- uint32_t feId;
- uint32_t demuxId;
- sp<IDemux> demux;
- uint64_t mediaFilterId;
- uint64_t pcrFilterId;
- uint64_t avSyncHwId;
- sp<IFilter> mediaFilter;
-
- mFrontendTests.getFrontendIdByType(frontendArray[DVBT].type, feId);
- ASSERT_TRUE(feId != INVALID_ID);
- ASSERT_TRUE(mFrontendTests.openFrontendById(feId));
- ASSERT_TRUE(mFrontendTests.setFrontendCallback());
- ASSERT_TRUE(mDemuxTests.openDemux(demux, demuxId));
- ASSERT_TRUE(mDemuxTests.setDemuxFrontendDataSource(feId));
- mFilterTests.setDemux(demux);
- ASSERT_TRUE(mFilterTests.openFilterInDemux(filterArray[TS_VIDEO1].type,
- filterArray[TS_VIDEO1].bufferSize));
- ASSERT_TRUE(mFilterTests.getNewlyOpenedFilterId_64bit(mediaFilterId));
- ASSERT_TRUE(mFilterTests.configFilter(filterArray[TS_VIDEO1].settings, mediaFilterId));
- mediaFilter = mFilterTests.getFilterById(mediaFilterId);
- ASSERT_TRUE(mFilterTests.openFilterInDemux(filterArray[TS_PCR0].type,
- filterArray[TS_PCR0].bufferSize));
- ASSERT_TRUE(mFilterTests.getNewlyOpenedFilterId_64bit(pcrFilterId));
- ASSERT_TRUE(mFilterTests.configFilter(filterArray[TS_PCR0].settings, pcrFilterId));
- ASSERT_TRUE(mDemuxTests.getAvSyncId_64bit(mediaFilter, avSyncHwId));
- ASSERT_TRUE(pcrFilterId == avSyncHwId);
- ASSERT_TRUE(mDemuxTests.getAvSyncTime(pcrFilterId));
- ASSERT_TRUE(mFilterTests.closeFilter(pcrFilterId));
- ASSERT_TRUE(mFilterTests.closeFilter(mediaFilterId));
- ASSERT_TRUE(mDemuxTests.closeDemux());
- ASSERT_TRUE(mFrontendTests.closeFrontend());
-}
-
TEST_P(TunerFilterHidlTest, StartFilterInDemux) {
description("Open and start a filter in Demux.");
// TODO use parameterized tests
@@ -153,11 +118,6 @@
android::hardware::PrintInstanceNameToString);
INSTANTIATE_TEST_SUITE_P(
- PerInstance, TunerDemuxHidlTest,
- testing::ValuesIn(android::hardware::getAllHalInstanceNames(ITuner::descriptor)),
- android::hardware::PrintInstanceNameToString);
-
-INSTANTIATE_TEST_SUITE_P(
PerInstance, TunerRecordHidlTest,
testing::ValuesIn(android::hardware::getAllHalInstanceNames(ITuner::descriptor)),
android::hardware::PrintInstanceNameToString);
diff --git a/tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TargetTest.h b/tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TargetTest.h
index 505e35a..47004f6 100644
--- a/tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TargetTest.h
+++ b/tv/tuner/1.1/vts/functional/VtsHalTvTunerV1_1TargetTest.h
@@ -53,31 +53,6 @@
GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerFilterHidlTest);
-class TunerDemuxHidlTest : public testing::TestWithParam<std::string> {
- public:
- virtual void SetUp() override {
- mService = ITuner::getService(GetParam());
- ASSERT_NE(mService, nullptr);
- initConfiguration();
-
- mFrontendTests.setService(mService);
- mDemuxTests.setService(mService);
- mFilterTests.setService(mService);
- }
-
- protected:
- static void description(const std::string& description) {
- RecordProperty("description", description);
- }
-
- sp<ITuner> mService;
- FrontendTests mFrontendTests;
- DemuxTests mDemuxTests;
- FilterTests mFilterTests;
-};
-
-GTEST_ALLOW_UNINSTANTIATED_PARAMETERIZED_TEST(TunerDemuxHidlTest);
-
class TunerRecordHidlTest : public testing::TestWithParam<std::string> {
public:
virtual void SetUp() override {