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

Commit 31431b34 authored by James Dong's avatar James Dong Committed by Android Git Automerger
Browse files

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

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 '374aee68' into froyo-plus-aosp

* commit '374aee68':
  Switch to use software MP3 decoder
parents 13cb7a04 374aee68

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" },