Commit Graph

60 Commits

Author SHA1 Message Date
Michael Niedermayer
55c49afc42 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  yuv4mpeg: return proper error codes.
  Give all anonymously typedeffed structs in headers a name
  fate: Add parseutils test
  parseutils-test: Drop random colors from parsing test
  vf_pad/scale: use double precision for aspect ratios.
  build: error on variable-length arrays
  ppc: swscale: rework yuv2planeX_altivec()
  ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec()
  x86: dsputil: kill VLA in gmc_mmx()
  libspeexenc: Updated commentary to reflect recent changes
  libspeexenc: Add an option for enabling DTX
  doc/APIchanges: fill in missing dates and hashes.
  lavr: bump major to 1 and declare it stable.
  lavr: change the type of the data buffers to uint8_t**.
  lavc: deprecate the audio resampling API.

Conflicts:
	cmdutils.h
	configure
	doc/APIchanges
	ffplay.c
	libavcodec/dwt.h
	libavcodec/libspeexenc.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavformat/asf.h
	tests/fate/libavutil.mak
	tests/ref/fate/parseutils

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-06 13:45:08 +02:00
Anton Khirnov
30223b3bf2 lavc: deprecate the audio resampling API.
It has been superseded by lavr.
2012-10-05 13:47:56 +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
Michael Niedermayer
2ceaffc627 resample2: use av_assert()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-02 20:52:22 +02:00
Michael Niedermayer
8bc7fe4daf Merge remote-tracking branch 'qatar/master'
* qatar/master:
  doxygen: misc consistency, spelling and wording fixes
  vcr1: drop unnecessary emms_c() calls without MMX code
  Replace all uses of av_close_input_file() with avformat_close_input().
  lavf: add avformat_close_input().
  lavf: deprecate av_close_input_stream().
  lavf doxy: add some basic demuxing documentation.
  lavf doxy: add some general lavf information.
  lavf doxy: add misc utility functions to a group.
  lavf doxy: add av_guess_codec/format to the encoding group.
  lavf doxy: add core functions to a doxy group.
  Add basic libavdevice documentation.
  lavc: convert error_recognition to err_recognition.
  avconv: update -map option help text
  x86: Require 7 registers for the cabac asm
  x86: bswap: remove test for bswap instruction
  bswap: make generic implementation more compiler-friendly
  h264: remove useless cast
  proresdec: fix decode_slice() prototype

Conflicts:
	configure
	doc/APIchanges
	ffprobe.c
	libavcodec/avcodec.h
	libavcodec/celp_math.h
	libavcodec/h264.c
	libavfilter/src_movie.c
	libavformat/anm.c
	libavformat/avformat.h
	libavformat/version.h
	libavutil/avstring.h
	libavutil/bswap.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-12-13 00:39:48 +01:00
Diego Biurrun
58c42af722 doxygen: misc consistency, spelling and wording fixes 2011-12-12 23:06:23 +01:00
Michael Niedermayer
1b9ca38d9d resample2: fix potential overflow
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-27 14:34:45 +02:00
Michael Niedermayer
a67cb012e6 resample: Fix overflow
Found-by: Jim Radford
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-27 14:31:53 +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
Måns Rullgård
080ce9071d resample: replace VLA with malloc/free
Originally committed as revision 24142 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 16:05:58 +00:00
Måns Rullgård
a426016cfc resample: check memory allocations in av_resample_init()
Originally committed as revision 24141 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-07-09 16:05:52 +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
Carl Eugen Hoyos
a882cf9c21 Make av_build_filter static (and remove av_): It is not used outside resample2.c.
Originally committed as revision 22118 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-02-28 19:58:26 +00:00
Michael Niedermayer
2efcf29275 Stop the approximation in bessel() once it does no longer improve.
This is faster.

Originally committed as revision 21038 to svn://svn.ffmpeg.org/ffmpeg/trunk
2010-01-06 22:40:52 +00:00
Benoit Fouet
6d69a653d8 Move av_class to AVResampleContext instead of ReSampleContext.
Fixes issue 852.

