[FFmpeg-cvslog] doc/resampler: extend docs for min_comp and min_hard_comp options

Stefano Sabatini git at videolan.org
Wed Dec 26 12:00:59 CET 2012


ffmpeg | branch: master | Stefano Sabatini <stefasab at gmail.com> | Wed Dec 26 01:39:08 2012 +0100| [955c7c7bc69a50a78c93dc4e950c75e4d93de538] | committer: Stefano Sabatini

doc/resampler: extend docs for min_comp and min_hard_comp options

Based on the text from the aresample filter docs.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=955c7c7bc69a50a78c93dc4e950c75e4d93de538
---

 doc/ffmpeg-resampler.texi |   17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/doc/ffmpeg-resampler.texi b/doc/ffmpeg-resampler.texi
index a5a1a1f..8470c04 100644
--- a/doc/ffmpeg-resampler.texi
+++ b/doc/ffmpeg-resampler.texi
@@ -121,14 +121,19 @@ Set cutoff frequency ratio. Must be a float value between 0 and 1,
 default value is 0.8.
 
 @item min_comp
-Set minimum difference between timestamps and audio data (in seconds)
-below which no timestamp compensation of either kind is applied.
-Default value is @code{FLT_MAX}.
+Set the minimum difference between timestamps and audio data (in
+seconds) to trigger stretching/squeezing/filling or trimming of the
+data to make it match the timestamps. The default is that
+stretching/squeezing/filling and trimming is disabled
+(@option{min_comp} = @code{FLT_MAX}).
 
 @item min_hard_comp
-Set minimum difference between timestamps and audio data (in seconds)
-to trigger padding/trimming the data. Must be a non-negative double,
-default value is 0.1.
+Set the minimum difference between timestamps and audio data (in
+seconds) to trigger adding/dropping samples to make it match the
+timestamps.  This option effectively is a threshold to select between
+hard (trim/fill) and soft (squeeze/stretch) compensation. Note that
+all compensation is by default disabled through @option{min_comp}.
+The default is 0.1.
 
 @item comp_duration
 Set duration (in seconds) over which data is stretched/squeezed to



More information about the ffmpeg-cvslog mailing list