Commit Graph

19 Commits

Author SHA1 Message Date
Janne Grunau
fd095539d1 latmdec: fix audio specific config parsing
Pass the correct size in bits to mpeg4audio_get_config and add a flag
to disable parsing of the sync extension when the size is not known.

Latm with AudioMuxVersion 0 does not specify the size of the audio
specific config. Data after the audio specific config can be
misinterpreted as sync extension resulting in random and wrong configs.
2011-12-03 00:42:48 +01:00
Anton Khirnov
9f51c682ee lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
They are used in lavf.
2011-10-20 21:06:58 +02:00
Anton Khirnov
59a9a23581 lavc: use avpriv_ prefix for some mpeg4audio symbols used in lavf.
Specifically, ff_mpeg4audio_sample_rates, ff_mpeg4audio_get_config and
ff_copy_pce_data
2011-10-20 21:06:57 +02:00
Mans Rullgard
2912e87a6c Replace FFmpeg with Libav in licence headers
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 13:33:20 +00:00
Alex Converse
a20639017b Add HE-AAC v2 support to the AAC decoder.
Originally committed as revision 23647 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-19 14:14:51 +00:00
Alex Converse
d14662f66a Add support for PS sync extensions.
Originally committed as revision 22818 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-08 06:04:41 +00:00
Alex Converse
37216b99e0 Use get_bits_left() in the sync extension check.
Originally committed as revision 22817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-08 06:04:37 +00:00
Alex Converse
702b73bc9f Fix ext_object_type.
In the case of explicit non-backwards compible PS, the extension object
type should be set to SBR. See 14496-3:2009 (fourth edition).

Originally committed as revision 22816 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-08 06:04:31 +00:00
Alex Converse
1e79771c31 Add support for non-backwards compatible signaled parametric stereo.
This is done without breaking W6132 Annex YYYY draft MP3onMP4 which also uses AOT 29.
Samples:
http://samples.mplayerhq.hu/A-codecs/AAC/aacPlusDecoderCheckPackage_v2.1/bitstreams/File7.3gp
http://samples.mplayerhq.hu/MPEG-4/mp3on4/id5_1.mp4

Originally committed as revision 22281 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-07 17:55:23 +00:00
Ronald S. Bultje
6e44ba1550 Use get_bits_left() instead of size_in_bits - get_bits_count().
Originally committed as revision 20543 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-16 17:42:43 +00:00
Thilo Borgmann
24026a2d49 Add the ability to parse the ALSSpecificConfig from an MPEG-4 AudioSpecificConfig. Patch by Thilo Borgmann
<com googlemail borgmann thilo> as part of GSoC 2009.

Originally committed as revision 20516 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-11 22:16:54 +00:00
Alex Converse
5aea268d14 Add a channels field to MPEG4AudioConfig.
Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-11 20:24:23 +00:00
Alex Converse
0cc4701a3a Use the AOT enum instead of integer literals for setting and comparing audio
object types.

Originally committed as revision 19666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-17 00:17:58 +00:00
Justin Ruggles
b5fe06abf0 Replace 5 with AOT_SBR when referring to the MPEG-4 audio object type.
Originally committed as revision 19569 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-03 02:09:23 +00:00
Alex Converse
107815de42 Subroutine to copy an AAC Program Config Element (PCE)
Originally committed as revision 18817 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-13 22:57:30 +00:00
Jai Menon
3d10a8904d Read extended channel configuration when extended AOT is BSAC.
Originally committed as revision 18644 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-21 17:52:52 +00:00
Stefano Sabatini
9106a698e7 Rename bitstream.h to get_bits.h.
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-13 16:20:26 +00:00
Baptiste Coudurier
44dff0058e init ext sample rate to 0 if not present
Originally committed as revision 18139 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-22 02:53:01 +00:00
Baptiste Coudurier
4d34bb19c1 mpeg4audio common code
Originally committed as revision 12662 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-01 12:01:40 +00:00