Merge commit 'e568db40258d549777ac1c16971678e18a18f5f5'

[ffmpeg] / doc / ffmpeg-resampler.texi

diff --git a/doc/ffmpeg-resampler.texi b/doc/ffmpeg-resampler.texi
index 863253aaa7a9109a58fbf40c5840702a58060544..d45126f11f0f5a2fe845c93d5aff558432f6c1f9 100644 (file)
--- a/doc/ffmpeg-resampler.texi
+++ b/doc/ffmpeg-resampler.texi
@@ -104,6 +104,21 @@ select rectangular dither
 select triangular dither
 @item triangular_hp
 select triangular dither with high pass
+@item lipshitz
+select lipshitz noise shaping dither
+@item shibata
+select shibata noise shaping dither
+@item low_shibata
+select low shibata noise shaping dither
+@item high_shibata
+select high shibata noise shaping dither
+@item f_weighted
+select f-weighted noise shaping dither
+@item modified_e_weighted
+select modified-e-weighted noise shaping dither
+@item improved_e_weighted
+select improved-e-weighted noise shaping dither
+
 @end table
 
 @item resampler
@@ -121,7 +136,7 @@ case.
 @end table
 
 @item filter_size
-For swr only, set resampling filter size, default value is 16.
+For swr only, set resampling filter size, default value is 32.
 
 @item phase_shift
 For swr only, set resampling phase shift, default value is 10, must be included
@@ -132,7 +147,7 @@ Use Linear Interpolation if set to 1, default value is 0.
 
 @item cutoff
 Set cutoff frequency (swr: 6dB point; soxr: 0dB point) ratio; must be a float
-value between 0 and 1.  Default value is 0.8 with swr, and 0.91 with soxr
+value between 0 and 1.  Default value is 0.97 with swr, and 0.91 with soxr
 (which, with a sample-rate of 44100, preserves the entire audio band to 20kHz).
 
 @item precision
@@ -145,6 +160,14 @@ value of 28 gives SoX's 'Very High Quality'.
 For soxr only, selects passband rolloff none (Chebyshev) & higher-precision
 approximation for 'irrational' ratios. Default value is 0.
 
+@item async
+For swr only, simple 1 parameter audio sync to timestamps using stretching,
+squeezing, filling and trimming. Setting this to 1 will enable filling and
+trimming, larger values represent the maximum amount in samples that the data
+may be stretched or squeezed for each second.
+Default value is 0, thus no compensation is applied to make the samples match
+the audio timestamps.
+
 @item min_comp
 For swr only, set the minimum difference between timestamps and audio data (in
 seconds) to trigger stretching/squeezing/filling or trimming of the
@@ -211,7 +234,7 @@ For swr only, set Kaiser Window Beta value. Must be an integer included between
 
 @ifhtml
 @url{ffmpeg.html,ffmpeg}, @url{ffplay.html,ffplay}, @url{ffprobe.html,ffprobe}, @url{ffserver.html,ffserver},
-@url{libswresample.html}
+@url{libswresample.html,libswresample}
 @end ifhtml
 
 @ifnothtml