Michael Niedermayer
6cbe81999b
Merge remote-tracking branch 'qatar/master'
...
* qatar/master: (28 commits)
Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
x86: cabac: fix register constraints for 32-bit mode
cabac: move x86 asm to libavcodec/x86/cabac.h
x86: h264: cast pointers to intptr_t rather than int
x86: h264: remove hardcoded edi in decode_significance_8x8_x86()
x86: h264: remove hardcoded esi in decode_significance[_8x8]_x86()
x86: h264: remove hardcoded edx in decode_significance[_8x8]_x86()
x86: h264: remove hardcoded eax in decode_significance[_8x8]_x86()
x86: cabac: change 'a' constraint to 'r' in get_cabac_inline()
x86: cabac: remove hardcoded esi in get_cabac_inline()
x86: cabac: remove hardcoded edx in get_cabac_inline()
x86: cabac: remove unused macro parameter
x86: cabac: remove hardcoded ebx in inline asm
x86: cabac: remove hardcoded struct offsets from inline asm
cabac: remove inline asm under #if 0
cabac: remove BRANCHLESS_CABAC_DECODER switch
cabac: remove #if 0 cascade under never-set #ifdef ARCH_X86_DISABLED
document libswscale bump
error_resilience: skip last-MV predictor step if MVs are not available.
error_resilience: actually add counter when adding a MV predictor.
...
Conflicts:
Changelog
libavcodec/error_resilience.c
libavfilter/defaults.c
libavfilter/vf_drawtext.c
libswscale/swscale.h
tests/ref/vsynth1/error
tests/ref/vsynth2/error
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-21 03:38:25 +02:00
Justin Ruggles
e6c52cee54
Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().
...
av_get_bits_per_sample_fmt() is deprecated.
2011-06-20 18:56:06 -04: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
Reinhard Tartler
7ffe76e540
Merge libavcore into libavutil
...
Done to keep ABI compatible. Otherwise this is just silly
2011-02-16 23:00:30 +01:00
Reinhard Tartler
737eb5976f
Merge libavcore into libavutil
...
It is pretty hopeless that other considerable projects will adopt
libavutil alone in other projects. Projects that need small footprint
are better off with more specialized libraries such as gnulib or rather
just copy the necessary parts that they need. With this in mind, nobody
is helped by having libavutil and libavcore split. In order to ease
maintenance inside and around FFmpeg and to reduce confusion where to
put common code, avcore's functionality is merged (back) to avutil.
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-02-15 16:18:21 +01:00
Luca Barbato
9ef5a9deaf
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
(cherry picked from commit dfd2a005eb
)
2011-01-30 03:41:48 +01:00
Vitor Sessak
5255acc6be
Fix memory leak in ALS decoder in big endian systems
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e0eb963aaa
)
2011-01-30 03:41:47 +01:00
Luca Barbato
dfd2a005eb
Replace dprintf with av_dlog
...
dprintf clashes with POSIX.1-2008
2011-01-29 23:55:37 +01:00
Vitor Sessak
e0eb963aaa
Fix memory leak in ALS decoder in big endian systems
...
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-29 18:09:42 +00:00
Diego Elio Pettenò
e7e2df27f8
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
...
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit d36beb3f69
)
2011-01-28 03:15:34 +01:00
Diego Elio Pettenò
d36beb3f69
Add ff_ prefix to data symbols of encoders, decoders, hwaccel, parsers, bsf.
...
None of these symbols should be accessed directly, so declare them as
hidden.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-01-26 16:08:45 +00:00
Sprezz
efd63823e6
alsdec: Correct the ALS decoder by storing some parameters per-channel rather
...
than just per-block. Patch by Sprezz [sprezzatura gmx com]. Fixes Issue 2387.
Originally committed as revision 25898 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-12-06 15:18:50 +00:00
Stefano Sabatini
5d6e4c160a
Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enum
...
SampleFormat with AVSampleFormat.
Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-12 11:04:40 +00:00
Thilo Borgmann
a29039aef3
Reindent after last commit.
...
Originally committed as revision 25711 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-08 15:24:11 +00:00
Thilo Borgmann
4051ae7617
Allow clean initialization of lut_status array by changing type to signed int.
...
Originally committed as revision 25710 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-08 15:22:15 +00:00
Stefano Sabatini
ba7d6e798e
Remove usage of deprecated libavcodec/audioconvert.h functions.
...
Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-03 20:19:34 +00:00
Reinhard Tartler
2901cc9a95
Fix spelling in comment(s)
...
Originally committed as revision 24737 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-08-07 14:11:43 +00:00
Måns Rullgård
8fc0162ac4
Add av_ prefix to bswap macros
...
Originally committed as revision 24170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-10 22:12:30 +00:00
Måns Rullgård
48966b02cb
Grammar fixes
...
Originally committed as revision 23961 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-02 00:03:48 +00:00
Måns Rullgård
49bd8e4b84
Fix grammar errors in documentation
...
Originally committed as revision 23904 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-30 15:38:06 +00:00
Thilo Borgmann
cbb39648c1
Add CRC check to the ALS decoder.
...
Originally committed as revision 23889 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-29 16:56:28 +00:00
Måns Rullgård
17253f598e
alsdec: convert VLAs to fixed size
...
The maximum value of sub_blocks is 8, a safe size to always allocate on
stack.
Originally committed as revision 23797 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-26 14:34:18 +00:00
Diego Biurrun
ba87f0801d
Remove explicit filename from Doxygen @file commands.
...
Passing an explicit filename to this command is only necessary if the
documentation in the @file block refers to a file different from the
one the block resides in.
Originally committed as revision 22921 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-20 14:45:34 +00:00
Stefano Sabatini
72415b2adb
Define AVMediaType enum, and use it instead of enum CodecType, which
...
is deprecated and will be dropped at the next major bump.
Originally committed as revision 22735 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-30 23:30:55 +00:00
Thilo Borgmann
bbe8fa1f83
Fix last frame block size correction.
...
Originally committed as revision 22238 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 17:13:31 +00:00
Thilo Borgmann
a8c09ff2d8
Do sequential bit reading outside of []-operators.
...
Originally committed as revision 21892 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-19 08:07:02 +00:00
Thilo Borgmann
dc9e57a878
Fix sizeof()-statement to use the actual pointer type.
...
Originally committed as revision 21872 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-17 23:26:48 +00:00
Thilo Borgmann
cd09284924
Fix wrong buffer allocation for MCC in ALS.
...
Originally committed as revision 21871 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-17 22:53:25 +00:00
Thilo Borgmann
114315994b
Limit the Rice parameter used for progressive decoding in ALS.
...
Originally committed as revision 21849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-16 14:48:01 +00:00
Thilo Borgmann
65760304bc
Reindent a line.
...
Originally committed as revision 21810 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-13 19:59:53 +00:00
Thilo Borgmann
25608328af
Support arithmetic decoding in ALS.
...
Originally committed as revision 21799 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-13 18:24:13 +00:00
Thilo Borgmann
8e14fbe89b
Remove unnecessary fields in ALSSpecificConfig.
...
Originally committed as revision 21583 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-01 09:53:37 +00:00
Thilo Borgmann
099809d19b
Reindent after last commit.
...
Originally committed as revision 21171 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 20:37:56 +00:00
Thilo Borgmann
ff9ea0b7cc
Replace variable length array with an allocated buffer
...
in the context to increase compatibility.
Originally committed as revision 21170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-12 20:35:22 +00:00
Thilo Borgmann
b2f4b04336
Change local variable type from unsigned int to int in order to
...
fix a fate test error for gcc 4.1.x introduced in revision 21069.
Originally committed as revision 21103 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-08 19:53:42 +00:00
Thilo Borgmann
e38215f2a4
Add multi-channel correlation support for ALS.
...
Originally committed as revision 21074 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 22:48:58 +00:00
Thilo Borgmann
99c5f5ccbe
Optimize short-term prediction by reducing index arithmetic.
...
Originally committed as revision 21069 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-07 22:23:28 +00:00
Thilo Borgmann
71fe4573bc
Replace array operator [] with direct access via pointer.
...
Solves issue 1657.
Originally committed as revision 21029 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-05 01:16:02 +00:00
Thilo Borgmann
1261b07f5f
Read and decode block data in separate functions to prepare support for
...
multi-channel correlation mode.
Originally committed as revision 20825 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-12-13 15:40:26 +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
25c4fddadc
Merge data tables from als_data.h with the decoder source to reduce
...
code complexity.
Originally committed as revision 20536 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-14 11:49:48 +00:00
Thilo Borgmann
93d38cf6b0
Add long-term prediction to the ALS decoder.
...
Originally committed as revision 20534 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-14 06:29:19 +00:00
Alex Converse
9349e5582c
Cosmetics: Re-indent
...
Originally committed as revision 20522 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-12 01:45:04 +00:00
Alex Converse
0bb622ba4d
Fix a __warn_memset_zero_len gcc-4.4 warning.
...
Originally committed as revision 20521 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-12 01:44:38 +00:00
Thilo Borgmann
99971952b0
Add MPEG-4 Audio Lossless Coding (ALS) decoder.
...
Patch by Thilo Borgmann, thilo D borgmann A googlemail
Originally committed as revision 20517 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-11 22:36:17 +00:00