virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

lavfi/silencedetect: increase duration precision.

Browse Source 
This should also fix CID717889.
This commit is contained in:
Clément Bœsch
2012-10-21 01:28:19 +02:00
parent 99a520000d
commit 273fca9ac0
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavfilter/af_silencedetect.c
View File

@@ -35,7 +35,7 @@ typedef struct {
const AVClass *class; const AVClass *class;
char *noise_str; ///< noise option string char *noise_str; ///< noise option string
double noise; ///< noise amplitude ratio double noise; ///< noise amplitude ratio
int duration; ///< minimum duration of silence until notification double duration; ///< minimum duration of silence until notification
int64_t nb_null_samples; ///< current number of continuous zero samples int64_t nb_null_samples; ///< current number of continuous zero samples
int64_t start; ///< if silence is detected, this value contains the time of the first zero sample int64_t start; ///< if silence is detected, this value contains the time of the first zero sample
int last_sample_rate; ///< last sample rate to check for sample rate changes int last_sample_rate; ///< last sample rate to check for sample rate changes
@@ -46,8 +46,8 @@ typedef struct {
static const AVOption silencedetect_options[] = { static const AVOption silencedetect_options[] = {
{ "n", "set noise tolerance", OFFSET(noise_str), AV_OPT_TYPE_STRING, {.str="-60dB"}, CHAR_MIN, CHAR_MAX, FLAGS }, { "n", "set noise tolerance", OFFSET(noise_str), AV_OPT_TYPE_STRING, {.str="-60dB"}, CHAR_MIN, CHAR_MAX, FLAGS },
{ "noise", "set noise tolerance", OFFSET(noise_str), AV_OPT_TYPE_STRING, {.str="-60dB"}, CHAR_MIN, CHAR_MAX, FLAGS }, { "noise", "set noise tolerance", OFFSET(noise_str), AV_OPT_TYPE_STRING, {.str="-60dB"}, CHAR_MIN, CHAR_MAX, FLAGS },
{ "d", "set minimum duration in seconds", OFFSET(duration), AV_OPT_TYPE_INT, {.i64=2}, 0, INT_MAX, FLAGS }, { "d", "set minimum duration in seconds", OFFSET(duration), AV_OPT_TYPE_DOUBLE, {.dbl=2.}, 0, 24*60*60, FLAGS },
{ "duration", "set minimum duration in seconds", OFFSET(duration), AV_OPT_TYPE_INT, {.i64=2}, 0, INT_MAX, FLAGS }, { "duration", "set minimum duration in seconds", OFFSET(duration), AV_OPT_TYPE_DOUBLE, {.dbl=2.}, 0, 24*60*60, FLAGS },
{ NULL }, { NULL },
}; };
@@ -102,7 +102,7 @@ static int filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples)
if (!silence->start) { if (!silence->start) {
silence->nb_null_samples++; silence->nb_null_samples++;
if (silence->nb_null_samples >= nb_samples_notify) { if (silence->nb_null_samples >= nb_samples_notify) {
silence->start = insamples->pts - silence->duration / av_q2d(inlink->time_base); silence->start = insamples->pts - (int64_t)(silence->duration / av_q2d(inlink->time_base) + .5);
av_log(silence, AV_LOG_INFO, av_log(silence, AV_LOG_INFO,
"silence_start: %s\n", av_ts2timestr(silence->start, &inlink->time_base)); "silence_start: %s\n", av_ts2timestr(silence->start, &inlink->time_base));
} }