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

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

Connect MediaEvents core path between TunerService and TunerClient 

Test: tuner sample tis on cuttlefish
Bug: 174095851
Change-Id: I21148772d1ae1b53860c68ee47b7a27929629fce
Merged-In: I21148772d1ae1b53860c68ee47b7a27929629fce
parent 34b2197e

media/jni/Android.bp

+5 −0
Original line number Diff line number Diff line
@@ -166,6 +166,11 @@ cc_library_shared { 
        "tv_tuner_aidl_interface-ndk_platform",

        "tv_tuner_resource_manager_aidl_interface-ndk_platform"

    ],



    static_libs: [

        "libaidlcommonsupport",

    ],



    defaults: [

        "libcodec2-impl-defaults",

    ],

media/jni/tuner/DemuxClient.cpp

+14 −2
Original line number Diff line number Diff line
@@ -142,7 +142,16 @@ long DemuxClient::getAvSyncTime(int avSyncHwId) { 
}



sp<DvrClient> DemuxClient::openDvr(DvrType dvbType, int bufferSize, sp<DvrClientCallback> cb) {

    // TODO: pending aidl interface

    if (mTunerDemux != NULL) {

        shared_ptr<ITunerDvr> tunerDvr;

        shared_ptr<TunerDvrCallback> callback =

                ::ndk::SharedRefBase::make<TunerDvrCallback>(cb);

        Status s = mTunerDemux->openDvr((int)dvbType, bufferSize, callback, &tunerDvr);

        if (ClientHelper::getServiceSpecificErrorCode(s) != Result::SUCCESS) {

            return NULL;

        }

        return new DvrClient(tunerDvr);

    }



    if (mDemux != NULL) {

        sp<HidlDvrCallback> callback = new HidlDvrCallback(cb);
@@ -178,7 +187,10 @@ Result DemuxClient::disconnectCiCam() { 
}



Result DemuxClient::close() {

    // TODO: pending aidl interface

    if (mTunerDemux != NULL) {

        Status s = mTunerDemux->close();

        return ClientHelper::getServiceSpecificErrorCode(s);

    }



    if (mDemux != NULL) {

        Result res = mDemux->close();

media/jni/tuner/DvrClient.cpp

+3 −4
Original line number Diff line number Diff line
@@ -210,14 +210,13 @@ Result DvrClient::configure(DvrSettings settings) { 
            return res;

        }



        AidlMQDesc* aidlMqDesc = NULL;

        s = mTunerDvr->getQueueDesc(aidlMqDesc);

        AidlMQDesc aidlMqDesc;

        s = mTunerDvr->getQueueDesc(&aidlMqDesc);

        res = ClientHelper::getServiceSpecificErrorCode(s);

        if (res != Result::SUCCESS) {

            return res;

        }



        mDvrMQ = new (nothrow) AidlMQ(*aidlMqDesc);

        mDvrMQ = new (nothrow) AidlMQ(aidlMqDesc);

        EventFlag::createEventFlag(mDvrMQ->getEventFlagWord(), &mDvrMQEventFlag);

        return res;

    }

media/jni/tuner/FilterClient.cpp

+148 −18
Original line number Diff line number Diff line
@@ -16,14 +16,21 @@ 


#define LOG_TAG "FilterClient"



#include <aidlcommonsupport/NativeHandle.h>

#include <android-base/logging.h>

#include <utils/Log.h>



#include "FilterClient.h"



using ::aidl::android::media::tv::tuner::TunerFilterAvSettings;

using ::aidl::android::media::tv::tuner::TunerFilterSharedHandleInfo;

using ::aidl::android::media::tv::tuner::TunerFilterTsConfiguration;



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

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

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

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

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

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



namespace android {
@@ -48,7 +55,6 @@ FilterClient::~FilterClient() { 
void FilterClient::setHidlFilter(sp<IFilter> filter) {

    mFilter = filter;

    mFilter_1_1 = ::android::hardware::tv::tuner::V1_1::IFilter::castFrom(mFilter);

    handleAvShareMemory();

}



int FilterClient::read(uint8_t* buffer, int size) {
@@ -66,23 +72,20 @@ int FilterClient::read(uint8_t* buffer, int size) { 
}



SharedHandleInfo FilterClient::getAvSharedHandleInfo() {

    handleAvShareMemory();

    SharedHandleInfo info{

        .sharedHandle = NULL,

        .size = 0,

        .sharedHandle = mAvSharedHandle,

        .size = mAvSharedMemSize,

    };



    // TODO: pending aidl interface



    if (mFilter_1_1 != NULL) {

        info.sharedHandle = mAvSharedHandle;

        info.size = mAvSharedMemSize;

    }



    return info;

}



Result FilterClient::configure(DemuxFilterSettings configure) {

    // TODO: pending aidl interface

    if (mTunerFilter != NULL) {

        Status s = mTunerFilter->configure(getAidlFilterSettings(configure));

        return ClientHelper::getServiceSpecificErrorCode(s);

    }



    if (mFilter != NULL) {

        return mFilter->configure(configure);
@@ -122,7 +125,10 @@ Result FilterClient::configureAvStreamType(AvStreamType avStreamType) { 
}



Result FilterClient::start() {

    // TODO: pending aidl interface

    if (mTunerFilter != NULL) {

        Status s = mTunerFilter->start();

        return ClientHelper::getServiceSpecificErrorCode(s);

    }



    if (mFilter != NULL) {

        return mFilter->start();
@@ -132,7 +138,10 @@ Result FilterClient::start() { 
}



Result FilterClient::stop() {

    // TODO: pending aidl interface

    if (mTunerFilter != NULL) {

        Status s = mTunerFilter->stop();

        return ClientHelper::getServiceSpecificErrorCode(s);

    }



    if (mFilter != NULL) {

        return mFilter->stop();
@@ -142,7 +151,10 @@ Result FilterClient::stop() { 
}



Result FilterClient::flush() {

    // TODO: pending aidl interface

    if (mTunerFilter != NULL) {

        Status s = mTunerFilter->flush();

        return ClientHelper::getServiceSpecificErrorCode(s);

    }



    if (mFilter != NULL) {

        return mFilter->flush();
@@ -192,7 +204,10 @@ Result FilterClient::getId64Bit(uint64_t& id) { 
}



Result FilterClient::releaseAvHandle(native_handle_t* handle, uint64_t avDataId) {

    // TODO: pending aidl interface

    if (mTunerFilter != NULL) {

        Status s = mTunerFilter->releaseAvHandle(makeToAidl(handle), avDataId);

        return ClientHelper::getServiceSpecificErrorCode(s);

    }



    if (mFilter != NULL) {

        return mFilter->releaseAvHandle(hidl_handle(handle), avDataId);
@@ -216,13 +231,18 @@ Result FilterClient::setDataSource(sp<FilterClient> filterClient){ 
}



Result FilterClient::close() {

    // TODO: pending aidl interface

    if (mTunerFilter != NULL) {

        Status s = mTunerFilter->close();

        closeAvSharedMemory();

        return ClientHelper::getServiceSpecificErrorCode(s);

    }



    if (mFilter != NULL) {

        Result res = mFilter->close();

        if (res == Result::SUCCESS) {

            mFilter = NULL;

        }

        closeAvSharedMemory();

        return res;

    }
@@ -269,13 +289,103 @@ Status TunerFilterCallback::onFilterStatus(int status) { 
    return Status::fromServiceSpecificError(static_cast<int32_t>(Result::INVALID_STATE));

}



Status TunerFilterCallback::onFilterEvent(vector<TunerFilterEvent>* /*filterEvent*/) {

    // TODO: complete onFilterEvent

Status TunerFilterCallback::onFilterEvent(const vector<TunerFilterEvent>& filterEvents) {

    if (mFilterClientCallback == NULL) {

        return Status::fromServiceSpecificError(static_cast<int32_t>(Result::INVALID_STATE));

    }



    DemuxFilterEvent event;

    DemuxFilterEventExt eventExt;

    getHidlFilterEvent(filterEvents, event, eventExt);

    if (eventExt.events.size() > 0) {

        mFilterClientCallback->onFilterEvent_1_1(event, eventExt);

    } else {

        mFilterClientCallback->onFilterEvent(event);

    }



    return Status::ok();

}



/////////////// FilterClient Helper Methods ///////////////////////



TunerFilterConfiguration FilterClient::getAidlFilterSettings(DemuxFilterSettings configure) {

    TunerFilterConfiguration config;

    // TODO: complete filter setting conversion

    switch (configure.getDiscriminator()) {

        case DemuxFilterSettings::hidl_discriminator::ts: {

            TunerFilterSettings filterSettings;

            switch (configure.ts().filterSettings.getDiscriminator()) {

                case DemuxTsFilterSettings::FilterSettings::hidl_discriminator::av: {

                    TunerFilterAvSettings av{

                        .isPassthrough = configure.ts().filterSettings.av().isPassthrough,

                    };

                    filterSettings.set<TunerFilterSettings::av>(av);

                    break;

                }

                default:

                    break;

            }



            TunerFilterTsConfiguration ts{

                .tpid = configure.ts().tpid,

                .filterSettings = filterSettings,

            };

            config.set<TunerFilterConfiguration::ts>(ts);



            return config;

        }

        case DemuxFilterSettings::hidl_discriminator::mmtp:

            break;

        case DemuxFilterSettings::hidl_discriminator::ip:

            break;

        case DemuxFilterSettings::hidl_discriminator::tlv:

            break;

        default:

            break;

    }

    return config;

}





void TunerFilterCallback::getHidlFilterEvent(const vector<TunerFilterEvent>& filterEvents,

        DemuxFilterEvent& event, DemuxFilterEventExt& /*eventExt*/) {

    // TODO: finish handling extended evets and other filter event types

    switch (filterEvents[0].getTag()) {

        case  TunerFilterEvent::media: {

            for (int i = 0; i < filterEvents.size(); i++) {

                hidl_handle handle = hidl_handle(

                        makeFromAidl(filterEvents[i].get<TunerFilterEvent::media>().avMemory));

                int size = event.events.size();

                event.events.resize(size + 1);

                event.events[size].media({

                    .avMemory = handle,

                    .streamId = static_cast<DemuxStreamId>(

                            filterEvents[i].get<TunerFilterEvent::media>().streamId),

                    .isPtsPresent =

                            filterEvents[i].get<TunerFilterEvent::media>().isPtsPresent,

                    .pts = static_cast<uint64_t>(

                            filterEvents[i].get<TunerFilterEvent::media>().pts),

                    .dataLength = static_cast<uint32_t>(

                            filterEvents[i].get<TunerFilterEvent::media>().dataLength),

                    .offset = static_cast<uint32_t>(

                            filterEvents[i].get<TunerFilterEvent::media>().offset),

                    .isSecureMemory =

                            filterEvents[i].get<TunerFilterEvent::media>().isSecureMemory,

                    .avDataId = static_cast<uint64_t>(

                            filterEvents[i].get<TunerFilterEvent::media>().avDataId),

                    .mpuSequenceNumber = static_cast<uint32_t>(

                            filterEvents[i].get<TunerFilterEvent::media>().offset),

                    .isPesPrivateData =

                            filterEvents[i].get<TunerFilterEvent::media>().isPesPrivateData,

                });

            }

            break;

        }

        default:

            break;

    }

}



Result FilterClient::getFilterMq() {

    if (mFilter == NULL) {

        return Result::INVALID_STATE;
@@ -333,6 +443,20 @@ void FilterClient::checkIsMediaFilter(DemuxFilterType type) { 
}



void FilterClient::handleAvShareMemory() {

    if (mAvSharedHandle != NULL) {

        return;

    }



    if (mTunerFilter != NULL && mIsMediaFilter) {

        TunerFilterSharedHandleInfo aidlHandleInfo;

        Status s = mTunerFilter->getAvSharedHandleInfo(&aidlHandleInfo);

        if (ClientHelper::getServiceSpecificErrorCode(s) == Result::SUCCESS) {

            mAvSharedHandle = native_handle_clone(makeFromAidl(aidlHandleInfo.handle));

            mAvSharedMemSize = aidlHandleInfo.size;

        }

        return;

    }



    if (mFilter_1_1 != NULL && mIsMediaFilter) {

        mFilter_1_1->getAvSharedHandle([&](Result r, hidl_handle avMemory, uint64_t avMemSize) {

            if (r == Result::SUCCESS) {
@@ -342,4 +466,10 @@ void FilterClient::handleAvShareMemory() { 
        });

    }

}



void FilterClient::closeAvSharedMemory() {

    native_handle_close(mAvSharedHandle);

    native_handle_delete(mAvSharedHandle);

    mAvSharedMemSize = 0;

}

}  // namespace android

media/jni/tuner/FilterClient.h

+10 −2
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include <aidl/android/media/tv/tuner/ITunerFilter.h>

#include <aidl/android/media/tv/tuner/BnTunerFilterCallback.h>

#include <aidl/android/media/tv/tuner/TunerFilterEvent.h>

#include <aidl/android/media/tv/tuner/TunerFilterSettings.h>

#include <aidlcommonsupport/NativeHandle.h>

#include <android/hardware/tv/tuner/1.1/IFilter.h>

#include <android/hardware/tv/tuner/1.1/IFilterCallback.h>

#include <android/hardware/tv/tuner/1.1/types.h>
@@ -31,7 +33,9 @@ 
using Status = ::ndk::ScopedAStatus;

using ::aidl::android::media::tv::tuner::BnTunerFilterCallback;

using ::aidl::android::media::tv::tuner::ITunerFilter;

using ::aidl::android::media::tv::tuner::TunerFilterConfiguration;

using ::aidl::android::media::tv::tuner::TunerFilterEvent;

using ::aidl::android::media::tv::tuner::TunerFilterSettings;



using ::android::hardware::EventFlag;

using ::android::hardware::MessageQueue;
@@ -61,11 +65,13 @@ class TunerFilterCallback : public BnTunerFilterCallback { 


public:

    TunerFilterCallback(sp<FilterClientCallback> filterClientCallback);

    // TODO: complete TunerFilterCallback

    Status onFilterStatus(int status);

    Status onFilterEvent(vector<TunerFilterEvent>* filterEvent);

    Status onFilterEvent(const vector<TunerFilterEvent>& filterEvents);



private:

    void getHidlFilterEvent(const vector<TunerFilterEvent>& filterEvents,

            DemuxFilterEvent& event, DemuxFilterEventExt& eventExt);



    sp<FilterClientCallback> mFilterClientCallback;

};
@@ -174,10 +180,12 @@ public: 
    Result close();



private:

    TunerFilterConfiguration getAidlFilterSettings(DemuxFilterSettings configure);

    Result getFilterMq();

    int copyData(uint8_t* buffer, int size);

    void checkIsMediaFilter(DemuxFilterType type);

    void handleAvShareMemory();

    void closeAvSharedMemory();



    /**

     * An AIDL Tuner Filter Singleton assigned at the first time when the Tuner Client