aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/swresample.c
Commit message (Collapse)AuthorAgeFilesLines
...
* 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>
* swr: skip soft compensation when its disabled.Michael Niedermayer2012-05-191-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add swr_next_pts()Michael Niedermayer2012-05-191-1/+42
| | | | | | parameter descriptions partly reuse text from af_asyncts Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add swr_drop_output()Michael Niedermayer2012-05-191-0/+31
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add swr_inject_silence()Michael Niedermayer2012-05-191-0/+24
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: Fix issue with injecting more data than can be used up in the next call.Michael Niedermayer2012-05-191-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add some asserts to resample()Michael Niedermayer2012-05-191-0/+4
| | | | | | These check that the internal and input buffers match in format Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add reversefill_audiodata()Michael Niedermayer2012-05-191-0/+10
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fix buf_set() so it works with input == outputMichael Niedermayer2012-05-191-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: make literal 32 a named constant in realloc_audio()Michael Niedermayer2012-05-191-1/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: fill_audio_data() support NULLMichael Niedermayer2012-05-191-1/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swresample: set the default parameters to "none"Michael Niedermayer2012-05-171-8/+8
| | | | | | this way it can easily be detected when parameters have not been set Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: automatically choose s16/flt/dbl to preserve input precision unless ↵Michael Niedermayer2012-05-021-5/+10
| | | | | | user overrides. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add double precision support to the rematrix codeMichael Niedermayer2012-05-021-2/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: update double precision checks for our resamplerMichael Niedermayer2012-05-021-1/+2
| | | | | | It supports double precision since a while Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add lfe_mix_levelJustin Ruggles2012-05-021-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add and use function pointers for rematrixMichael Niedermayer2012-05-011-2/+3
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add native matrix for rematrixingMichael Niedermayer2012-05-011-0/+2
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: disable 1 stage convert when dither is enabled.Michael Niedermayer2012-05-011-1/+1
| | | | | | This combination is not possible easily. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add sample format to AudioDataMichael Niedermayer2012-04-291-0/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: add set_audiodata_fmt() and use it to simplify codeMichael Niedermayer2012-04-291-10/+11
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: change sample format representation so as to maintain the planer/packed ↵Michael Niedermayer2012-04-281-13/+11
| | | | | | distinction. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: pass resample parameters from the user to the resampler.Michael Niedermayer2012-04-261-1/+5
| | | | | | doxy and names stolen from avr Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: Add longer more descriptive alternative AVOptions.Michael Niedermayer2012-04-261-2/+15
| | | | | | They match avresample where it supports the same fields. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: Capitalize help texts for AVOptionsMichael Niedermayer2012-04-261-20/+19
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* swr: align options a littleMichael Niedermayer2012-04-261-23/+21
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>