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

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

Merge changes from topic "chartype" into sc-dev 

* changes:
  Use char instead of int in Tuner AIDL interface for all the 16-bit data defined in TunerHAL
  Cast HIDL uint16_t to char16_t in AIDL cpp backend service
parents afe8a015 f24dd061

services/tuner/TunerFilter.cpp

+11 −11
Original line number Diff line number Diff line
@@ -685,7 +685,7 @@ void TunerFilter::FilterCallback::getMediaEvent( 
        DemuxFilterMediaEvent mediaEvent = e.media();

        TunerFilterMediaEvent tunerMedia;



        tunerMedia.streamId = static_cast<int>(mediaEvent.streamId);

        tunerMedia.streamId = static_cast<char16_t>(mediaEvent.streamId);

        tunerMedia.isPtsPresent = mediaEvent.isPtsPresent;

        tunerMedia.pts = static_cast<long>(mediaEvent.pts);

        tunerMedia.dataLength = static_cast<int>(mediaEvent.dataLength);
@@ -732,10 +732,10 @@ void TunerFilter::FilterCallback::getSectionEvent( 
        DemuxFilterSectionEvent sectionEvent = e.section();

        TunerFilterSectionEvent tunerSection;



        tunerSection.tableId = static_cast<char>(sectionEvent.tableId);

        tunerSection.version = static_cast<char>(sectionEvent.version);

        tunerSection.sectionNum = static_cast<char>(sectionEvent.sectionNum);

        tunerSection.dataLength = static_cast<char>(sectionEvent.dataLength);

        tunerSection.tableId = static_cast<char16_t>(sectionEvent.tableId);

        tunerSection.version = static_cast<char16_t>(sectionEvent.version);

        tunerSection.sectionNum = static_cast<char16_t>(sectionEvent.sectionNum);

        tunerSection.dataLength = static_cast<char16_t>(sectionEvent.dataLength);



        TunerFilterEvent tunerEvent;

        tunerEvent.set<TunerFilterEvent::section>(move(tunerSection));
@@ -749,8 +749,8 @@ void TunerFilter::FilterCallback::getPesEvent( 
        DemuxFilterPesEvent pesEvent = e.pes();

        TunerFilterPesEvent tunerPes;



        tunerPes.streamId = static_cast<char>(pesEvent.streamId);

        tunerPes.dataLength = static_cast<int>(pesEvent.dataLength);

        tunerPes.streamId = static_cast<char16_t>(pesEvent.streamId);

        tunerPes.dataLength = static_cast<char16_t>(pesEvent.dataLength);

        tunerPes.mpuSequenceNumber = static_cast<int>(pesEvent.mpuSequenceNumber);



        TunerFilterEvent tunerEvent;
@@ -777,9 +777,9 @@ void TunerFilter::FilterCallback::getTsRecordEvent(vector<DemuxFilterEvent::Even 
        }



        if (tsRecordEvent.pid.getDiscriminator() == DemuxPid::hidl_discriminator::tPid) {

            tunerTsRecord.pid = static_cast<char>(tsRecordEvent.pid.tPid());

            tunerTsRecord.pid = static_cast<char16_t>(tsRecordEvent.pid.tPid());

        } else {

            tunerTsRecord.pid = static_cast<char>(Constant::INVALID_TS_PID);

            tunerTsRecord.pid = static_cast<char16_t>(Constant::INVALID_TS_PID);

        }



        tunerTsRecord.scIndexMask = scIndexMask;
@@ -839,7 +839,7 @@ void TunerFilter::FilterCallback::getDownloadEvent( 
        tunerDownload.itemFragmentIndex = static_cast<int>(downloadEvent.itemFragmentIndex);

        tunerDownload.mpuSequenceNumber = static_cast<int>(downloadEvent.mpuSequenceNumber);

        tunerDownload.lastItemFragmentIndex = static_cast<int>(downloadEvent.lastItemFragmentIndex);

        tunerDownload.dataLength = static_cast<char>(downloadEvent.dataLength);

        tunerDownload.dataLength = static_cast<char16_t>(downloadEvent.dataLength);



        TunerFilterEvent tunerEvent;

        tunerEvent.set<TunerFilterEvent::download>(move(tunerDownload));
@@ -853,7 +853,7 @@ void TunerFilter::FilterCallback::getIpPayloadEvent( 
        DemuxFilterIpPayloadEvent ipPayloadEvent = e.ipPayload();

        TunerFilterIpPayloadEvent tunerIpPayload;



        tunerIpPayload.dataLength = static_cast<char>(ipPayloadEvent.dataLength);

        tunerIpPayload.dataLength = static_cast<char16_t>(ipPayloadEvent.dataLength);



        TunerFilterEvent tunerEvent;

        tunerEvent.set<TunerFilterEvent::ipPayload>(move(tunerIpPayload));

services/tuner/aidl/android/media/tv/tuner/TunerDemuxPid.aidl

+2 −2
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ package android.media.tv.tuner; 
 * {@hide}

 */

union TunerDemuxPid {

    int tPid;

    char tPid;



    int mmtpPid;

    char mmtpPid;

}

services/tuner/aidl/android/media/tv/tuner/TunerFilterMediaEvent.aidl

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.media.tv.tuner.TunerAudioExtraMetaData; 
 * {@hide}

 */

parcelable TunerFilterMediaEvent {

    int streamId;

    char streamId;



    /**

     * true if PTS is present in PES header.

services/tuner/aidl/android/media/tv/tuner/TunerFilterPesEvent.aidl

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ parcelable TunerFilterPesEvent { 
    /**

     * Data size in bytes of PES data

     */

    int dataLength;

    char dataLength;



    /**

     * MPU sequence number of filtered data

services/tuner/aidl/android/media/tv/tuner/TunerFrontendIsdbs3Settings.aidl

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ parcelable TunerFrontendIsdbs3Settings { 
     */

    int frequency;



    int streamId;

    char streamId;



    int streamIdType;