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

Commit 316b60db authored by Amy Zhang's avatar Amy Zhang Committed by Android (Google) Code Review
Browse files

Merge changes from topic "tuner" 

* changes:
  Adding a Broadcast data flow test with a PES filter
  Adding the mocking frontend tuning functionality to take specific ts file as source of a Demux.
  Adding filter configuration and pes filter test based on PID test
  Adding a TS filter functionality into the Demux default impl
  Tuner HAL : patch comments and ATSC3
parents e38c6785 4bad0f98

tv/tuner/1.0/IDemux.hal

+18 −2
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2019 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.0;

package android.hardware.tv.tuner@1.0;





import IDemuxCallback;

import IDemuxCallback;
@@ -236,7 +252,7 @@ interface IDemux { 
     *         INVALID_STATE if failed for wrong state.

     *         INVALID_STATE if failed for wrong state.

     *         UNKNOWN_ERROR if failed for other reasons.

     *         UNKNOWN_ERROR if failed for other reasons.

     */

     */

    attachOutputTsFilter(DemuxFilterId filterId) generates (Result result);

    attachOutputFilter(DemuxFilterId filterId) generates (Result result);





    /**

    /**

     * Detach one filter from the demux's output.

     * Detach one filter from the demux's output.
@@ -250,7 +266,7 @@ interface IDemux { 
     *         INVALID_STATE if failed for wrong state.

     *         INVALID_STATE if failed for wrong state.

     *         UNKNOWN_ERROR if failed for other reasons.

     *         UNKNOWN_ERROR if failed for other reasons.

     */

     */

    detachOutputTsFilter(DemuxFilterId filterId) generates (Result result);

    detachOutputFilter(DemuxFilterId filterId) generates (Result result);





    /**

    /**

     * Start to take data to the demux's output.

     * Start to take data to the demux's output.

tv/tuner/1.0/IDemuxCallback.hal

+16 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2019 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.0;

package android.hardware.tv.tuner@1.0;





interface IDemuxCallback {

interface IDemuxCallback {

tv/tuner/1.0/IDescrambler.hal

+16 −0
Original line number Original line Diff line number Diff line 
/*

 * Copyright (C) 2019 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.0;

package android.hardware.tv.tuner@1.0;

/**

/**

 * Descrambler is used to descramble input data.

 * Descrambler is used to descramble input data.

tv/tuner/1.0/IFrontend.hal

+1 −19
Original line number Original line Diff line number Diff line
@@ -145,7 +145,7 @@ interface IFrontend { 
     *         cable frontend.

     *         cable frontend.

     *         UNKNOWN_ERROR if failed for other reasons.

     *         UNKNOWN_ERROR if failed for other reasons.

     */

     */

    setLnb(ILnb lnb) generates (Result result);

    setLnb(LnbId lnbId) generates (Result result);





    /**

    /**

     * Enble or Disable Low Noise Amplifier (LNA).

     * Enble or Disable Low Noise Amplifier (LNA).
@@ -158,22 +158,4 @@ interface IFrontend { 
     *         UNKNOWN_ERROR if failed for other reasons.

     *         UNKNOWN_ERROR if failed for other reasons.

     */

     */

    setLna(bool bEnable) generates (Result result);

    setLna(bool bEnable) generates (Result result);



    /**

     *  Sends DiSEqC (Digital Satellite Equipment Control) message.

     *

     * Client sends DiSeqc message to DiSEqc compatible device through the

     * frontend. The response message from the device comes back to the client

     * through frontend's callback onDiseqcMessage.

     *

     * @param diseqcMessage a byte array of data for DiSEqC message which is

     *        specified by EUTELSAT Bus Functional Specification Version 4.2.

     *

     * @return result Result status of the operation.

     *         SUCCESS if successful,

     *         INVALID_STATE if the frontend can't send DiSEqc Message, such as

     *         cable frontend.

     *         UNKNOWN_ERROR if failed for other reasons.

     */

    sendDiseqcMessage(vec<uint8_t> diseqcMessage) generates (Result result);

};
 
};

tv/tuner/1.0/ILnb.hal

+18 −0
Original line number Original line Diff line number Diff line
@@ -54,6 +54,24 @@ interface ILnb { 
     */

     */

    setSatellitePosition(FrontendLnbPosition position) generates (Result result);

    setSatellitePosition(FrontendLnbPosition position) generates (Result result);





    /**

     *  Sends DiSEqC (Digital Satellite Equipment Control) message.

     *

     * Client sends DiSeqc message to DiSEqc to LNB. The response message from

     * the device comes back to the client through frontend's callback

     * onDiseqcMessage.

     *

     * @param diseqcMessage a byte array of data for DiSEqC message which is

     *        specified by EUTELSAT Bus Functional Specification Version 4.2.

     *

     * @return result Result status of the operation.

     *         SUCCESS if successful,

     *         INVALID_STATE if the frontend can't send DiSEqc Message, such as

     *         cable frontend.

     *         UNKNOWN_ERROR if failed for other reasons.

     */

    sendDiseqcMessage(vec<uint8_t> diseqcMessage) generates (Result result);



    /**

    /**

     * Releases the LNB instance

     * Releases the LNB instance

     *

     *