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

Commit c670dca9 authored by Amy Zhang's avatar Amy Zhang Committed by Gerrit Code Review
Browse files

Merge "Add DataId for Audio Handle in Audio Track"

parents ea14e344 92f17c7d

tv/tuner/1.0/IFilter.hal

+2 −1
Original line number Diff line number Diff line
@@ -120,12 +120,13 @@ interface IFilter { 
     * presented by file descripor in the handle as released.

     *

     * @param avMemory A handle associated to the memory for audio or video.

     * @param avDataId An Id provides additional information for AV data.

     * @return result Result status of the operation.

     *         SUCCESS if successful,

     *         INVALID_ARGUMENT if failed for wrong parameter.

     *         UNKNOWN_ERROR if failed for other reasons.

     */

    releaseAvHandle(handle avMemory) generates (Result result);

    releaseAvHandle(handle avMemory, uint64_t avDataId) generates (Result result);



    /**

     * Set the filter's data source.

tv/tuner/1.0/ITuner.hal

+17 −0
Original line number Diff line number Diff line
@@ -123,4 +123,21 @@ interface ITuner { 
     * @return lnb the newly created Lnb interface.

     */

    openLnbById(LnbId lnbId) generates (Result result, ILnb lnb);



    /**

     * Create a new instance of Lnb given a LNB name.

     *

     * It is used by the client to create a LNB instance for external device.

     *

     * @param lnbName the name for an external LNB to be opened. The app

     *        provides the name. Frammework doesn't depend on the name, instead

     *        use lnbId return from this call.

     * @return result Result status of the operation.

     *         SUCCESS if successful,

     *         UNAVAILABLE if no resource.

     *         UNKNOWN_ERROR if creation failed for other reasons.

     * @return lnbId the id of the LNB to be opened.

     * @return lnb the newly created Lnb interface.

     */

    openLnbByName(string lnbName) generates (Result result, LnbId lnbId, ILnb lnb);

};

tv/tuner/1.0/default/Filter.cpp

+1 −1
Original line number Diff line number Diff line
@@ -120,7 +120,7 @@ Return<Result> Filter::flush() { 
    return Result::SUCCESS;

}



Return<Result> Filter::releaseAvHandle(const hidl_handle& /*avMemory*/) {

Return<Result> Filter::releaseAvHandle(const hidl_handle& /*avMemory*/, uint64_t /*avDataId*/) {

    ALOGV("%s", __FUNCTION__);



    return Result::SUCCESS;

tv/tuner/1.0/default/Filter.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ class Filter : public IFilter { 


    virtual Return<Result> flush() override;



    virtual Return<Result> releaseAvHandle(const hidl_handle& avMemory) override;

    virtual Return<Result> releaseAvHandle(const hidl_handle& avMemory, uint64_t avDataId) override;



    virtual Return<Result> close() override;

tv/tuner/1.0/default/Tuner.cpp

+9 −0
Original line number Diff line number Diff line
@@ -139,6 +139,15 @@ sp<Frontend> Tuner::getFrontendById(uint32_t frontendId) { 
    return mFrontends[frontendId];

}



Return<void> Tuner::openLnbByName(const hidl_string& /*lnbName*/, openLnbByName_cb _hidl_cb) {

    ALOGV("%s", __FUNCTION__);



    sp<ILnb> lnb = new Lnb();



    _hidl_cb(Result::SUCCESS, 1234, lnb);

    return Void();

}



void Tuner::setFrontendAsDemuxSource(uint32_t frontendId, uint32_t demuxId) {

    mFrontendToDemux[frontendId] = demuxId;

}