From: Limin Wang <lance.lmw...@gmail.com>
Signed-off-by: Limin Wang <lance.lmw...@gmail.com>
---
libavfilter/af_silenceremove.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
diff --git a/libavfilter/af_silenceremove.c b/libavfilter/af_silenceremove.c
index 7d76e49..c85be81 100644
--- a/libavfilter/af_silenceremove.c
+++ b/libavfilter/af_silenceremove.c
@@ -55,18 +55,14 @@ typedef struct SilenceRemoveContext {
int start_periods;
int64_t start_duration;
- int64_t start_duration_opt;
double start_threshold;
int64_t start_silence;
- int64_t start_silence_opt;
int start_mode;
int stop_periods;
int64_t stop_duration;
- int64_t stop_duration_opt;
double stop_threshold;
int64_t stop_silence;
- int64_t stop_silence_opt;
int stop_mode;
double *start_holdoff;
@@ -105,16 +101,16 @@ typedef struct SilenceRemoveContext {
static const AVOption silenceremove_options[] = {
{ "start_periods", NULL,
OFFSET(start_periods), AV_OPT_TYPE_INT, {.i64=0}, 0, 9000,
AF },
- { "start_duration", "set start duration of non-silence part",
OFFSET(start_duration_opt), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX,
AF },
+ { "start_duration", "set start duration of non-silence part",
OFFSET(start_duration), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX,
AF },
{ "start_threshold", "set threshold for start silence detection",
OFFSET(start_threshold), AV_OPT_TYPE_DOUBLE, {.dbl=0}, 0, DBL_MAX,
AF },
- { "start_silence", "set start duration of silence part to keep",
OFFSET(start_silence_opt), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX,
AF },
+ { "start_silence", "set start duration of silence part to keep",
OFFSET(start_silence), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX,
AF },
{ "start_mode", "set which channel will trigger trimming from start",
OFFSET(start_mode), AV_OPT_TYPE_INT, {.i64=T_ANY}, T_ANY, T_ALL,
AF, "mode" },
{ "any", 0,
0, AV_OPT_TYPE_CONST, {.i64=T_ANY}, 0, 0,
AF, "mode" },
{ "all", 0,
0, AV_OPT_TYPE_CONST, {.i64=T_ALL}, 0, 0,
AF, "mode" },
{ "stop_periods", NULL,
OFFSET(stop_periods), AV_OPT_TYPE_INT, {.i64=0}, -9000, 9000,
AF },
- { "stop_duration", "set stop duration of non-silence part",
OFFSET(stop_duration_opt), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX,
AF },
+ { "stop_duration", "set stop duration of non-silence part",
OFFSET(stop_duration), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX,
AF },
{ "stop_threshold", "set threshold for stop silence detection",
OFFSET(stop_threshold), AV_OPT_TYPE_DOUBLE, {.dbl=0}, 0, DBL_MAX,
AF },
- { "stop_silence", "set stop duration of silence part to keep",
OFFSET(stop_silence_opt), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX,
AF },
+ { "stop_silence", "set stop duration of silence part to keep",
OFFSET(stop_silence), AV_OPT_TYPE_DURATION, {.i64=0}, 0, INT64_MAX,
AF },
{ "stop_mode", "set which channel will trigger trimming from end",
OFFSET(stop_mode), AV_OPT_TYPE_INT, {.i64=T_ANY}, T_ANY, T_ALL,
AF, "mode" },
{ "detection", "set how silence is detected",
OFFSET(detection), AV_OPT_TYPE_INT, {.i64=D_RMS}, D_PEAK,D_RMS,
AF, "detection" },
{ "peak", "use absolute values of samples",
0, AV_OPT_TYPE_CONST, {.i64=D_PEAK},0, 0,
AF, "detection" },
@@ -214,13 +210,13 @@ static int config_input(AVFilterLink *inlink)
clear_window(s);
- s->start_duration = av_rescale(s->start_duration_opt, inlink->sample_rate,
+ s->start_duration = av_rescale(s->start_duration, inlink->sample_rate,
AV_TIME_BASE);
- s->start_silence = av_rescale(s->start_silence_opt, inlink->sample_rate,
+ s->start_silence = av_rescale(s->start_silence, inlink->sample_rate,
AV_TIME_BASE);
- s->stop_duration = av_rescale(s->stop_duration_opt, inlink->sample_rate,
+ s->stop_duration = av_rescale(s->stop_duration, inlink->sample_rate,
AV_TIME_BASE);
- s->stop_silence = av_rescale(s->stop_silence_opt, inlink->sample_rate,
+ s->stop_silence = av_rescale(s->stop_silence, inlink->sample_rate,
AV_TIME_BASE);
s->start_holdoff = av_malloc_array(FFMAX(s->start_duration, 1),
--
2.6.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
