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

Commit 8042ca1b authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

Merge "MediaSource: treat empty track as unknown" into pi-dev am: edfea741 

am: d3566a51

Change-Id: I9ed060ac6247f2df3c052beefeca20b589b9df2c
parents 072e1f18 d3566a51

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+5 −1
Original line number Original line Diff line number Diff line
@@ -934,7 +934,11 @@ sp<AMessage> NuPlayer::GenericSource::getTrackInfo(size_t trackIndex) const { 
    sp<MetaData> meta = mSources.itemAt(trackIndex)->getFormat();

    sp<MetaData> meta = mSources.itemAt(trackIndex)->getFormat();

    if (meta == NULL) {

    if (meta == NULL) {

        ALOGE("no metadata for track %zu", trackIndex);

        ALOGE("no metadata for track %zu", trackIndex);

        return NULL;

        format->setInt32("type", MEDIA_TRACK_TYPE_UNKNOWN);

        format->setString("mime", "application/octet-stream");

        format->setString("language", "und");



        return format;

    }

    }





    const char *mime;

    const char *mime;

media/libmediaplayerservice/nuplayer/NuPlayerCCDecoder.cpp

+3 −1
Original line number Original line Diff line number Diff line
@@ -155,7 +155,9 @@ sp<AMessage> NuPlayer::CCDecoder::getTrackInfo(size_t index) const { 
            break;

            break;

        default:

        default:

            ALOGE("Unknown track type: %d", track.mTrackType);

            ALOGE("Unknown track type: %d", track.mTrackType);

            return NULL;

            format->setInt32("type", MEDIA_TRACK_TYPE_UNKNOWN);

            format->setString("mime", "application/octet-stream");

            return format;

    }

    }





    // For CEA-608 CC1, field 0 channel 0

    // For CEA-608 CC1, field 0 channel 0