| Message ID | 20240112082950.41637-7-ffmpeg@haasn.xyz |
|---|---|
| State | New |
| Headers | show |
| Series | YUVJ removal | 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 |
On Fri, Jan 12, 2024 at 09:26:03AM +0100, Niklas Haas wrote: > From: Niklas Haas <git@haasn.dev> > > The only meaningful difference between choose_pix_fmts and the default > code was the inclusion of an extra branch for `keep_pix_fmt` being true. > > However, in this case, we either: > 1. Force the specific `ofp->format` that we inherited from > ofilter_bind_ost, or if no format was set: > 2. Print an empty format list > > Both of these goals can be accomplished by simply moving the decision > logic to ofilter_bind_ost, to avoid setting any format list when > keep_pix_fmt is enabled. This is arguably cleaner as it moves format > selection logic to a single function. In the case of branch 1, nothing > else needs to be done as we already force the format provided in > ofp->format, if any is set. Add an assertion to verify this assumption > just in case. > > (Side note: The "choose_*" family of functions are arguably misnomers, > as they should really be called "print_*" - their current behavior is to > print the relevant format lists to the `vf/af_format` filter arguments) > --- > fftools/ffmpeg_filter.c | 49 ++++++++--------------------------------- > 1 file changed, 9 insertions(+), 40 deletions(-) ./ffmpeg -y -i fate-suite/lena.pnm -pix_fmt +yuv444p -vf scale -strict -1 -bitexact -threads 2 -thread_type slice file-2s-444.jpg Assertion !ost->keep_pix_fmt || (!ofp->format && !ofp->formats) failed at fftools/ffmpeg_filter.c:1240 Aborted (core dumped) [...]
On Fri, 12 Jan 2024 22:10:46 +0100 Michael Niedermayer <michael@niedermayer.cc> wrote: > On Fri, Jan 12, 2024 at 09:26:03AM +0100, Niklas Haas wrote: > > From: Niklas Haas <git@haasn.dev> > > > > The only meaningful difference between choose_pix_fmts and the default > > code was the inclusion of an extra branch for `keep_pix_fmt` being true. > > > > However, in this case, we either: > > 1. Force the specific `ofp->format` that we inherited from > > ofilter_bind_ost, or if no format was set: > > 2. Print an empty format list > > > > Both of these goals can be accomplished by simply moving the decision > > logic to ofilter_bind_ost, to avoid setting any format list when > > keep_pix_fmt is enabled. This is arguably cleaner as it moves format > > selection logic to a single function. In the case of branch 1, nothing > > else needs to be done as we already force the format provided in > > ofp->format, if any is set. Add an assertion to verify this assumption > > just in case. > > > > (Side note: The "choose_*" family of functions are arguably misnomers, > > as they should really be called "print_*" - their current behavior is to > > print the relevant format lists to the `vf/af_format` filter arguments) > > --- > > fftools/ffmpeg_filter.c | 49 ++++++++--------------------------------- > > 1 file changed, 9 insertions(+), 40 deletions(-) > > > ./ffmpeg -y -i fate-suite/lena.pnm -pix_fmt +yuv444p -vf scale -strict -1 -bitexact -threads 2 -thread_type slice file-2s-444.jpg > > Assertion !ost->keep_pix_fmt || (!ofp->format && !ofp->formats) failed at fftools/ffmpeg_filter.c:1240 > Aborted (core dumped) Wrong logic on the assertion, should be: !ost->keep_pix_fmt || ofp->format != AV_PIX_FMT_NONE || !ofp->formats The explanation here is that before this patch, keep_pix_fmt made the filter disregard `ofp->formats` and always choose what was set in `ofp->format` - even if it was NULL. This assertion guarantees that the simplified choose_pix_fmts still does the same thing, since it will hit either the ofp->format being set branch or the ofp->formats being NULL branch. Fixed locally.
diff --git a/fftools/ffmpeg_filter.c b/fftools/ffmpeg_filter.c index 82ee4fae7d..39f5cde514 100644 --- a/fftools/ffmpeg_filter.c +++ b/fftools/ffmpeg_filter.c @@ -361,36 +361,6 @@ static void sub2video_update(InputFilterPriv *ifp, int64_t heartbeat_pts, ifp->sub2video.initialize = 0; } -/* *dst may return be set to NULL (no pixel format found), a static string or a - * string backed by the bprint. Nothing has been written to the AVBPrint in case - * NULL is returned. The AVBPrint provided should be clean. */ -static int choose_pix_fmts(OutputFilter *ofilter, AVBPrint *bprint, - const char **dst) -{ - OutputFilterPriv *ofp = ofp_from_ofilter(ofilter); - OutputStream *ost = ofilter->ost; - - *dst = NULL; - - if (ost->keep_pix_fmt || ofp->format != AV_PIX_FMT_NONE) { - *dst = ofp->format == AV_PIX_FMT_NONE ? NULL : - av_get_pix_fmt_name(ofp->format); - } else if (ofp->formats) { - const enum AVPixelFormat *p = ofp->formats; - - for (; *p != AV_PIX_FMT_NONE; p++) { - const char *name = av_get_pix_fmt_name(*p); - av_bprintf(bprint, "%s%c", name, p[1] == AV_PIX_FMT_NONE ? '\0' : '|'); - } - if (!av_bprint_is_complete(bprint)) - return AVERROR(ENOMEM); - - *dst = bprint->str; - } - - return 0; -} - /* Define a function for appending a list of allowed formats * to an AVBPrint. If nonempty, the list will have a header. */ #define DEF_CHOOSE_FORMAT(name, type, var, supported_list, none, printf_format, get_name) \ @@ -413,8 +383,8 @@ static void choose_ ## name (OutputFilterPriv *ofp, AVBPrint *bprint) \ av_bprint_chars(bprint, ':', 1); \ } -//DEF_CHOOSE_FORMAT(pix_fmts, enum AVPixelFormat, format, formats, AV_PIX_FMT_NONE, -// GET_PIX_FMT_NAME) +DEF_CHOOSE_FORMAT(pix_fmts, enum AVPixelFormat, format, formats, + AV_PIX_FMT_NONE, "%s", av_get_pix_fmt_name) DEF_CHOOSE_FORMAT(sample_fmts, enum AVSampleFormat, format, formats, AV_SAMPLE_FMT_NONE, "%s", av_get_sample_fmt_name) @@ -748,7 +718,7 @@ int ofilter_bind_ost(OutputFilter *ofilter, OutputStream *ost, ofp->height = ost->enc_ctx->height; if (ost->enc_ctx->pix_fmt != AV_PIX_FMT_NONE) { ofp->format = ost->enc_ctx->pix_fmt; - } else { + } else if (!ost->keep_pix_fmt) { ofp->formats = c->pix_fmts; // MJPEG encoder exports a full list of supported pixel formats, @@ -1233,7 +1203,6 @@ static int configure_output_video_filter(FilterGraph *fg, AVFilterGraph *graph, AVBPrint bprint; int pad_idx = out->pad_idx; int ret; - const char *pix_fmts; char name[255]; snprintf(name, sizeof(name), "out_%d_%d", ost->file->index, ost->index); @@ -1268,17 +1237,17 @@ static int configure_output_video_filter(FilterGraph *fg, AVFilterGraph *graph, pad_idx = 0; } + av_assert0(!ost->keep_pix_fmt || (!ofp->format && !ofp->formats)); av_bprint_init(&bprint, 0, AV_BPRINT_SIZE_UNLIMITED); - ret = choose_pix_fmts(ofilter, &bprint, &pix_fmts); - if (ret < 0) - return ret; - - if (pix_fmts) { + choose_pix_fmts(ofp, &bprint); + if (!av_bprint_is_complete(&bprint)) + return AVERROR(ENOMEM); + if (bprint.len) { AVFilterContext *filter; ret = avfilter_graph_create_filter(&filter, avfilter_get_by_name("format"), - "format", pix_fmts, NULL, graph); + "format", bprint.str, NULL, graph); av_bprint_finalize(&bprint, NULL); if (ret < 0) return ret;
From: Niklas Haas <git@haasn.dev> The only meaningful difference between choose_pix_fmts and the default code was the inclusion of an extra branch for `keep_pix_fmt` being true. However, in this case, we either: 1. Force the specific `ofp->format` that we inherited from ofilter_bind_ost, or if no format was set: 2. Print an empty format list Both of these goals can be accomplished by simply moving the decision logic to ofilter_bind_ost, to avoid setting any format list when keep_pix_fmt is enabled. This is arguably cleaner as it moves format selection logic to a single function. In the case of branch 1, nothing else needs to be done as we already force the format provided in ofp->format, if any is set. Add an assertion to verify this assumption just in case. (Side note: The "choose_*" family of functions are arguably misnomers, as they should really be called "print_*" - their current behavior is to print the relevant format lists to the `vf/af_format` filter arguments) --- fftools/ffmpeg_filter.c | 49 ++++++++--------------------------------- 1 file changed, 9 insertions(+), 40 deletions(-)