diff options
| author | Andreas Huber <andih@google.com> | 2012-03-16 12:00:18 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-03-16 12:00:18 -0700 |
| commit | c5255ac5b1bd313dcb50159566163b24dce7483f (patch) | |
| tree | 49f2e815570219a3cf541032dba3e4ac857aca09 /media/libstagefright/OMXCodec.cpp | |
| parent | 49f306f863b14f8bfc3b405ebfd3a2fb2b403c15 (diff) | |
| download | frameworks_av-c5255ac5b1bd313dcb50159566163b24dce7483f.zip frameworks_av-c5255ac5b1bd313dcb50159566163b24dce7483f.tar.gz frameworks_av-c5255ac5b1bd313dcb50159566163b24dce7483f.tar.bz2 | |
ACodec is a little more aggressive in its error checking now.
Update components to do the right thing.
Change-Id: Ibfbad3f53effc16368cca4a0e978d01d54d08a1d
Diffstat (limited to 'media/libstagefright/OMXCodec.cpp')
| -rwxr-xr-x | media/libstagefright/OMXCodec.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/media/libstagefright/OMXCodec.cpp b/media/libstagefright/OMXCodec.cpp index 278e3a2..d5e6bec 100755 --- a/media/libstagefright/OMXCodec.cpp +++ b/media/libstagefright/OMXCodec.cpp @@ -1332,8 +1332,6 @@ void OMXCodec::setComponentRole( "audio_decoder.mp1", "audio_encoder.mp1" }, { MEDIA_MIMETYPE_AUDIO_MPEG_LAYER_II, "audio_decoder.mp2", "audio_encoder.mp2" }, - { MEDIA_MIMETYPE_AUDIO_MPEG, - "audio_decoder.mp3", "audio_encoder.mp3" }, { MEDIA_MIMETYPE_AUDIO_AMR_NB, "audio_decoder.amrnb", "audio_encoder.amrnb" }, { MEDIA_MIMETYPE_AUDIO_AMR_WB, @@ -1342,6 +1340,10 @@ void OMXCodec::setComponentRole( "audio_decoder.aac", "audio_encoder.aac" }, { MEDIA_MIMETYPE_AUDIO_VORBIS, "audio_decoder.vorbis", "audio_encoder.vorbis" }, + { MEDIA_MIMETYPE_AUDIO_G711_MLAW, + "audio_decoder.g711mlaw", "audio_encoder.g711mlaw" }, + { MEDIA_MIMETYPE_AUDIO_G711_ALAW, + "audio_decoder.g711alaw", "audio_encoder.g711alaw" }, { MEDIA_MIMETYPE_VIDEO_AVC, "video_decoder.avc", "video_encoder.avc" }, { MEDIA_MIMETYPE_VIDEO_MPEG4, |