summaryrefslogtreecommitdiffstats
path: root/libavcodec/resample.c
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-03-171-2/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: resample: allocate a large enough output buffer fate: fix enc_dec_pcm tests with remote target wmaenc: remove bit-exact hack FATE: remove WMA acodec tests FATE: add WMAv1 and WMAv2 encode/decode tests with fuzzy comparison FATE: add AC-3 and E-AC-3 encode/decode tests with fuzzy comparison qtrle: Use bytestream2 functions to prevent buffer overreads. vqavideo: check malloc return values x11grab: fix a memory leak exposed by valgrind threads: fix old frames returned after avcodec_flush_buffers() MPV: always mark dummy frames as reference h264: fix deadlocks on incomplete reference frame decoding. mpeg4: report frame decoding completion at ff_MPV_frame_end(). mimic: don't use self as reference, and report completion at end of decode(). Conflicts: libavcodec/h264.c libavcodec/qtrle.c libavcodec/resample.c libavcodec/vqavideo.c libavdevice/x11grab.c tests/ref/seek/wmav1_asf tests/ref/seek/wmav2_asf Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: allocate a large enough output bufferJustin Ruggles2012-03-171-2/+4
| | | | | | | | | | Fixes invalid writes and crashes when doing conversions such as stereo to 5.1 channels or sample rate conversion on 5.1 channels.
* | resample: Fix array sizeMichael Niedermayer2011-10-271-2/+2
| | | | | | | | | | Found-by: Jim Radford Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-10-261-1/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (22 commits) g722dec: check output buffer size before decoding g722dec: cosmetics: reindent/linewrap g722dec: remove the use of lowres for half-rate decoding. tta: check for extradata allocation failure in tta demuxer tta: check for allocation failure of decode_buffer tta: use correct frame_length calculation. tta: add support for decoding 24-bit sample format cosmetics: indentation tta: remove pointless braces tta: check output buffer size after adjusting frame length for last frame tta: fix reading of format in TTA header. tta: remove useless commented-out lines tta: check remaining bitstream size while reading unary value lavf: deprecate AVStream.stream_copy avconc: split choose_codec() to choose_decoder/choose_encoder. lavf: simplify by using FFMAX/FFMIN. mpegenc: add preload private option. cosmetics: simplify latm_decode_init latm: avoid unnecessary reinit of the aac decoder aacdec: initialize sbr context only in new channel elements ... Conflicts: avconv.c libavcodec/resample.c libavcodec/tta.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * resample: reject unhandled conversionsJanne Grunau2011-10-251-3/+4
| | | | | | | | audio_resample can not reduce the number of channels
| * resample: remove unused #defineJanne Grunau2011-10-251-1/+0
| |
* | resample: fix typo (ouput → output).Clément Bœsch2011-09-011-1/+1
| |
* | resample: fix set but unused variable (lfe) warning.Clément Bœsch2011-09-011-2/+2
| |
* | Merge remote-tracking branch 'qatar/master'Michael Niedermayer2011-06-211-2/+2
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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>
| * Replace usages of av_get_bits_per_sample_fmt() with av_get_bytes_per_sample().Justin Ruggles2011-06-201-2/+2
| | | | | | | | av_get_bits_per_sample_fmt() is deprecated.
* | resample: clarify supported resampling.Clément Bœsch2011-06-111-5/+24
| | | | | | | | This also fix a crash on 8ch → 2ch requested resampling.
* | add 5.1 to stereo downmix to resample.cjan gerber2011-05-231-1/+39
| | | | | | | | | | this is based on previous 6to2channel-resample.patch from ffmpeg2theora but updated to work with trunk and using av_clip_int16.
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-05-121-85/+91
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (32 commits) 10-bit H.264 x86 chroma v loopfilter asm Port SMPTE S302M audio decoder from FFmbc 0.3. [Copyright headers corrected] Fix crash of interlaced MPEG2 decoding h264pred: fix one more aliasing violation. doc/APIchanges: fill in missing hashes and dates. flacenc: use proper initializers for AVOption default values. lavc: deprecate named constants for deprecated antialias_algo. aac: workaround for compilation on cygwin swscale: extend YUV422p support to 10bits depth tiff: add support for inverted FillOrder for uncompressed data Remove unused softfloat implementation. h264pred: fix aliasing violations. rotozoom: Eliminate French variable name. rotozoom: Check return value of fread(). rotozoom: Return an error value instead of calling exit(). rotozoom: Make init_demo() return int and check for errors on invocation. rotozoom: Drop silly UINT8 typedef. rotozoom: Drop some unnecessary parentheses. rotozoom: K&R coding style cosmetics rtsp: Only do keepalive using GET_PARAMETER if the server supports it ... Conflicts: Changelog cmdutils.c doc/APIchanges doc/general.texi ffmpeg.c ffplay.c libavcodec/h264pred_template.c libavcodec/resample.c libavutil/pixfmt.h libavutil/softfloat.c libavutil/softfloat.h tests/rotozoom.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * cosmetics: Fix crazy formatting in resample.Alex Converse2011-05-101-48/+51
| |
| * Allow resampling with no channel count change for up to 8 channels.Alex Converse2011-05-101-43/+41
| |
| * Don't allow unsupported resampling configurations.Alex Converse2011-05-101-0/+5
| |
* | Merge remote branch 'qatar/master'Michael Niedermayer2011-04-201-11/+0
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * qatar/master: (37 commits) In avcodec_open(), set return code to an error value only when an error occurs instead of unconditionally at the start of the function. lavc: remove reference to opt.h from Makefile. prefer avio_check() over url_exist() avio: remove AVIO_* access symbols in favor of new AVIO_FLAG_* symbols lavu: remove misc disabled cruft lavu: remove FF_API_OLD_IMAGE_NAMES cruft NOT PULLED lavu: remove FF_API_OLD_EVAL_NAMES cruft lavc: remove misc disabled cruft. lavc: remove the FF_API_INOFFICIAL cruft. lavc: remove the FF_API_SET_STRING_OLD cruft. lavc: remove the FF_API_USE_LPC cruft. lavc: remove the FF_API_SUBTITLE_OLD cruft. lavc: remove the FF_API_VIDEO_OLD cruft. lavc: remove the FF_API_AUDIO_OLD cruft. lavc: remove the FF_API_OPT_SHOW cruft. lavc: remove the FF_API_MM_FLAGS cruft. lavf: remove misc disabled cruft. lavf: remove FF_API_INDEX_BUILT cruft lavf: remove FF_API_URL_CLASS cruft. lavf: remove FF_API_SYMVER cruft ... Merged-by: Michael Niedermayer <michaelni@gmx.at>
| * lavc: remove the FF_API_AUDIO_OLD cruft.Anton Khirnov2011-04-191-11/+0
| |
| * Replace FFmpeg with Libav in licence headersMans Rullgard2011-03-191-4/+4
| | | | | | | | Signed-off-by: Mans Rullgard <mans@mansr.com>
| * Merge libavcore into libavutilReinhard Tartler2011-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | 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>
* | Fix ticket21, temporary audio array was too small.Michael Niedermayer2011-04-091-1/+1
| | | | | | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* | Merge libavcore into libavutilReinhard Tartler2011-02-161-1/+1
|/ | | | Done to keep ABI compatible. Otherwise this is just silly
* Replace deprecated symbols SAMPLE_FMT_* with AV_SAMPLE_FMT_*, and enumStefano Sabatini2010-11-121-11/+11
| | | | | | SampleFormat with AVSampleFormat. Originally committed as revision 25730 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove usage of deprecated libavcodec/audioconvert.h functions.Stefano Sabatini2010-11-031-4/+5
| | | | Originally committed as revision 25668 to svn://svn.ffmpeg.org/ffmpeg/trunk
* add FF_API_AUDIO_OLD define to disable the deprecated decode_audio APIAurelien Jacobs2010-09-301-1/+1
| | | | Originally committed as revision 25270 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move AVOptions from libavcodec to libavutilMichael Niedermayer2010-09-261-1/+1
| | | | Originally committed as revision 25210 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add version to AVClass so we can add to and use fields of AVClass without ↵Michael Niedermayer2010-04-281-1/+1
| | | | | | ABI issues. Originally committed as revision 22987 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Remove explicit filename from Doxygen @file commands.Diego Biurrun2010-04-201-1/+1
| | | | | | | | 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
* Add const in cast. Removes warning:Baptiste Coudurier2009-06-111-1/+1
| | | | | | libavcodec/resample.c:215: warning: assignment discards qualifiers from pointer target type Originally committed as revision 19151 to svn://svn.ffmpeg.org/ffmpeg/trunk
* give s->resample_context to avoid segfault, avclass was movedBaptiste Coudurier2009-06-111-4/+4
| | | | Originally committed as revision 19150 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Move av_class to AVResampleContext instead of ReSampleContext.Benoit Fouet2009-03-231-2/+1
| | | | | | Fixes issue 852. Originally committed as revision 18170 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Prevent heap corruption when resampling 8-bit audio.Peter Ross2009-02-151-1/+1
| | | | Originally committed as revision 17311 to svn://svn.ffmpeg.org/ffmpeg/trunk
* extend resampling API, add S16 internal conversionBaptiste Coudurier2009-02-111-4/+129
| | | | Originally committed as revision 17163 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Use full internal pathname in doxygen @file directives.Diego Biurrun2009-02-011-1/+1
| | | | | | | 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
* cosmetics: Remove pointless period after copyright statement non-sentences.Diego Biurrun2009-01-191-1/+1
| | | | Originally committed as revision 16684 to svn://svn.ffmpeg.org/ffmpeg/trunk
* cosmetics: make all references to AC-3 capitalized and hyphenatedJustin Ruggles2008-08-031-1/+1
| | | | Originally committed as revision 14523 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Add missing '\n' to log format textAndreas Öman2007-12-151-2/+2
| | | | Originally committed as revision 11224 to svn://svn.ffmpeg.org/ffmpeg/trunk
* senseless cast and ()Michael Niedermayer2007-12-011-1/+1
| | | | Originally committed as revision 11118 to svn://svn.ffmpeg.org/ffmpeg/trunk
* stupid code (casting of void*) found by checktree.shMichael Niedermayer2007-12-011-3/+3
| | | | Originally committed as revision 11117 to svn://svn.ffmpeg.org/ffmpeg/trunk
* make output buffer larger so drift compensation can workMichael Niedermayer2007-08-061-1/+1
| | | | Originally committed as revision 9967 to svn://svn.ffmpeg.org/ffmpeg/trunk
* typo fixesDiego Biurrun2007-07-171-2/+2
| | | | Originally committed as revision 9719 to svn://svn.ffmpeg.org/ffmpeg/trunk
* set more reasonable cutoff for audio rate conversionMichael Niedermayer2007-03-221-1/+2
| | | | Originally committed as revision 8486 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Change license headers to say 'FFmpeg' instead of 'this program/this library'Diego Biurrun2006-10-071-4/+6
| | | | | | and fix GPL/LGPL version mismatches. Originally committed as revision 6577 to svn://svn.ffmpeg.org/ffmpeg/trunk
* Update licensing information: The FSF changed postal address.Diego Biurrun2006-01-121-1/+1
| | | | Originally committed as revision 4842 to svn://svn.ffmpeg.org/ffmpeg/trunk
* COSMETICS: tabs --> spaces, some prettyprintingDiego Biurrun2005-12-221-4/+4
| | | | Originally committed as revision 4764 to svn://svn.ffmpeg.org/ffmpeg/trunk
* COSMETICS: Remove all trailing whitespace.Diego Biurrun2005-12-171-6/+6
| | | | Originally committed as revision 4749 to svn://svn.ffmpeg.org/ffmpeg/trunk
* kill warnings patch by (Måns Rullgård <mru inprovide com>)Måns Rullgård2005-02-241-1/+0
| | | | Originally committed as revision 3977 to svn://svn.ffmpeg.org/ffmpeg/trunk
* user selectble cutoff frequencyMichael Niedermayer2004-10-211-1/+1
| | | | Originally committed as revision 3619 to svn://svn.ffmpeg.org/ffmpeg/trunk
* make most resample filter parameters selectable at runtimeMichael Niedermayer2004-10-211-1/+1
| | | | Originally committed as revision 3617 to svn://svn.ffmpeg.org/ffmpeg/trunk
* various resampling fixesMichael Niedermayer2004-06-301-1/+1
| | | | Originally committed as revision 3271 to svn://svn.ffmpeg.org/ffmpeg/trunk
OpenPOWER on IntegriCloud