summaryrefslogtreecommitdiff
path: root/libswresample/swresample.c
Commit message (Collapse)AuthorAgeFilesLines
* swr: support first_ptsMichael Niedermayer2013-01-211-1/+10
| | | | | Trolled-by: Daemon404 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix handling of timestamps that cause multiple drops or silence injectionsMichael Niedermayer2013-01-131-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: limit buffer size for silence injectionMichael Niedermayer2013-01-131-0/+7
| | | | | | This reduces memory usage for unreasonable large silence injections Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: limit buffer size for discarding.Michael Niedermayer2013-01-131-5/+8
| | | | | | | This prevents insane memory usage in case of insane input values. Untested due to lack of a testcase that causes such insane allocation Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: move silence buffer to context to avoid per use malloc/freeMichael Niedermayer2013-01-131-9/+8
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: move buffer used to discard sample to contextMichael Niedermayer2013-01-131-6/+5
| | | | | | | | This avoids the need to allocate & free to repeatly Fixes Ticket2122 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: check that allocation of in/out_convert succeededMichael Niedermayer2013-01-101-0/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: Use a temporary buffer for dither/Noise shaping when the input is read onlyMichael Niedermayer2013-01-101-14/+17
| | | | | | This avoids copying the input Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add seperate in/out pointers to the noise shaping codeMichael Niedermayer2013-01-101-4/+4
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: rename dither_pos to noise_posMichael Niedermayer2013-01-101-6/+6
| | | | | | THis more closely matches what the field represents Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix the noise sample type for noise shapingMichael Niedermayer2013-01-091-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: split swri_dither_init() outMichael Niedermayer2013-01-091-1/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: remove unused variableMichael Niedermayer2013-01-091-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: move dither related fields to their own contextMichael Niedermayer2013-01-091-24/+24
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: update copyright years of a few files iam working onMichael Niedermayer2013-01-091-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: Implement Noise shaping ditherMichael Niedermayer2013-01-091-13/+29
| | | | | | | | | | | | | | | The following variants are implemented: lipshitz noise shaping dither shibata noise shaping dither low shibata noise shaping dither high shibata noise shaping dither f-weighted noise shaping dither modified-e-weighted noise shaping dither improved-e-weighted noise shaping dither Data tables taken from SOX Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: use SIMD for ditheringMichael Niedermayer2013-01-091-3/+14
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix assertion failure if dither is used without the preout buffer ↵Michael Niedermayer2013-01-081-0/+5
| | | | | | differing from in Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lswr: Improve default resampler's default parametersAlexander Strasser2013-01-041-1/+1
| | | | | | | | | | | | | | After making some blind tests on a small collection of music samples for home usage. It turned out that the default cutoff was too low. The impact of filter_size was not clearly distinguishable (the results were on the edge) with the music samples but turned out to be clearly audible in some synthetic samples. Thanks to Daniel for helping out with the listening tests. Signed-off-by: Alexander Strasser <eclipse7@gmx.net>
* lswr: improve rematrixing error message.Nicolas George2012-12-311-1/+5
| | | | | Report channel layout/count for insufficiently determined rematrixing.
* docs: add soxr documentationRob Sykes2012-12-271-6/+8
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: support -async X as a simple way to do what ffmpeg -async X didMichael Niedermayer2012-12-251-0/+10
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: Add SOX resampler supportRob Sykes2012-12-111-2/+9
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add a lowpass default so that each Resampler can have its own default.Rob Sykes2012-12-111-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: move flush into ResamplerMichael Niedermayer2012-12-111-18/+6
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: make realloc_audio() available outside swresample.cMichael Niedermayer2012-12-111-11/+11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: Add API to make resample engine selectable.Rob Sykes2012-12-111-5/+43
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* lswr/swresample: use AV_OPT_TYPE_SAMPLE_FMT for sample format optionsStefano Sabatini2012-12-031-6/+6
| | | | Improve usability and robustness.
* swr: set default channel count options to 0.Clément Bœsch2012-11-191-4/+4
| | | | | | If not set, they will be defined using the channel layout setting, which is much more convenient when using swr_alloc() instead of swr_alloc_set_opts().
* Replace rest of libavutil/audioconvert.h with libavutil/channel_layout.hPaul B Mahol2012-11-131-1/+1
| | | | | | Also remove it in once case when it is not needed. Signed-off-by: Paul B Mahol <onemda@gmail.com>
* lswr/swresample: adopt globally consistent rules for options help messageStefano Sabatini2012-11-031-55/+62
| | | | | | | | | The help text tells what the option does, not what the accepted parameter is. Thus convert strings of the kind: Bikeshed Color to set bikeshed color
* swr: make sure the last data element is NULL so we can use it to detect the ↵Michael Niedermayer2012-09-241-0/+2
| | | | | | number of channels Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add av_cold to init/free functionsMichael Niedermayer2012-09-091-3/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Add Dolby/DPLII downmix support to libswresampleMichael Niedermayer2012-09-071-0/+4
| | | | | | Based on code by John Stebbins <jstebbins.hb@gmail.com> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-051-22/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'Michael Niedermayer2012-09-051-2/+2
| | | | | | | | | | | | * commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078': avopt: Store defaults for AV_OPT_TYPE_FLAGS in the i64 union member Conflicts: libavcodec/libvpxenc.c libavcodec/options_table.h libavfilter/vf_drawtext.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge commit '124134e42455763b28cc346fed1d07017a76e84e'Michael Niedermayer2012-09-051-7/+7
| | | | | | | | | | | | | | | | | | | | * commit '124134e42455763b28cc346fed1d07017a76e84e': avopt: Store defaults for AV_OPT_TYPE_CONST in the i64 union member Conflicts: libavcodec/aacenc.c libavcodec/libopenjpegenc.c libavcodec/options_table.h libavdevice/bktr.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/vf_drawtext.c libavformat/movenc.c libavformat/options_table.h libavutil/opt.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-08-241-4/+4
| | | | | | | | | | | | | | | * qatar/master: utvideodec: Fix single symbol mode decoding truespeech: drop useless casts libavcodec: drop bogus dependencies from mpc[78] and qdm2 mpegaudio: move ff_mpa_enwindow to a separate file AVOptions: store defaults for INT64 options in int64 union member. Conflicts: libavcodec/Makefile libavfilter/af_asyncts.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix 10l typo mixing in and out config.Michael Niedermayer2012-08-011-1/+1
| | | | | | Fixes ticket1458 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: resampling: add filter type and Kaiser window beta to AVOptionsJustin Ruggles2012-07-231-1/+6
|
* lswr: channel_map requires input conversion.Nicolas George2012-07-171-1/+1
| | | | | | | | channel_map is applied between in and postin. Without this test, if the input format is an acceptable internal format, the in->postin conversion is skipped. In the best case, it ignores channel_map, in the worst case it causes an assert failure if the number of channels is changed by the map.
* lavu: 256 color supportPaul B Mahol2012-07-071-0/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* swresample: make .class_name more descriptivePaul B Mahol2012-06-221-1/+1
| | | | Signed-off-by: Paul B Mahol <onemda@gmail.com>
* swresample.c: update copyleft yearMichael Niedermayer2012-06-121-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: zero buffers on allocationMichael Niedermayer2012-06-091-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix a few typo.Clément Bœsch2012-06-011-3/+3
|
* Merge remote-tracking branch 'qatar/master'Michael Niedermayer2012-05-301-2/+3
| | | | | | | | | | | | | | | | | * qatar/master: avconv: extend -r to work on any input stream. doc/avconv: expand documentation for the -s option. avconv: don't print filters inserted by avconv in stream mappings. avconv: merge configuration code for complex and simple filters avconv: split configuring input filters out of configure_complex_filter Conflicts: configure doc/ffmpeg.texi ffmpeg.c tests/ref/fate/idroq-video-encode Merged-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix swr_drop_output()Michael Niedermayer2012-05-261-0/+1
| | | | | | Fixes part of Ticket1341 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: check return value of swr_inject_silence/drop_output.Michael Niedermayer2012-05-221-2/+6
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: check count argument of realloc_audio()Michael Niedermayer2012-05-221-0/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
View Lorry Controller Status