virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-03-03 14:32:16 +02:00
Code Issues Releases Activity

lavfi/silencedetect: Fix when silence_start=0

Browse Source 
0 is a valid value for silence_start
This commit is contained in:
Nicolas Gaullier 2018-02-19 14:15:42 +01:00 committed by Paul B Mahol
parent 95e47654bc
commit 3deb17f9fb
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavfilter/af_silencedetect.c
View File

@ -39,7 +39,7 @@ typedef struct SilenceDetectContext {
int mono; ///< mono mode : check each channel separately (default = check when ALL channels are silent) int mono; ///< mono mode : check each channel separately (default = check when ALL channels are silent)
int independant_channels; ///< number of entries in following arrays (always 1 in mono mode) int independant_channels; ///< number of entries in following arrays (always 1 in mono mode)
int64_t *nb_null_samples; ///< (array) current number of continuous zero samples int64_t *nb_null_samples; ///< (array) current number of continuous zero samples
int64_t *start; ///< (array) if silence is detected, this value contains the time of the first zero sample int64_t *start; ///< (array) if silence is detected, this value contains the time of the first zero sample (default/unset = INT64_MIN)
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
void (*silencedetect)(struct SilenceDetectContext *s, AVFrame *insamples, void (*silencedetect)(struct SilenceDetectContext *s, AVFrame *insamples,
@ -76,7 +76,7 @@ static av_always_inline void update(SilenceDetectContext *s, AVFrame *insamples,
{ {
int channel = current_sample % s->independant_channels; int channel = current_sample % s->independant_channels;
if (is_silence) { if (is_silence) {
if (!s->start[channel]) { if (s->start[channel] == INT64_MIN) {
s->nb_null_samples[channel]++; s->nb_null_samples[channel]++;
if (s->nb_null_samples[channel] >= nb_samples_notify) { if (s->nb_null_samples[channel] >= nb_samples_notify) {
s->start[channel] = insamples->pts - (int64_t)(s->duration / av_q2d(time_base) + .5); s->start[channel] = insamples->pts - (int64_t)(s->duration / av_q2d(time_base) + .5);
@ -89,7 +89,7 @@ static av_always_inline void update(SilenceDetectContext *s, AVFrame *insamples,
} }
} }
} else { } else {
if (s->start[channel]) { if (s->start[channel] > INT64_MIN) {
int64_t end_pts = insamples->pts; int64_t end_pts = insamples->pts;
int64_t duration_ts = end_pts - s->start[channel]; int64_t duration_ts = end_pts - s->start[channel];
set_meta(insamples, s->mono ? channel + 1 : 0, "silence_end", set_meta(insamples, s->mono ? channel + 1 : 0, "silence_end",
@ -102,7 +102,8 @@ static av_always_inline void update(SilenceDetectContext *s, AVFrame *insamples,
av_ts2timestr(end_pts, &time_base), av_ts2timestr(end_pts, &time_base),
av_ts2timestr(duration_ts, &time_base)); av_ts2timestr(duration_ts, &time_base));
} }
s->nb_null_samples[channel] = s->start[channel] = 0; s->nb_null_samples[channel] = 0;
s->start[channel] = INT64_MIN;
} }
} }
@ -129,14 +130,17 @@ static int config_input(AVFilterLink *inlink)
{ {
AVFilterContext *ctx = inlink->dst; AVFilterContext *ctx = inlink->dst;
SilenceDetectContext *s = ctx->priv; SilenceDetectContext *s = ctx->priv;
int c;
s->independant_channels = s->mono ? inlink->channels : 1; s->independant_channels = s->mono ? inlink->channels : 1;
s->nb_null_samples = av_mallocz_array(sizeof(*s->nb_null_samples), s->independant_channels); s->nb_null_samples = av_mallocz_array(sizeof(*s->nb_null_samples), s->independant_channels);
if (!s->nb_null_samples) if (!s->nb_null_samples)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
s->start = av_mallocz_array(sizeof(*s->start), s->independant_channels); s->start = av_malloc_array(sizeof(*s->start), s->independant_channels);
if (!s->start) if (!s->start)
return AVERROR(ENOMEM); return AVERROR(ENOMEM);
for (c = 0; c < s->independant_channels; c++)
s->start[c] = INT64_MIN;
switch (inlink->format) { switch (inlink->format) {
case AV_SAMPLE_FMT_DBL: s->silencedetect = silencedetect_dbl; break; case AV_SAMPLE_FMT_DBL: s->silencedetect = silencedetect_dbl; break;