Mercurial > libavcodec.hg
comparison mpeg4audio.c @ 11886:2d81202be6e2 libavcodec
Add HE-AAC v2 support to the AAC decoder.
author | alexc |
---|---|
date | Sat, 19 Jun 2010 14:14:51 +0000 |
parents | 480a999ce2c4 |
children |
comparison
equal
deleted
inserted
replaced
11885:0e777af9160a | 11886:2d81202be6e2 |
---|---|
129 break; | 129 break; |
130 } else | 130 } else |
131 get_bits1(&gb); // skip 1 bit | 131 get_bits1(&gb); // skip 1 bit |
132 } | 132 } |
133 } | 133 } |
134 | |
135 //PS requires SBR | |
136 if (!c->sbr) | |
137 c->ps = 0; | |
138 //Limit implicit PS to the HE-AACv2 Profile | |
139 if ((c->ps == -1 && c->object_type != AOT_AAC_LC) || c->channels & ~0x01) | |
140 c->ps = 0; | |
141 | |
134 return specific_config_bitindex; | 142 return specific_config_bitindex; |
135 } | 143 } |
136 | 144 |
137 static av_always_inline unsigned int copy_bits(PutBitContext *pb, | 145 static av_always_inline unsigned int copy_bits(PutBitContext *pb, |
138 GetBitContext *gb, | 146 GetBitContext *gb, |