[vlc-commits] omxil: Set OMX_AUDIO_AACStreamFormatMP4FF for AAC

[Martin Storsjö]

vlc | branch: master | Martin Storsjö <martin at martin.st> | Wed Jan 30 21:23:45 2013 +0200| [3e91dcf90752d4d9f787f030340033882b7af2a8] | committer: Martin Storsjö

omxil: Set OMX_AUDIO_AACStreamFormatMP4FF for AAC

This does work with the Samsung AAC decoder (which seems to support
both), while the google SW AAC decoder doesn't support the previous
value (but works fine with this one).

As far as I can read the specs, the two formats are identical (one
is defined as "AAC inside MPEG-4/ISO File Format" while the other
one is defined as "AAC Raw Format (access units)").

The Android media stack seems to be using this one internally
(with a bunch of references to this one, and no references to the
RAW one), which is a good indication that at least most android
AAC decoders should be able to handle it.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3e91dcf90752d4d9f787f030340033882b7af2a8
---

 modules/codec/omxil/utils.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/codec/omxil/utils.c b/modules/codec/omxil/utils.c
index a56fb33..54e9ec2 100644
--- a/modules/codec/omxil/utils.c
+++ b/modules/codec/omxil/utils.c
@@ -667,7 +667,7 @@ OMX_ERRORTYPE SetAudioParameters(OMX_HANDLETYPE handle,
         param->aac.nAACtools = OMX_AUDIO_AACToolAll;
         param->aac.nAACERtools = OMX_AUDIO_AACERAll;
         param->aac.eAACProfile = OMX_AUDIO_AACObjectLC;
-        param->aac.eAACStreamFormat = OMX_AUDIO_AACStreamFormatRAW;
+        param->aac.eAACStreamFormat = OMX_AUDIO_AACStreamFormatMP4FF;
         param->aac.eChannelMode = i_channels > 1 ?
             OMX_AUDIO_ChannelModeStereo : OMX_AUDIO_ChannelModeMono;
         break;