| Message ID | 20191202131851.3563-1-quinkblack@foxmail.com |
|---|---|
| State | Accepted |
| Commit | f9d43669125745ff678ec2b3cf731868fceb72b1 |
| Headers | show |
quinkblack@foxmail.com (12019-12-02): > From: Zhao Zhili <zhilizhao@tencent.com> > > --- > libavfilter/buffersrc.c | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c > index e0ff7e4dd8..bae7d86695 100644 > --- a/libavfilter/buffersrc.c > +++ b/libavfilter/buffersrc.c > @@ -47,7 +47,6 @@ typedef struct BufferSourceContext { > AVRational time_base; ///< time_base to set in the output link > AVRational frame_rate; ///< frame_rate to set in the output link > unsigned nb_failed_requests; > - unsigned warning_limit; > > /* video only */ > int w, h; > @@ -292,7 +291,6 @@ static av_cold int init_video(AVFilterContext *ctx) > c->w, c->h, av_get_pix_fmt_name(c->pix_fmt), > c->time_base.num, c->time_base.den, c->frame_rate.num, c->frame_rate.den, > c->pixel_aspect.num, c->pixel_aspect.den, (char *)av_x_if_null(c->sws_param, "")); > - c->warning_limit = 100; > return 0; > } > > @@ -379,7 +377,6 @@ static av_cold int init_audio(AVFilterContext *ctx) > "tb:%d/%d samplefmt:%s samplerate:%d chlayout:%s\n", > s->time_base.num, s->time_base.den, av_get_sample_fmt_name(s->sample_fmt), > s->sample_rate, s->channel_layout_str); > - s->warning_limit = 100; > > return ret; > } The warning that this variable helped implement was lost during the merge in commit a05a44e205, but it is still relevant. It would probably be better to restore it, at least until buffersrc no longer include its own FIFO. Regards,
> On Dec 2, 2019, at 9:33 PM, Nicolas George <george@nsup.org> wrote: > > quinkblack@foxmail.com <mailto:quinkblack@foxmail.com> (12019-12-02): >> From: Zhao Zhili <zhilizhao@tencent.com> >> >> --- >> libavfilter/buffersrc.c | 3 --- >> 1 file changed, 3 deletions(-) >> >> diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c >> index e0ff7e4dd8..bae7d86695 100644 >> --- a/libavfilter/buffersrc.c >> +++ b/libavfilter/buffersrc.c >> @@ -47,7 +47,6 @@ typedef struct BufferSourceContext { >> AVRational time_base; ///< time_base to set in the output link >> AVRational frame_rate; ///< frame_rate to set in the output link >> unsigned nb_failed_requests; >> - unsigned warning_limit; >> >> /* video only */ >> int w, h; >> @@ -292,7 +291,6 @@ static av_cold int init_video(AVFilterContext *ctx) >> c->w, c->h, av_get_pix_fmt_name(c->pix_fmt), >> c->time_base.num, c->time_base.den, c->frame_rate.num, c->frame_rate.den, >> c->pixel_aspect.num, c->pixel_aspect.den, (char *)av_x_if_null(c->sws_param, "")); >> - c->warning_limit = 100; >> return 0; >> } >> >> @@ -379,7 +377,6 @@ static av_cold int init_audio(AVFilterContext *ctx) >> "tb:%d/%d samplefmt:%s samplerate:%d chlayout:%s\n", >> s->time_base.num, s->time_base.den, av_get_sample_fmt_name(s->sample_fmt), >> s->sample_rate, s->channel_layout_str); >> - s->warning_limit = 100; >> >> return ret; >> } > > The warning that this variable helped implement was lost during the > merge in commit a05a44e205, but it is still relevant. It would probably > be better to restore it, at least until buffersrc no longer include its > own FIFO. I can restore it, but I’m not sure whether the issue disappeared or not. Current code call request_frame immediately after av_fifo_generic_write, while the old code call request_frame conditionally. > > Regards, > > -- > Nicolas George > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org <mailto:ffmpeg-devel@ffmpeg.org> > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel <https://ffmpeg.org/mailman/listinfo/ffmpeg-devel> > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org <mailto:ffmpeg-devel-request@ffmpeg.org> with subject "unsubscribe".
zhilizhao (12019-12-02): > I can restore it, but I’m not sure whether the issue disappeared or not. Current code > call request_frame immediately after av_fifo_generic_write, while the old code > call request_frame conditionally. Oh, I missed that. Then ok, and it can probably be simplified further, I will look into it. Patch ok in the meantime. Regards,
Nicolas George (12019-12-02): > Then ok, and it can probably be simplified further, I will look into it. See incoming patch series. > Patch ok in the meantime. Patch applied. Thank you. Regards,
diff --git a/libavfilter/buffersrc.c b/libavfilter/buffersrc.c index e0ff7e4dd8..bae7d86695 100644 --- a/libavfilter/buffersrc.c +++ b/libavfilter/buffersrc.c @@ -47,7 +47,6 @@ typedef struct BufferSourceContext { AVRational time_base; ///< time_base to set in the output link AVRational frame_rate; ///< frame_rate to set in the output link unsigned nb_failed_requests; - unsigned warning_limit; /* video only */ int w, h; @@ -292,7 +291,6 @@ static av_cold int init_video(AVFilterContext *ctx) c->w, c->h, av_get_pix_fmt_name(c->pix_fmt), c->time_base.num, c->time_base.den, c->frame_rate.num, c->frame_rate.den, c->pixel_aspect.num, c->pixel_aspect.den, (char *)av_x_if_null(c->sws_param, "")); - c->warning_limit = 100; return 0; } @@ -379,7 +377,6 @@ static av_cold int init_audio(AVFilterContext *ctx) "tb:%d/%d samplefmt:%s samplerate:%d chlayout:%s\n", s->time_base.num, s->time_base.den, av_get_sample_fmt_name(s->sample_fmt), s->sample_rate, s->channel_layout_str); - s->warning_limit = 100; return ret; }
From: Zhao Zhili <zhilizhao@tencent.com> --- libavfilter/buffersrc.c | 3 --- 1 file changed, 3 deletions(-)