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

Commit 40eb3f7b authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

am 31431b34: am 374aee68: Switch to use software MP3 decoder Hardware MP3... 

am 31431b34: am 374aee68: Switch to use software MP3 decoder Hardware MP3 decoder could lead to hang in the Music application, although the chance is very low.

Merge commit '31431b34' into kraken

* commit '31431b34':
  Switch to use software MP3 decoder
parents 069f296c 31431b34

media/libstagefright/OMXCodec.cpp

+1 −1
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static sp<MediaSource> InstantiateSoftwareCodec( 


static const CodecInfo kDecoderInfo[] = {

    { MEDIA_MIMETYPE_IMAGE_JPEG, "OMX.TI.JPEG.decode" },

    { MEDIA_MIMETYPE_AUDIO_MPEG, "OMX.TI.MP3.decode" },

//    { MEDIA_MIMETYPE_AUDIO_MPEG, "OMX.TI.MP3.decode" },

    { MEDIA_MIMETYPE_AUDIO_MPEG, "MP3Decoder" },

//    { MEDIA_MIMETYPE_AUDIO_MPEG, "OMX.PV.mp3dec" },

//    { MEDIA_MIMETYPE_AUDIO_AMR_NB, "OMX.TI.AMR.decode" },