| Message ID | 20240218192054.665995-1-chen.stonechen@gmail.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel] Fix rdiv always being set to 0 in vf_convolution.c | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/commit_msg_loongarch64 | warning | The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ". |
| andriy/commit_msg_x86 | warning | The first line of the commit message must start with a context terminated by a colon and a space, for example "lavu/opt: " or "doc: ". |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
Sorry I think I didn't correctly attach the patch the first time. On Sun, Feb 18, 2024 at 2:21 PM Stone Chen <chen.stonechen@gmail.com> wrote: > In commit 6c45d34, a line was added that always sets rdiv to 0, overriding > any user input. This removes that line allowing user set values for 0rdiv, > 1rdiv, 2rdiv, 3rdiv to apply as expected. This fixes ticket #10294. > > Signed-off-by: Stone Chen <chen.stonechen@gmail.com> > --- > libavfilter/vf_convolution.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c > index bf67f392f6..a00bb2b3c4 100644 > --- a/libavfilter/vf_convolution.c > +++ b/libavfilter/vf_convolution.c > @@ -674,7 +674,6 @@ static int param_init(AVFilterContext *ctx) > p = orig = av_strdup(s->matrix_str[i]); > if (p) { > s->matrix_length[i] = 0; > - s->rdiv[i] = 0.f; > sum = 0.f; > > while (s->matrix_length[i] < 49) { > -- > 2.43.2 > >
On Sun, 18 Feb 2024, Stone Chen wrote: > In commit 6c45d34, a line was added that always sets rdiv to 0, overriding any user input. This removes that line allowing user set values for 0rdiv, 1rdiv, 2rdiv, 3rdiv to apply as expected. This fixes ticket #10294. This is likely not the correct fix, because resetting it to 0 was added to support dynamic reconfigurations. The way I see it, the user option rdiv-s and internally used rdivs should be separated, init_params should always recalculate the internal rdivs based on the user option rdivs... Regards, Marton > > Signed-off-by: Stone Chen <chen.stonechen@gmail.com> > --- > libavfilter/vf_convolution.c | 1 - > 1 file changed, 1 deletion(-) > > diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c > index bf67f392f6..a00bb2b3c4 100644 > --- a/libavfilter/vf_convolution.c > +++ b/libavfilter/vf_convolution.c > @@ -674,7 +674,6 @@ static int param_init(AVFilterContext *ctx) > p = orig = av_strdup(s->matrix_str[i]); > if (p) { > s->matrix_length[i] = 0; > - s->rdiv[i] = 0.f; > sum = 0.f; > > while (s->matrix_length[i] < 49) { > -- > 2.43.2 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
Hi Marton, Thanks for the feedback! I'm not sure what dynamic reconfiguration is, from some searching I think it might be related to commands? On Sun, Feb 18, 2024 at 7:08 PM Marton Balint <cus@passwd.hu> wrote: > > > On Sun, 18 Feb 2024, Stone Chen wrote: > > > In commit 6c45d34, a line was added that always sets rdiv to 0, > overriding any user input. This removes that line allowing user set values > for 0rdiv, 1rdiv, 2rdiv, 3rdiv to apply as expected. This fixes ticket > #10294. > > This is likely not the correct fix, because resetting it to 0 was added to > support dynamic reconfigurations. > > The way I see it, the user option rdiv-s and internally used rdivs > should be separated, init_params should always recalculate the internal > rdivs based on the user option rdivs... > > Regards, > Marton > > > > > Signed-off-by: Stone Chen <chen.stonechen@gmail.com> > > --- > > libavfilter/vf_convolution.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c > > index bf67f392f6..a00bb2b3c4 100644 > > --- a/libavfilter/vf_convolution.c > > +++ b/libavfilter/vf_convolution.c > > @@ -674,7 +674,6 @@ static int param_init(AVFilterContext *ctx) > > p = orig = av_strdup(s->matrix_str[i]); > > if (p) { > > s->matrix_length[i] = 0; > > - s->rdiv[i] = 0.f; > > sum = 0.f; > > > > while (s->matrix_length[i] < 49) { > > -- > > 2.43.2 > > > > _______________________________________________ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > > > To unsubscribe, visit link above, or email > > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
Hi Marton, Thanks for the feedback! I'm not sure what dynamic reconfiguration is, from some searching I think it might be related to commands? On Sun, Feb 18, 2024 at 7:08 PM Marton Balint <cus@passwd.hu> wrote: > > > On Sun, 18 Feb 2024, Stone Chen wrote: > > > In commit 6c45d34, a line was added that always sets rdiv to 0, > overriding any user input. This removes that line allowing user set values > for 0rdiv, 1rdiv, 2rdiv, 3rdiv to apply as expected. This fixes ticket > #10294. > > This is likely not the correct fix, because resetting it to 0 was added to > support dynamic reconfigurations. > > The way I see it, the user option rdiv-s and internally used rdivs > should be separated, init_params should always recalculate the internal > rdivs based on the user option rdivs... > > Regards, > Marton > > > > > Signed-off-by: Stone Chen <chen.stonechen@gmail.com> > > --- > > libavfilter/vf_convolution.c | 1 - > > 1 file changed, 1 deletion(-) > > > > diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c > > index bf67f392f6..a00bb2b3c4 100644 > > --- a/libavfilter/vf_convolution.c > > +++ b/libavfilter/vf_convolution.c > > @@ -674,7 +674,6 @@ static int param_init(AVFilterContext *ctx) > > p = orig = av_strdup(s->matrix_str[i]); > > if (p) { > > s->matrix_length[i] = 0; > > - s->rdiv[i] = 0.f; > > sum = 0.f; > > > > while (s->matrix_length[i] < 49) { > > -- > > 2.43.2 > > > > _______________________________________________ > > ffmpeg-devel mailing list > > ffmpeg-devel@ffmpeg.org > > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > > > To unsubscribe, visit link above, or email > > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". > > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >
On Sun, 18 Feb 2024, Stone Chen wrote: > Hi Marton, > > Thanks for the feedback! > > I'm not sure what dynamic reconfiguration is, from some searching I think > it might be related to commands? Yeah, exactly. If you check the code, the process_command callback allows this, which eventually calls param_init() which does filter (re)configuration and recalculation of rdivs. Regards, Marton PS: Please do not top post on this mailing list. > > On Sun, Feb 18, 2024 at 7:08 PM Marton Balint <cus@passwd.hu> wrote: > >> >> >> On Sun, 18 Feb 2024, Stone Chen wrote: >> >> > In commit 6c45d34, a line was added that always sets rdiv to 0, >> overriding any user input. This removes that line allowing user set values >> for 0rdiv, 1rdiv, 2rdiv, 3rdiv to apply as expected. This fixes ticket >> #10294. >> >> This is likely not the correct fix, because resetting it to 0 was added to >> support dynamic reconfigurations. >> >> The way I see it, the user option rdiv-s and internally used rdivs >> should be separated, init_params should always recalculate the internal >> rdivs based on the user option rdivs... >> >> Regards, >> Marton >> >> > >> > Signed-off-by: Stone Chen <chen.stonechen@gmail.com> >> > --- >> > libavfilter/vf_convolution.c | 1 - >> > 1 file changed, 1 deletion(-) >> > >> > diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c >> > index bf67f392f6..a00bb2b3c4 100644 >> > --- a/libavfilter/vf_convolution.c >> > +++ b/libavfilter/vf_convolution.c >> > @@ -674,7 +674,6 @@ static int param_init(AVFilterContext *ctx) >> > p = orig = av_strdup(s->matrix_str[i]); >> > if (p) { >> > s->matrix_length[i] = 0; >> > - s->rdiv[i] = 0.f; >> > sum = 0.f; >> > >> > while (s->matrix_length[i] < 49) { >> > -- >> > 2.43.2 >> > >> > _______________________________________________ >> > ffmpeg-devel mailing list >> > ffmpeg-devel@ffmpeg.org >> > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> > >> > To unsubscribe, visit link above, or email >> > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >> > >> _______________________________________________ >> ffmpeg-devel mailing list >> ffmpeg-devel@ffmpeg.org >> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel >> >> To unsubscribe, visit link above, or email >> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe". >> > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
diff --git a/libavfilter/vf_convolution.c b/libavfilter/vf_convolution.c index bf67f392f6..a00bb2b3c4 100644 --- a/libavfilter/vf_convolution.c +++ b/libavfilter/vf_convolution.c @@ -674,7 +674,6 @@ static int param_init(AVFilterContext *ctx) p = orig = av_strdup(s->matrix_str[i]); if (p) { s->matrix_length[i] = 0; - s->rdiv[i] = 0.f; sum = 0.f; while (s->matrix_length[i] < 49) {
In commit 6c45d34, a line was added that always sets rdiv to 0, overriding any user input. This removes that line allowing user set values for 0rdiv, 1rdiv, 2rdiv, 3rdiv to apply as expected. This fixes ticket #10294. Signed-off-by: Stone Chen <chen.stonechen@gmail.com> --- libavfilter/vf_convolution.c | 1 - 1 file changed, 1 deletion(-)