1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-07 11:13:41 +02:00
Commit Graph

29 Commits

Author SHA1 Message Date
Michael Niedermayer
b5abebe164 acelp_filters: switch to avassert
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-18 05:02:08 +02:00
Michael Niedermayer
c581cb4e4f Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Fix even more missing includes after the common.h removal
  build: Factor out rangecoder dependencies to CONFIG_RANGECODER
  build: Factor out error resilience dependencies to CONFIG_ERROR_RESILIENCE
  x86: avcodec: Consistently name all init files
  Add more missing includes after removing the implicit common.h
  Add some more missing includes after removing the implicit common.h
  Don't include common.h from avutil.h
  rtmp: Automatically compute the hash for SWFVerification

Conflicts:
	configure
	doc/APIchanges
	doc/examples/decoding_encoding.c
	libavcodec/Makefile
	libavcodec/assdec.c
	libavcodec/audio_frame_queue.c
	libavcodec/avpacket.c
	libavcodec/dv_profile.c
	libavcodec/dwt.c
	libavcodec/libtheoraenc.c
	libavcodec/rawdec.c
	libavcodec/rv40dsp.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/v210dec.h
	libavcodec/vc1dsp.c
	libavcodec/x86/Makefile
	libavfilter/asrc_anullsrc.c
	libavfilter/avfilter.c
	libavfilter/buffer.c
	libavfilter/formats.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_select.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/version.h
	libavutil/audioconvert.c
	libavutil/error.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-08-16 16:20:30 +02:00
Martin Storsjö
1d9c2dc89a Don't include common.h from avutil.h
Signed-off-by: Martin Storsjö <martin@martin.st>
2012-08-15 22:32:06 +03:00
Nedeljko Babic
3827a86eac Optimization of AMR NB and WB decoders for MIPS
AMR NB and WB decoders are optimized for MIPS architecture.
Appropriate Makefiles are changed accordingly.

Cnfigure script is changed in order to support optimizations.
 Optimizations are enabled by default when compiling is done for
  mips architecture.
 Appropriate cflags are automatically set.
 Support for several mips CPUs is added in configure script.

New ffmpeg options are added for disabling optimizations.

The FFMPEG option --disable-mipsfpu disables MIPS floating point
 optimizations.
The FFMPEG option --disable-mips32r2 disables MIPS32R2
 optimizations.
The FFMPEG option --disable-mipsdspr1 disables MIPS DSP ASE R1
 optimizations.
The FFMPEG option --disable-mipsdspr2 disables MIPS DSP ASE R2
 optimizations.

Signed-off-by: Nedeljko Babic <nbabic@mips.com>
Reviewed-by: Vitor Sessak <vitor1001@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-11 21:12:39 +02:00
Michael Niedermayer
c065255bba Merge remote-tracking branch 'qatar/master'
* qatar/master:
  aacenc: Fix LONG_START windowing.
  aacenc: Fix a bug where deinterleaved samples were stored in the wrong place.
  avplay: use the correct array size for stride.
  lavc: extend doxy for avcodec_alloc_context3().
  APIchanges: mention avcodec_alloc_context()/2/3
  avcodec_align_dimensions2: set only 4 linesizes, not AV_NUM_DATA_POINTERS.
  aacsbr: ARM NEON optimised sbrdsp functions
  aacsbr: align some arrays
  aacsbr: move some simdable loops to function pointers
  cosmetics: Remove extra newlines at EOF

Conflicts:
	libavcodec/utils.c
	libavfilter/formats.c
	libavutil/mem.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-29 00:34:59 +01:00
Alex Converse
7181c4edee cosmetics: Remove extra newlines at EOF 2012-01-27 17:19:09 -08: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
Ronald S. Bultje
8955a9d79c Split input/output data arguments to ff_acelp_apply_order_2_transfer_function().
Originally committed as revision 22933 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-04-21 17:45:24 +00:00
Carl Eugen Hoyos
3b3a676a13 10l: Fix forgotten variable rename from r14893 (fixes issue 1675).
Originally committed as revision 21135 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-11 10:54:59 +00:00
Vitor Sessak
504eee37de Commit some functions that are used by both SIPR and AMR.
Based on AMR SoC code by Robert Swain and Colin McQuillan.

