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

Commit 68afca6d authored by Amy Zhang's avatar Amy Zhang
Browse files

Add the PTS field for recording-time indexing in the DemuxFilterEvent 

Test: atest VtsHalTvTunerV1_1TargetTest
Bug: 158816517
Change-Id: Ib29fd0f55aaae2fb44b77f754cceb5152fc7158d
parent 80cb9604

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

+6 −1
Original line number Diff line number Diff line
@@ -85,7 +85,7 @@ bool FilterCallback::readFilterEventData() { 
            case FilterEventType::MEDIA:

                return dumpAvData(filterEvent.events[i].media());

            case FilterEventType::RECORD:

                break;

                return readRecordData(filterEvent.events[i].tsRecord());

            case FilterEventType::MMTPRECORD:

                break;

            case FilterEventType::DOWNLOAD:
@@ -128,6 +128,11 @@ bool FilterCallback::dumpAvData(DemuxFilterMediaEvent event) { 
    return true;

}



bool FilterCallback::readRecordData(DemuxFilterTsRecordEvent event) {

    ALOGD("[vts] got DemuxFilterTsRecordEvent with pid=%d.", event.pid.tPid());

    return true;

}



AssertionResult FilterTests::openFilterInDemux(DemuxFilterType type, uint32_t bufferSize) {

    Result status;

    EXPECT_TRUE(mDemux) << "Test with openDemux first.";

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

+2 −0
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ using android::hardware::tv::tuner::V1_0::DemuxFilterSectionEvent; 
using android::hardware::tv::tuner::V1_0::DemuxFilterSectionSettings;

using android::hardware::tv::tuner::V1_0::DemuxFilterSettings;

using android::hardware::tv::tuner::V1_0::DemuxFilterStatus;

using android::hardware::tv::tuner::V1_0::DemuxFilterTsRecordEvent;

using android::hardware::tv::tuner::V1_0::DemuxFilterType;

using android::hardware::tv::tuner::V1_0::DemuxQueueNotifyBits;

using android::hardware::tv::tuner::V1_0::DemuxTsFilterSettings;
@@ -115,6 +116,7 @@ class FilterCallback : public IFilterCallback { 
    void updateGoldenOutputMap(string goldenOutputFile);

    bool readFilterEventData();

    bool dumpAvData(DemuxFilterMediaEvent event);

    bool readRecordData(DemuxFilterTsRecordEvent event);



  private:

    struct FilterThreadArgs {

tv/tuner/1.1/Android.bp

+3 −1
Original line number Diff line number Diff line
@@ -4,9 +4,11 @@ hidl_interface { 
    name: "android.hardware.tv.tuner@1.1",

    root: "android.hardware",

    srcs: [

        "IDemux.hal",

        "IFilter.hal",

        "IFilterCallback.hal",

        "ITuner.hal",

        "IDemux.hal",

        "types.hal",

    ],

    interfaces: [

        "android.hidl.base@1.0",

tv/tuner/1.1/IDemux.hal

+2 −2
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ 
package android.hardware.tv.tuner@1.1;



import @1.0::IDemux;

import @1.0::Result;

import @1.0::IFilter;

import @1.0::Result;



/**

 * Demultiplexer(Demux) takes a single multiplexed input and splits it into
@@ -30,7 +30,7 @@ interface IDemux extends @1.0::IDemux { 
     *

     * It is used by the client to get the hardware sync ID for audio and video.

     *

     * @param filter the filter instance.

     * @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.

tv/tuner/1.1/IFilterCallback.hal

0 → 100644
+29 −0
Original line number Diff line number Diff line 
/*

 * 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::IFilterCallback;

import @1.1::DemuxFilterEvent;



interface IFilterCallback extends @1.0::IFilterCallback {

    /**

     * Notify the client that a new filter event happened.

     *

     * @param filterEvent a v1_1 filter event.

     */

    oneway onFilterEvent_1_1(DemuxFilterEvent filterEvent);

};