| Message ID | tencent_8134033E4F56719C8CE0305BD434D781A609@qq.com |
|---|---|
| State | Accepted |
| Commit | 686096739b129c7e3ea26be29c875e0887e58c49 |
| Headers | show |
| Series | [FFmpeg-devel] fftools/ffmpeg_filter: configure min_hard_comp unconditionally | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Quoting Zhao Zhili (2022-09-17 06:30:01) > From: Zhao Zhili <zhilizhao@tencent.com> > > There are two issues here. Firstly, the floating-point comparison > is always true. Seconly, the code depends on the default value of > min_hard_comp implicitly, which can be dangerous. > > Partially fixes ticket 9859. > --- > fftools/ffmpeg_filter.c | 3 +-- > 1 file changed, 1 insertion(+), 2 deletions(-) > > diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c > index 7a5308425d..17928cea2c 100644 > --- a/fftools/ffmpeg_filter.c > +++ b/fftools/ffmpeg_filter.c > @@ -896,8 +896,7 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, > char args[256] = {0}; > > av_strlcatf(args, sizeof(args), "async=%d", audio_sync_method); > - if (audio_drift_threshold != 0.1) > - av_strlcatf(args, sizeof(args), ":min_hard_comp=%f", audio_drift_threshold); > + av_strlcatf(args, sizeof(args), ":min_hard_comp=%f", audio_drift_threshold); ok
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 7a5308425d..17928cea2c 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -896,8 +896,7 @@ static int configure_input_audio_filter(FilterGraph *fg, InputFilter *ifilter, char args[256] = {0}; av_strlcatf(args, sizeof(args), "async=%d", audio_sync_method); - if (audio_drift_threshold != 0.1) - av_strlcatf(args, sizeof(args), ":min_hard_comp=%f", audio_drift_threshold); + av_strlcatf(args, sizeof(args), ":min_hard_comp=%f", audio_drift_threshold); if (!fg->reconfiguration) av_strlcatf(args, sizeof(args), ":first_pts=0"); AUTO_INSERT_FILTER_INPUT("-async", "aresample", args);
From: Zhao Zhili <zhilizhao@tencent.com> There are two issues here. Firstly, the floating-point comparison is always true. Seconly, the code depends on the default value of min_hard_comp implicitly, which can be dangerous. Partially fixes ticket 9859. --- fftools/ffmpeg_filter.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)