Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e5a9da2e authored by Amy Zhang's avatar Amy Zhang
Browse files

Add ILnb VTS tests 

Test: atest VtsHalTvTunerV1_0TargetTest
Bug: 157955950
Change-Id: Icc2fca6f65e48a05c916a9629913cc7b18a8fd80
parent 738334a6

tv/tuner/1.0/default/Demux.cpp

+1 −1
Original line number Diff line number Diff line
@@ -124,12 +124,12 @@ Return<void> Demux::getAvSyncHwId(const sp<IFilter>& filter, getAvSyncHwId_cb _h 
    }



    if (!mPcrFilterIds.empty()) {

        ALOGE("[Demux] No PCR filter opened.");

        // 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();

}

tv/tuner/1.0/vts/functional/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ cc_test { 
        "FilterTests.cpp",

        "DvrTests.cpp",

        "DescramblerTests.cpp",

        "LnbTests.cpp",

    ],

    static_libs: [

        "android.hardware.cas@1.0",

tv/tuner/1.0/vts/functional/DemuxTests.cpp

+6 −6
Original line number Diff line number Diff line
@@ -53,23 +53,23 @@ AssertionResult DemuxTests::closeDemux() { 
    return AssertionResult(status.isOk());

}



void DemuxTests::getAvSyncId(sp<IFilter> filter, uint32_t& avSyncHwId) {

    ASSERT_TRUE(mDemux) << "Demux is not opened yet.";

AssertionResult DemuxTests::getAvSyncId(sp<IFilter> filter, uint32_t& avSyncHwId) {

    EXPECT_TRUE(mDemux) << "Demux is not opened yet.";

    Result status;

    mDemux->getAvSyncHwId(filter, [&](Result result, uint32_t id) {

        status = result;

        avSyncHwId = id;

    });

    ASSERT_TRUE(status == Result::SUCCESS) << "Fail to get avSyncHwId.";

    return AssertionResult(status == Result::SUCCESS);

}



void DemuxTests::getAvSyncTime(uint32_t avSyncId) {

    ASSERT_TRUE(mDemux) << "Demux is not opened yet.";

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;

    });

    ASSERT_TRUE(status == Result::SUCCESS) << "Fail to get avSyncTime.";

    return AssertionResult(status == Result::SUCCESS);

}
 
 No newline at end of file

tv/tuner/1.0/vts/functional/DemuxTests.h

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ class DemuxTests { 


    AssertionResult openDemux(sp<IDemux>& demux, uint32_t& demuxId);

    AssertionResult setDemuxFrontendDataSource(uint32_t frontendId);

    void getAvSyncId(sp<IFilter> filter, uint32_t& avSyncHwId);

    void getAvSyncTime(uint32_t avSyncId);

    AssertionResult getAvSyncId(sp<IFilter> filter, uint32_t& avSyncHwId);

    AssertionResult getAvSyncTime(uint32_t avSyncId);

    AssertionResult getDemuxCaps(DemuxCapabilities& demuxCaps);

    AssertionResult closeDemux();

tv/tuner/1.0/vts/functional/DescramblerTests.h

+4 −2
Original line number Diff line number Diff line
@@ -14,8 +14,6 @@ 
 * limitations under the License.

 */



#include <VtsHalHidlTargetTestBase.h>

#include <VtsHalHidlTargetTestEnvBase.h>

#include <android-base/logging.h>

#include <android/hardware/cas/1.0/types.h>

#include <android/hardware/cas/1.2/ICas.h>
@@ -28,6 +26,8 @@ 
#include <android/hardware/tv/tuner/1.0/ITuner.h>

#include <android/hardware/tv/tuner/1.0/types.h>

#include <fmq/MessageQueue.h>

#include <gtest/gtest.h>

#include <hidl/HidlSupport.h>

#include <hidl/Status.h>

#include <utils/Condition.h>

#include <utils/Mutex.h>
@@ -69,6 +69,8 @@ using android::hardware::tv::tuner::V1_0::TunerKeyToken; 


using ::testing::AssertionResult;



using namespace std;



class MediaCasListener : public ICasListener {

  public:

    virtual Return<void> onEvent(int32_t /*event*/, int32_t /*arg*/,