diff options
| author | James Dong <jdong@google.com> | 2010-04-26 11:12:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-04-26 11:12:37 -0700 |
| commit | 261741e728f2137f12b28df25c25e96acd942de9 (patch) | |
| tree | 41068d0acc37723315f09cf173b621c390d73259 /media/libstagefright/OMXCodec.cpp | |
| parent | add08eb454bbe8b3a0a40d23621c102b72cd005d (diff) | |
| parent | 0b5ba9eeed56a80fed3735f5cd4951477fda79f0 (diff) | |
| download | frameworks_av-261741e728f2137f12b28df25c25e96acd942de9.zip frameworks_av-261741e728f2137f12b28df25c25e96acd942de9.tar.gz frameworks_av-261741e728f2137f12b28df25c25e96acd942de9.tar.bz2 | |
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 '31431b34f895862ae13efba30bb5771085572687' into kraken
* commit '31431b34f895862ae13efba30bb5771085572687':
Switch to use software MP3 decoder
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rw-r--r-- | media/libstagefright/OMXCodec.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 21aa980..9cdf96e 100644 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -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" }, |