Jan Ekström
79b057f1b7
avcodec/mpeg4audio: add newer channel_coding mappings
...
Additionally, add comments regarding their definitions. Based on
ARIB STD-B32, which bases on 14496-3:2009 and 14496-3:2009/AMD4.
4 years ago
Michael Niedermayer
f72fa1ad67
avcodec: Replace skip_bits_long() by skip_bits() where possible
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years ago
Michael Niedermayer
79d5d79f38
avcodec: Replace show_bits_long() by show_bits() where possible
...
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
5 years ago
Jun Zhao
333109f469
lavc/mpeg4audio: add chan_config check to avoid indeterminate channels
...
add chan_config check to avoid indeterminate channels.
Signed-off-by: Jun Zhao <barryjzhao@tencent.com>
Signed-off-by: James Almer <jamrial@gmail.com>
5 years ago
James Almer
f96a8b015f
avcodec/mpeg4audio: add avpriv_mpeg4audio_get_config2()
...
Identical to avpriv_mpeg4audio_get_config() except taking a size argument in
bytes, and featuring a new logging context paremeter.
Schedule avpriv_mpeg4audio_get_config() for removal as soon as major is bumped
as well.
Signed-off-by: James Almer <jamrial@gmail.com>
5 years ago
Anton Khirnov
831018b0bb
mpeg4audio: Make avpriv_copy_pce_data() inline
...
The function currently accepts a PutBitContext and a GetBitContext,
which hardcodes their sizes into the lavc ABI. Since the function is
quite small and only called in a few places, the simplest solution is
making it inline, thus avoiding a runtime dependency completely.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
8 years ago
Alex Converse
3f1a38c919
aac_latm: Allow unaligned AudioSpecificConfig
...
Fixes ticket 4730
8 years ago
James Almer
33a2b73b98
mpeg4audio: correctly propagate meaningful error values
...
Signed-off-by: James Almer <jamrial@gmail.com>
8 years ago
James Almer
50b1453915
avcodec/mpeg4audio: correctly propagate meaningful error values
...
Signed-off-by: James Almer <jamrial@gmail.com>
8 years ago
Andreas Cadhalpun
0747754622
mpeg4audio: validate sample_rate
...
A negative sample rate doesn't make sense and triggers assertions in
av_rescale_rnd.
Also check for errors from avpriv_mpeg4audio_get_config in
ff_mp4_read_dec_config_descr.
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
8 years ago
Anton Khirnov
7e4e010b80
mpeg4audio: check the init_get_bits() return value
...
Fixes possible invalid reads.
CC:libav-stable@libav.org
10 years ago
Michael Niedermayer
deefdf9788
avpriv_mpeg4audio_get_config: check init_get_bits() return code.
...
Fixes null pointer dereference
Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Clément Bœsch
7581ad24a9
lavc/aac: fix shared build failures with MSVC.
...
This is a workaround until a better solution is found.
12 years ago
Michael Niedermayer
599a4e0771
mpeg4audio: dont take the SBR flag too serious.
...
Fixes Ticket1049
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
12 years ago
Michael Niedermayer
f37b2d5a68
aacdec: Fix null pointer crash
...
Fixes bug170
Bug found by: Gautam Gupta
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
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.
13 years ago
Anton Khirnov
9f51c682ee
lavc: use avpriv_ prefix for ff_copy_bits and align_put_bits.
...
They are used in lavf.
13 years ago
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
13 years ago
Mans Rullgard
2912e87a6c
Replace FFmpeg with Libav in licence headers
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
14 years ago
Alex Converse
a20639017b
Add HE-AAC v2 support to the AAC decoder.
...
Originally committed as revision 23647 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Alex Converse
d14662f66a
Add support for PS sync extensions.
...
Originally committed as revision 22818 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
Alex Converse
37216b99e0
Use get_bits_left() in the sync extension check.
...
Originally committed as revision 22817 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
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
15 years ago
Alex Converse
5aea268d14
Add a channels field to MPEG4AudioConfig.
...
Originally committed as revision 20512 to svn://svn.ffmpeg.org/ffmpeg/trunk
15 years ago
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
15 years ago
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
16 years ago
Alex Converse
107815de42
Subroutine to copy an AAC Program Config Element (PCE)
...
Originally committed as revision 18817 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Jai Menon
3d10a8904d
Read extended channel configuration when extended AOT is BSAC.
...
Originally committed as revision 18644 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Stefano Sabatini
9106a698e7
Rename bitstream.h to get_bits.h.
...
Originally committed as revision 18494 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Baptiste Coudurier
44dff0058e
init ext sample rate to 0 if not present
...
Originally committed as revision 18139 to svn://svn.ffmpeg.org/ffmpeg/trunk
16 years ago
Baptiste Coudurier
4d34bb19c1
mpeg4audio common code
...
Originally committed as revision 12662 to svn://svn.ffmpeg.org/ffmpeg/trunk
17 years ago