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

Commit 334900fa authored by vivek mehta's avatar vivek mehta Committed by Ricardo Cerqueira
Browse files

libstagefright: Ignore other sniffers if current sniffer returns positive confidence 

-MP3 sniffer functions takes around 400ms for the playback
of most of the clips.
-This was causing a startup delay of 1.5 seconds on playback
-Increasing the value of confidence for amr,wav,ogg,mpeg4 formats
to 0.6 so that when they are detected, we ignore the sniffMP3
function.

Change-Id: I08acf28a63c8ae7b1b69e03f85fa9065a52c649e
parent a2537344

media/libstagefright/AMRExtractor.cpp

+2 −2
Original line number Diff line number Diff line
@@ -337,12 +337,12 @@ bool SniffAMR( 


    if (!memcmp(header, "#!AMR\n", 6)) {

        *mimeType = MEDIA_MIMETYPE_AUDIO_AMR_NB;

        *confidence = 0.5;

        *confidence = 0.6;



        return true;

    } else if (!memcmp(header, "#!AMR-WB\n", 9)) {

        *mimeType = MEDIA_MIMETYPE_AUDIO_AMR_WB;

        *confidence = 0.5;

        *confidence = 0.6;



        return true;

    }

media/libstagefright/MPEG4Extractor.cpp

100755 → 100644
+2 −2
Original line number Diff line number Diff line
@@ -2304,7 +2304,7 @@ static bool LegacySniffMPEG4( 
        || !memcmp(header, "ftypM4A ", 8) || !memcmp(header, "ftypf4v ", 8)

        || !memcmp(header, "ftypkddi", 8) || !memcmp(header, "ftypM4VP", 8)) {

        *mimeType = MEDIA_MIMETYPE_CONTAINER_MPEG4;

        *confidence = 0.4;

        *confidence = 0.6;



        return true;

    }
@@ -2442,7 +2442,7 @@ static bool BetterSniffMPEG4( 
    }



    *mimeType = MEDIA_MIMETYPE_CONTAINER_MPEG4;

    *confidence = 0.4f;

    *confidence = 0.6f;



    if (moovAtomEndOffset >= 0) {

        *meta = new AMessage;

media/libstagefright/OggExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1019,7 +1019,7 @@ bool SniffOgg( 
    }



    mimeType->setTo(MEDIA_MIMETYPE_CONTAINER_OGG);

    *confidence = 0.2f;

    *confidence = 0.6f;



    return true;

}

media/libstagefright/WAVExtractor.cpp

+1 −1
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ bool SniffWAV( 
    }



    *mimeType = MEDIA_MIMETYPE_CONTAINER_WAV;

    *confidence = 0.3f;

    *confidence = 0.6f;



    return true;

}