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

Commit 05cb9fdc authored by Wei Jia's avatar Wei Jia Committed by android-build-merger
Browse files

Merge "MediaPlayer: enable more logs for extractor failure." into oc-dev 

am: 087f3af6

Change-Id: I755add48326ae77a02708db2a941d3e23defeb70
parents e58485dc 087f3af6

media/libmediaplayerservice/nuplayer/GenericSource.cpp

+2 −0
Original line number Diff line number Diff line
@@ -156,6 +156,7 @@ status_t NuPlayer::GenericSource::initFromDataSource() { 
    extractor = MediaExtractor::Create(mDataSource, NULL);



    if (extractor == NULL) {

        ALOGE("initFromDataSource, cannot create extractor!");

        return UNKNOWN_ERROR;

    }
@@ -171,6 +172,7 @@ status_t NuPlayer::GenericSource::initFromDataSource() { 


    size_t numtracks = extractor->countTracks();

    if (numtracks == 0) {

        ALOGE("initFromDataSource, source has no track!");

        return UNKNOWN_ERROR;

    }

media/libstagefright/MediaExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ sp<MediaExtractor> MediaExtractor::CreateFromService( 
    if (mime == NULL) {

        float confidence;

        if (!sniff(source, &tmp, &confidence, &meta)) {

            ALOGV("FAILED to autodetect media content.");

            ALOGW("FAILED to autodetect media content.");



            return NULL;

        }