Originally committed as revision 18170 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-03-23 10:58:05 +00:00
Michael Niedermayer
3136fcf45e Move doxy for public resample2 functions to the public header.
Originally committed as revision 17099 to svn://svn.ffmpeg.org/ffmpeg/trunk
2009-02-09 15:31:08 +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
Diego Biurrun
ca74c0a180 cosmetics: Fix two common typos: wont --> will not, lets --> let us.
Originally committed as revision 14372 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-07-24 17:09:28 +00:00
Diego Biurrun
d952638699 typo: occured --> occurred
Originally committed as revision 12549 to svn://svn.ffmpeg.org/ffmpeg/trunk
2008-03-22 01:06:57 +00:00
Aurelien Jacobs
aee481cebe use av_clip_int16() where it makes sense
Originally committed as revision 10078 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-08-11 22:48:55 +00:00
Diego Biurrun
e5a389a1b7 license header consistency cosmetics
Originally committed as revision 9484 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-07-05 10:40:25 +00:00
Diego Biurrun
90b5b51eab misc typo fixes
Originally committed as revision 9291 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-06-12 18:50:50 +00:00
Diego Biurrun
2029f312e8 Remove redundant #inclusion of common.h, avcodec.h already #includes it.
Originally committed as revision 8967 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-05-10 09:00:44 +00:00
Diego Biurrun
0339fab8fc Remove unused variable.
Originally committed as revision 8681 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-04-08 13:02:25 +00:00
Michael Niedermayer
7e068841cb replace long double in the audiophile kiddy mode with doubles, its faster (and more portable) and the audiophile placebo 120db stopband attenuation isnt affected
Originally committed as revision 8482 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-22 11:23:38 +00:00
Michael Niedermayer
d6fead9089 change high precision mode to 30 bits again after making the code less overflow sensitive
Originally committed as revision 8481 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-22 11:13:13 +00:00
Michael Niedermayer
303bd95cd2 optimize linear filter coeff interpolation code, this also makes the code less prone to overflows
Originally committed as revision 8480 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-22 11:10:30 +00:00
Michael Niedermayer
447caf7941 revert r8469 (increase bits for non default highprecision mode)
it causes overflows with linear interpolated filters coefficients

Originally committed as revision 8476 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-22 03:18:34 +00:00
Michael Niedermayer
55fc0eb174 AUDIOPHILE_KIDDY_MODE
Originally committed as revision 8475 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-22 03:16:02 +00:00
Michael Niedermayer
50df67d3b5 optimize bessel function instead of trusting gcc to do trivial optimizations (as gcc doesnt ...)
Originally committed as revision 8474 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-22 00:52:49 +00:00
Michael Niedermayer
14f887efc6 select more sensible default windows (= attenuation beyond the dynamic range of your input is silly if it negatively affects other parameters)
Originally committed as revision 8473 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-22 00:16:41 +00:00
Michael Niedermayer
20cf58c32b make kaiser windows with other beta than 16 available
Originally committed as revision 8472 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 23:44:49 +00:00
Michael Niedermayer
c252b26d55 make high precision mode accessible at compile time
Originally committed as revision 8470 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 22:39:00 +00:00
Michael Niedermayer
ca6940f871 increase bits for non default highprecision mode
Originally committed as revision 8469 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 22:38:07 +00:00
Michael Niedermayer
ae232dd740 code for testing the accuracy of the resampler
Originally committed as revision 8468 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 22:37:05 +00:00
Michael Niedermayer
66a148a19a remove dithering of filter coefficients, improves precision by 1-2 bits and
improves subjective sound quality on artificial sample (udial.wav resampling
to 32khz)

Originally committed as revision 8467 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-03-21 22:02:52 +00:00
Reimar Döffinger
f66e4f5f9e Add av_ prefix to clip functions
Originally committed as revision 8122 to svn://svn.ffmpeg.org/ffmpeg/trunk
2007-02-25 10:27:12 +00:00
Diego Biurrun
c26abfa541 Rename ABS macro to FFABS.
Originally committed as revision 6666 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-11 23:17:58 +00:00
Diego Biurrun
b78e7197a8 Change license headers to say 'FFmpeg' instead of 'this program/this library'
and fix GPL/LGPL version mismatches.

Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-10-07 15:30:46 +00:00
Stefan Huehner
7b49ce2e34 Add const to (mostly) char* and make some functions static, which aren't used
outside their declaring source file and which have no corresponding prototype.
patch by Stefan Huehner stefan^^@^^huehner^^.^^org

Originally committed as revision 5497 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-06-18 11:33:14 +00:00
Diego Biurrun
5509bffa88 Update licensing information: The FSF changed postal address.
Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
2006-01-12 22:43:26 +00:00
Diego Biurrun
115329f160 COSMETICS: Remove all trailing whitespace.
Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-12-17 18:14:38 +00:00
Wolfram Gloger
f0ff20a197 minor fixes for invalid audio data patch by (Wolfram Gloger: wmglo, dent med uni-muenchen de)
Originally committed as revision 4524 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-08-14 16:37:29 +00:00
Kurosu
f41c1fac3c av_malloc vs av_mallocz patch by (Kurosu <kurosu inforezo org>)
Originally committed as revision 3830 to svn://svn.ffmpeg.org/ffmpeg/trunk
2005-01-12 18:25:48 +00:00
Michael Niedermayer
53f0090dcc faster and slightly less accurate nearest neighbor resampler
Originally committed as revision 3789 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-31 17:37:23 +00:00
Michael Niedermayer
6cb5dcb392 special case for filter_length==1
Originally committed as revision 3787 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-12-31 12:58:46 +00:00
Michael Niedermayer
788d7a8cac av_resample_compensate() doxy
Originally committed as revision 3671 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-11-12 02:05:26 +00:00
Michael Niedermayer
6e225de2fe user selectble cutoff frequency
Originally committed as revision 3619 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-21 21:07:40 +00:00
Michael Niedermayer
4e255822e5 100l (dont reset the sample position at the block end)
Originally committed as revision 3618 to svn://svn.ffmpeg.org/ffmpeg/trunk
2004-10-21 20:01:32 +00:00