Mercurial > libavcodec.hg

diff mpeg4audio.c @ 11886:2d81202be6e2 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add HE-AAC v2 support to the AAC decoder.
author alexc
date Sat, 19 Jun 2010 14:14:51 +0000
parents 480a999ce2c4
children
line wrap: on
line diff
--- a/mpeg4audio.c	Sat Jun 19 09:56:05 2010 +0000
+++ b/mpeg4audio.c	Sat Jun 19 14:14:51 2010 +0000
@@ -131,6 +131,14 @@
                 get_bits1(&gb); // skip 1 bit
         }
     }
+
+    //PS requires SBR
+    if (!c->sbr)
+        c->ps = 0;
+    //Limit implicit PS to the HE-AACv2 Profile
+    if ((c->ps == -1 && c->object_type != AOT_AAC_LC) || c->channels & ~0x01)
+        c->ps = 0;
+
     return specific_config_bitindex;
 }