vlc | branch: master | Martin Storsjö <[email protected]> | Mon Feb 4 16:19:17 2013 +0200| [9b0916a50e25a488f19fa56899b76b1367955b3f] | committer: Martin Storsjö
omxil: Remove a few audio codec mappings This reverts most of 2b101ff4a0. VLC_CODEC_MP3 seems to work fine with multiple OMX mp3 decoders, so keep it mapped. VLC_CODEC_MPGA does work with some OMX mp3 decoders (OMX.SEC.mp3.dec seems to handle it) but not with all (OMX.google.mp3.decoder doesn't seem to handle it). Vorbis does not work with OMX decoders in the current form. The only such decoder I've seen is OMX.google.vorbis.decoder, and using it requires us to modify the packets sent a little. Even if this can be done pretty easily, the packet format feels more like an android internal hack than an official spec of any sort, so disable this mapping since there isn't much value in using it currently. WMA does not work with OMX in the current form (tested with OMX.SEC.wma.dec). I've got work in progress code that makes certain WMA files work with it, but not all, so disable it until at least most of them work properly. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9b0916a50e25a488f19fa56899b76b1367955b3f --- modules/codec/omxil/utils.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/modules/codec/omxil/utils.c b/modules/codec/omxil/utils.c index 38d1063..42ba436 100644 --- a/modules/codec/omxil/utils.c +++ b/modules/codec/omxil/utils.c @@ -329,12 +329,6 @@ static const struct { VLC_CODEC_MP4A, OMX_AUDIO_CodingAAC, "audio_decoder.aac" }, { VLC_CODEC_S16N, OMX_AUDIO_CodingPCM, "audio_decoder.pcm" }, { VLC_CODEC_MP3, OMX_AUDIO_CodingMP3, "audio_decoder.mp3" }, - { VLC_CODEC_MPGA, OMX_AUDIO_CodingMP3, "audio_decoder.mp3" }, - { VLC_CODEC_VORBIS, OMX_AUDIO_CodingVORBIS, "audio_decoder.vorbis" }, - { VLC_CODEC_WMA1, OMX_AUDIO_CodingWMA, "audio_decoder.wma" }, - { VLC_CODEC_WMA2, OMX_AUDIO_CodingWMA, "audio_decoder.wma" }, - { VLC_CODEC_WMAP, OMX_AUDIO_CodingWMA, "audio_decoder.wma" }, - { VLC_CODEC_WMAL, OMX_AUDIO_CodingWMA, "audio_decoder.wma" }, { 0, 0, 0 } }; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