Originally committed as revision 20392 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-10-27 23:53:18 +00:00
Colin McQuillan
bb937155ec Add a function that can apply an order 2 rational transfer function in-place.
This function will be used in the upcoming AMR-NB floating point decoder for
high-pass filtering.

Patch by Colin McQuillan ( m.niloc googlemail com )

Originally committed as revision 19649 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-08-15 11:22:55 +00:00
Diego Biurrun
51222d1041 cosmetics: K&R style reformatting
Originally committed as revision 19088 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-06-04 10:37:29 +00:00
Kenan Gillet
4599d22c0c Split off celp_filters.[ch] from acelp_filters.[ch] for the QCELP decoder.
patch by Kenan Gillet, kenan.gillet gmail com

Originally committed as revision 15680 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-10-24 21:29:23 +00:00
Vladimir Voroshilov
f5e177f852 (cosmetics) Describe for which tests clipping is required.
Originally committed as revision 14979 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 16:47:31 +00:00
Vladimir Voroshilov
1b8a36d728 (cosmetics) Remove wrong comments.
Originally committed as revision 14977 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-26 16:41:23 +00:00
Michael Niedermayer
2ad0d96a24 Replace cliping in ff_acelp_interpolate() by a check&av_log, this should be the
quickest way to find out if it is needed.

Originally committed as revision 14970 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-25 22:51:47 +00:00
Michael Niedermayer
70d3ba4194 Remove mathops.h dependancy.
Originally committed as revision 14897 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:25:41 +00:00
Michael Niedermayer
1f08308249 vertical align
Originally committed as revision 14896 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:23:01 +00:00
Michael Niedermayer
cd523888f3 Remove ff_acelp_weighted_filter() which is just a function wrapping a 1
line loop.

Originally committed as revision 14895 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 23:22:11 +00:00
Michael Niedermayer
5038ecb1f1 Rename subframe_size to a name that is not specific to some specific use
of ff_acelp_convolve_circ()

Originally committed as revision 14894 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 22:41:20 +00:00
Michael Niedermayer
2bbd3434bc rename pitch_delay_frac in ff_acelp_interpolate()
Originally committed as revision 14893 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 22:36:32 +00:00
Michael Niedermayer
fee37a4985 Document code, do not document difference to a irrelevant reference implementation.
Originally committed as revision 14885 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 21:33:31 +00:00
Michael Niedermayer
012fd207a3 Remove some irrelevant comments.
Originally committed as revision 14884 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-08-21 21:31:03 +00:00
Vitor Sessak
0bbab5671d Typo in a comment: s/two avoid/to avoid/
Originally committed as revision 14090 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-06 10:49:28 +00:00
Vitor Sessak
fe4a5b185f Make ff_acelp_lp_synthesis_filter() receives a pointer to the actual filter coefficients and not the pointer minus one
Originally committed as revision 14031 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-29 21:37:03 +00:00
Vitor Sessak
8a1c868ee6 Add a rounding parameter to ff_acelp_lp_synthesis_filter()
Originally committed as revision 14028 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-06-29 11:19:50 +00:00
Vladimir Voroshilov
d347a046e2 Move pitch vector interpolation code to acelp_filters
and convert it to a generic interpolation routine.

Originally committed as revision 13284 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-24 17:18:42 +00:00
Vladimir Voroshilov
542c064d1b Update comment to version, negotiated with Diego, and
fix missing period (not latest revision of patch
was wrongly committed).

Originally committed as revision 13113 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-11 10:07:11 +00:00
Vladimir Voroshilov
a52000f291 various filters for ACELP-based codecs
Originally committed as revision 13110 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-05-11 03:42:53 +00:00