Michael Niedermayer
487e088e5e
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
mpc8: check output buffer size before decoding
mpc7: return error if packet is too small.
mpc7: check output buffer size before decoding
nellymoserdec: allocate float_buf only when decoding to int16
nellymoserdec: use NELLY_BUF_LEN instead of 128
nellymoserdec: use NELLY_BLOCK_LEN instead of 64 when appropriate.
nellymoserdec: allow user to request SAMPLE_FMT_FLT for output samples.
nellymoser: check output buffer size before decoding
win32: improve threading algorithm warning
Conflicts:
libavcodec/nellymoserdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-03 01:02:45 +02:00
Justin Ruggles
fac6b7f9f2
nellymoserdec: allocate float_buf only when decoding to int16
2011-10-02 10:19:04 -04:00
Justin Ruggles
32b484464c
nellymoserdec: use NELLY_BUF_LEN instead of 128
2011-10-02 10:19:04 -04:00
Justin Ruggles
ded0800d44
nellymoserdec: use NELLY_BLOCK_LEN instead of 64 when appropriate.
2011-10-02 10:19:04 -04:00
Justin Ruggles
84464b2e7f
nellymoserdec: allow user to request SAMPLE_FMT_FLT for output samples.
2011-10-02 10:19:04 -04:00
Justin Ruggles
8b31c086b6
nellymoser: check output buffer size before decoding
2011-10-02 10:19:04 -04:00
Laurent Aimar
741ec30bd2
Check output buffer size in nellymoser decoder.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-22 00:42:28 +02:00
Anton Khirnov
ec6402b7c5
lavc: use designated initialisers for all codecs.
...
It's more readable and less prone to breakage.
2011-07-29 08:42:34 +02:00
Vitor Sessak
9d35fa520e
Add AVX FFT implementation.
...
Signed-off-by: Reinhard Tartler <siretart@tauware.de>
2011-04-26 18:25:24 +02:00
Mans Rullgard
4538729afe
Move sine windows to a separate file
...
These windows do not really belong in fft/mdct files and were
easily confused with the similarly named tables used by rdft.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-20 13:25:19 +00:00
Mans Rullgard
26f548bb59
fft: remove inline wrappers for function pointers
...
This removes the rather pointless wrappers (one not even inline)
for calling the fft_calc and related function pointers.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-03-19 19:49:18 +00: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
Justin Ruggles
c73d99e672
Separate format conversion DSP functions from DSPContext.
...
This will be beneficial for use with the audio conversion API without
requiring it to depend on all of dsputil.
Signed-off-by: Mans Rullgard <mans@mansr.com>
2011-02-02 02:44:53 +00:00
Justin Ruggles
b5ec638343
cosmetics: indentation and spacing
2011-01-28 00:21:46 +00:00
Justin Ruggles
9d06d7bce3
Remove the add bias hack for the C version of DSPContext.float_to_int16_*().
2011-01-28 00:07:35 +00: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
Stefano Sabatini
63e8d9760f
Use the new libavcore audio channel API.
...
This also allows to remove a linking dependency of libavfilter on
libavcodec.
Originally committed as revision 25789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-11-21 20:06:22 +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
Martin Storsjö
caea217d37
nellymoserdec: Increase the log level of messages when failing to decode data
...
Originally committed as revision 23606 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 14:09:00 +00:00
Martin Storsjö
133cd270f8
Reindent
...
Originally committed as revision 23605 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 14:07:22 +00:00
Martin Storsjö
c5d68fbd49
nellymoserdec: Simplify calculation of numbers of blocks
...
Originally committed as revision 23604 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 14:06:38 +00:00
Martin Storsjö
f1a12c76cf
Reindent
...
Originally committed as revision 23603 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 12:35:28 +00:00
Martin Storsjö
f7a30c0baa
nellymoserdec: Allow using unusual input block sizes
...
Originally committed as revision 23602 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-06-14 12:34:55 +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
Måns Rullgård
1429224b04
Move FFT parts from dsputil.h to fft.h
...
Originally committed as revision 22235 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 14:34:46 +00:00
Måns Rullgård
84dc2d8afa
Remove DECLARE_ALIGNED_{8,16} macros
...
These macros are redundant. All uses are replaced with the generic
DECLARE_ALIGNED macro instead.
Originally committed as revision 22233 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-03-06 14:24:59 +00:00
Måns Rullgård
c67278098d
Move array specifiers outside DECLARE_ALIGNED() invocations
...
Originally committed as revision 21377 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-22 03:25:11 +00:00
Reimar Döffinger
14b8607065
Add support for hard-coded MDCT-related ff_sine_windows tables.
...
Originally committed as revision 21108 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-09 13:28:04 +00:00
Måns Rullgård
b8cef7be5c
nellymoser: use constant seed for dithering RNG
...
Originally committed as revision 20658 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-11-29 15:15:53 +00:00
Måns Rullgård
01b2214758
Merge FFTContext and MDCTContext
...
Originally committed as revision 19931 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-09-20 17:30:20 +00:00
Siarhei Siamashka
7d485f165f
Support for getting (i)MDCT output multiplied by a constant scaling factor.
...
Scaling (i)MDCT output has no runtime overhead and can be used to improve
performance of audio codecs. All the changes are only needed in
'ff_mdct_init' function and slow down initialization a bit.
Originally committed as revision 18855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-16 14:17:08 +00:00
David Conrad
0a8dedc9e1
Use skip_bits_long() for large skips
...
This fixes ogg/theora on ARM (more generally the A32 bitstream reader)
Originally committed as revision 18819 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-14 00:02:07 +00:00
Alexander Chemeris
c67d725589
Support 16K samplerate in Nellymoser.
...
patch by Alexander Chemeris, ipse.ffmpeg gmail.com
Originally committed as revision 18798 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-05-11 19:21:49 +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
Thilo Borgmann
7a00bbad21
Implement avcodec_decode_video2(), _audio3() and _subtitle2() which takes an
...
AVPacket argument rather than a const uint8_t *buf + int buf_size. This allows
passing of packet-specific flags from demuxer to decoder, such as the keyframe
flag, which appears necessary to playback corePNG P-frames.
Patch by Thilo Borgmann thilo.borgmann googlemail com, see also the thread
"Google Summer of Code participation" on the mailinglist.
Originally committed as revision 18351 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-04-07 15:59:50 +00:00
Benjamin Larsson
3b0b84797e
Get rid of av_random in nellymoserdec.c
...
Originally committed as revision 18078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-20 21:15:02 +00:00
Diego Biurrun
bad5537e2c
Use full internal pathname in doxygen @file directives.
...
Otherwise doxygen complains about ambiguous filenames when files exist
under the same name in different subdirectories.
Originally committed as revision 16912 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-01 02:00:19 +00:00
Stefano Sabatini
9c868219e9
Replace calls to the deprecated function av_init_random() with
...
corresponding calls to av_random_init().
Originally committed as revision 16682 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-18 23:04:33 +00:00
Vitor Sessak
8a569fee99
Use shared sine window instead of defining another one.
...
Originally committed as revision 16657 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-01-17 20:06:08 +00:00
Benjamin Larsson
31d5113a15
Set channel_layout
...
Originally committed as revision 15843 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-11-16 09:54:09 +00:00
Loren Merritt
d46ac5bfde
mdct wrapper function to match fft
...
Originally committed as revision 14703 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:38:30 +00:00
Loren Merritt
0a570e826d
remove mdct tmp buffer
...
Originally committed as revision 14702 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-12 00:36:36 +00:00
Peter Ross
fd76c37fd9
Modify all codecs to report their supported input and output sample format(s).
...
Originally committed as revision 14482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-31 10:47:31 +00:00
Benjamin Larsson
20455a335b
Reduce the loglevel on a log message in the Nellymoser decoder. Related to Roundup 447.
...
Originally committed as revision 14348 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-23 12:21:56 +00:00
Diego Biurrun
f1e3c9368b
Remove unused variable, fixes the warning:
...
libavcodec/nellymoserdec.c:133: warning: unused variable ‘i’
Originally committed as revision 14071 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-05 07:28:35 +00:00
Robert Swain
9146e4d61c
Add generic ff_sine_window_init function and implement in codecs appropriately
...
Originally committed as revision 13888 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-22 15:12:27 +00:00
Stefano Sabatini
fe4bf37455
Make AVCodec long_names definition conditional depending on CONFIG_SMALL.
...
Originally committed as revision 13759 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-12 21:50:13 +00:00
Bartlomiej Wolowiec
681f5c1271
Separating from nellymoserdec.c parts required by encoder
...
Originally committed as revision 13713 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-08 20:45:18 +00:00
Diego Biurrun
245976da2a
Use full path for #includes from another directory.
...
Originally committed as revision 13098 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-09 11:56:36 +00:00
Michael Niedermayer
3df9ce75b5
Move declaration a little.
...
Originally committed as revision 13049 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-03 17:28:25 +00:00
Michael Niedermayer
8f51f55564
Setting i to 0 once should do.
...
Originally committed as revision 13048 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-03 17:26:13 +00:00
Benjamin Larsson
c401efdefe
Long name spelling fixes
...
Originally committed as revision 13038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-02 22:58:16 +00:00
Diego Pettenò
53e85f5fa4
Mark symbol as static, patch by Diego 'Flameeyes' Pettenò, flameeyes gmail com.
...
Originally committed as revision 13027 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-01 15:20:57 +00:00
Stefano Sabatini
d5202e4fda
Add long names to many AVCodec declarations.
...
patch by Stefano Sabatini, stefano.sabatini-lala poste it
Originally committed as revision 13005 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-27 10:52:44 +00:00
Michael Niedermayer
efe6079d2d
unused
...
Originally committed as revision 12859 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 15:33:30 +00:00
Michael Niedermayer
3d00125645
cosmetic
...
Originally committed as revision 12858 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 15:33:09 +00:00
Michael Niedermayer
a1b914b20d
Move the *-1 to a more sane place as well.
...
Originally committed as revision 12857 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 15:30:04 +00:00
Michael Niedermayer
5d32325a7b
Move scale_bias to a more sane place. I am starting to wonder how this
...
trash got into svn ...
Originally committed as revision 12856 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 15:28:11 +00:00
Michael Niedermayer
687550d35e
simplify
...
Originally committed as revision 12855 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 15:03:07 +00:00
Michael Niedermayer
5c65660506
Avoid reverse addressing, not sure if this is faster or slower but people
...
maybe are confused by it. The code needs to be optimized anyway.
Originally committed as revision 12854 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 14:59:23 +00:00
Michael Niedermayer
2f75d26c10
commutative law based cleanup
...
Originally committed as revision 12853 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 14:55:11 +00:00
Michael Niedermayer
dcafb28d01
do the -1 outside of the transform
...
Originally committed as revision 12852 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 14:49:10 +00:00
Michael Niedermayer
6fab025d30
normalize signs
...
Originally committed as revision 12851 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 14:46:25 +00:00
Michael Niedermayer
115682e598
100l lost add_bias
...
Originally committed as revision 12849 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 13:29:35 +00:00
Michael Niedermayer
e616c6d612
simplify transform
...
Originally committed as revision 12848 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-04-16 13:28:13 +00:00
Zuxy Meng
98a6fff98c
Apply 'cold' attribute to init/uninit functions in libavcodec
...
Originally committed as revision 12525 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-21 03:11:20 +00:00
Michael Niedermayer
7993df6527
consts
...
I have underestimated this a little, and these are just some ...
Originally committed as revision 11708 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-02-01 03:26:31 +00:00
Benjamin Larsson
289987e454
Use memcpy instead of for loop
...
Originally committed as revision 11051 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-18 10:54:38 +00:00
Benjamin Larsson
2b992d0e88
Small simplification
...
Originally committed as revision 11026 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-14 16:33:14 +00:00
Alex Beregszaszi
8e1b957cd4
Support 44.1kHz audio. Acked by Benjamin
...
Originally committed as revision 11024 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-14 15:31:47 +00:00
Alex Beregszaszi
8ef4de4e11
Change the "report sample" message from AV_LOG_DEBUG to AV_LOG_ERROR.
...
Acked by Benjamin Larsson
Originally committed as revision 11023 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-14 15:30:15 +00:00
Alex Beregszaszi
b64fa5b426
Make sine_window static. Acked by Benjamin Larsson
...
Originally committed as revision 11022 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-14 15:21:42 +00:00
Stefano Sabatini
5b0b5ecf60
Fix nellymoser decode_tag return value, patch by Stefano Sabatini
...
Originally committed as revision 11018 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-14 08:22:15 +00:00
Benjamin Larsson
f83579b1a6
Remove unused variable
...
Originally committed as revision 10922 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-04 10:27:32 +00:00
Fabrice Bellard
eb1c687b1b
Use the ffmpeg mdct function, patch by Fabrice Bellard. Thread: [FFmpeg-devel] NellyMoser transform bug, 10/25/2007 12:24 PM
...
Originally committed as revision 10909 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-11-03 14:34:25 +00:00
Benjamin Larsson
ff4b050ab4
Unaligned memory access rcrash fix
...
Originally committed as revision 10781 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-18 15:16:07 +00:00
Benjamin Larsson
636b13c5fc
Nellymoser ASAO decoder
...
Originally committed as revision 10741 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-10-15 16:26:02 +00:00