May 2022 - ffmpeg-cvslog - lists.ffmpeg.org

avcodec/libdavs2: export has_b_frames info
by Zhao Zhili 24 May '22

24 May '22

ffmpeg | branch: master | Zhao Zhili <quinkblack(a)foxmail.com> | Fri May 13 17:40:49 2022 +0800| [5a7a33f6f24e08470bfce2dee020da7b2f6a9b50] | committer: Zhao Zhili avcodec/libdavs2: export has_b_frames info More precisely, we should use picture_reorder_delay, but it's unavailable yet. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5a7a33f6f24e08470… --- libavcodec/libdavs2.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c index a47027d300..bc31745a4f 100644 --- a/libavcodec/libdavs2.c +++ b/libavcodec/libdavs2.c @@ -78,6 +78,12 @@ static int davs2_dump_frames(AVCodecContext *avctx, davs2_picture_t *pic, int *g avctx->height = headerset->height; avctx->pix_fmt = headerset->output_bit_depth == 10 ? AV_PIX_FMT_YUV420P10 : AV_PIX_FMT_YUV420P; + /* It should be picture_reorder_delay, but libdavs2 doesn't export that + * info. + * Use FFMAX since has_b_frames could be set by AVS2 parser in theory, + * which doesn't do it yet. + */ + avctx->has_b_frames = FFMAX(avctx->has_b_frames, !headerset->low_delay); avctx->framerate = av_d2q(headerset->frame_rate,4096); *got_frame = 0;

1 0

avcodec/libuavs3d: use output_reorder_delay as has_b_frames
by Zhao Zhili 24 May '22

24 May '22

ffmpeg | branch: master | Zhao Zhili <quinkblack(a)foxmail.com> | Fri May 13 17:40:48 2022 +0800| [8379e454e0125f2a89328636a95e3183a670c300] | committer: Zhao Zhili avcodec/libuavs3d: use output_reorder_delay as has_b_frames has_b_frames is more than a bool, it's the size of the frame reordering buffer in the decoder. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8379e454e0125f2a8… --- libavcodec/libuavs3d.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/libuavs3d.c b/libavcodec/libuavs3d.c index 23de4c8cd5..e911963a41 100644 --- a/libavcodec/libuavs3d.c +++ b/libavcodec/libuavs3d.c @@ -206,7 +206,7 @@ static int libuavs3d_decode_frame(AVCodecContext *avctx, AVFrame *frm, avctx->framerate.num = ff_avs3_frame_rate_tab[seqh->frame_rate_code].num; avctx->framerate.den = ff_avs3_frame_rate_tab[seqh->frame_rate_code].den; } - avctx->has_b_frames = !seqh->low_delay; + avctx->has_b_frames = seqh->output_reorder_delay; avctx->pix_fmt = seqh->bit_depth_internal == 8 ? AV_PIX_FMT_YUV420P : AV_PIX_FMT_YUV420P10LE; ret = ff_set_dimensions(avctx, seqh->horizontal_size, seqh->vertical_size); if (ret < 0)

1 0

avcodec/avs3_parser: set has_b_frames properly
by Zhao Zhili 24 May '22

24 May '22

ffmpeg | branch: master | Zhao Zhili <quinkblack(a)foxmail.com> | Fri May 13 18:12:25 2022 +0800| [99d1279216e9ebd0491a756c12b684a79c4a8820] | committer: Zhao Zhili avcodec/avs3_parser: set has_b_frames properly has_b_frames should be output_reorder_delay field in AVS3 sequence header and larger than 1. The parser implementation doesn't parse that field. Decoder can set has_b_frames properly, so use FFMAX here to avoid resetting has_b_frames from output_reorder_delay to 1. Signed-off-by: Zhao Zhili <zhilizhao(a)tencent.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99d1279216e9ebd04… --- libavcodec/avs3_parser.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libavcodec/avs3_parser.c b/libavcodec/avs3_parser.c index d04d96a03a..a9fd879e9d 100644 --- a/libavcodec/avs3_parser.c +++ b/libavcodec/avs3_parser.c @@ -71,7 +71,7 @@ static void parse_avs3_nal_units(AVCodecParserContext *s, const uint8_t *buf, if (buf[0] == 0x0 && buf[1] == 0x0 && buf[2] == 0x1) { if (buf[3] == AVS3_SEQ_START_CODE) { GetBitContext gb; - int profile, ratecode; + int profile, ratecode, low_delay; init_get_bits8(&gb, buf + 4, buf_size - 4); @@ -114,7 +114,8 @@ static void parse_avs3_nal_units(AVCodecParserContext *s, const uint8_t *buf, // bitrate_high(12) skip_bits(&gb, 32); - avctx->has_b_frames = !get_bits(&gb, 1); + low_delay = get_bits(&gb, 1); + avctx->has_b_frames = FFMAX(avctx->has_b_frames, !low_delay); avctx->framerate.num = avctx->time_base.den = ff_avs3_frame_rate_tab[ratecode].num; avctx->framerate.den = avctx->time_base.num = ff_avs3_frame_rate_tab[ratecode].den;

1 0

avfilter: Add blockdetect filter
by Thilo Borgmann 24 May '22

24 May '22

ffmpeg | branch: master | Thilo Borgmann <thilo.borgmann(a)mail.de> | Tue May 24 11:20:14 2022 +0200| [9cb9da62a3591f916cb9e673ae29f924e5c7659f] | committer: Thilo Borgmann avfilter: Add blockdetect filter > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9cb9da62a3591f916… --- Changelog | 2 +- doc/filters.texi | 29 +++ libavfilter/Makefile | 1 + libavfilter/allfilters.c | 1 + libavfilter/version.h | 2 +- libavfilter/vf_blockdetect.c | 294 +++++++++++++++++++++++++++ tests/fate/filter-video.mak | 3 + tests/ref/fate/filter-refcmp-blockdetect-yuv | 10 + 8 files changed, 340 insertions(+), 2 deletions(-) diff --git a/Changelog b/Changelog index 4d42a0f681..7c485d27d6 100644 --- a/Changelog +++ b/Changelog @@ -13,9 +13,9 @@ version 5.1: - pixelize video filter - colormap video filter - colorchart video source filter -- blurdetect filter - multiply video filter - PGS subtitle frame merge bitstream filter +- blurdetect filter version 5.0: diff --git a/doc/filters.texi b/doc/filters.texi index c243caee20..0e10946cca 100644 --- a/doc/filters.texi +++ b/doc/filters.texi @@ -8131,6 +8131,35 @@ tblend=all_mode=grainextract @subsection Commands This filter supports same @ref{commands} as options. +@anchor{blockdetect} +@section blockdetect + +Determines blockiness of frames without altering the input frames. + +Based on Remco Muijs and Ihor Kirenko: "A no-reference blocking artifact measure for adaptive video processing." 2005 13th European signal processing conference. + +The filter accepts the following options: + +@table @option +@item period_min +@item period_max +Set minimum and maximum values for determining pixel grids (periods). +Default values are [3,24]. + +@item planes +Set planes to filter. Default is first only. +@end table + +@subsection Examples + +@itemize +@item +Determine blockiness for the first plane and search for periods within [8,32]: +@example +blockdetect=period_min=8:period_max=32:planes=1 +@end example +@end itemize + @anchor{blurdetect} @section blurdetect diff --git a/libavfilter/Makefile b/libavfilter/Makefile index 78ccfa37d3..e0e4d0de2c 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -197,6 +197,7 @@ OBJS-$(CONFIG_BLACKDETECT_FILTER) += vf_blackdetect.o OBJS-$(CONFIG_BLACKFRAME_FILTER) += vf_blackframe.o OBJS-$(CONFIG_BLEND_FILTER) += vf_blend.o framesync.o OBJS-$(CONFIG_BLEND_VULKAN_FILTER) += vf_blend_vulkan.o framesync.o vulkan.o vulkan_filter.o +OBJS-$(CONFIG_BLOCKDETECT_FILTER) += vf_blockdetect.o OBJS-$(CONFIG_BLURDETECT_FILTER) += vf_blurdetect.o edge_common.o OBJS-$(CONFIG_BM3D_FILTER) += vf_bm3d.o framesync.o OBJS-$(CONFIG_BOXBLUR_FILTER) += vf_boxblur.o boxblur.o diff --git a/libavfilter/allfilters.c b/libavfilter/allfilters.c index 1946e0a51e..2409964e53 100644 --- a/libavfilter/allfilters.c +++ b/libavfilter/allfilters.c @@ -183,6 +183,7 @@ extern const AVFilter ff_vf_blackdetect; extern const AVFilter ff_vf_blackframe; extern const AVFilter ff_vf_blend; extern const AVFilter ff_vf_blend_vulkan; +extern const AVFilter ff_vf_blockdetect; extern const AVFilter ff_vf_blurdetect; extern const AVFilter ff_vf_bm3d; extern const AVFilter ff_vf_boxblur; diff --git a/libavfilter/version.h b/libavfilter/version.h index c7ef9f25d7..df23710223 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #include "version_major.h" -#define LIBAVFILTER_VERSION_MINOR 38 +#define LIBAVFILTER_VERSION_MINOR 39 #define LIBAVFILTER_VERSION_MICRO 100 diff --git a/libavfilter/vf_blockdetect.c b/libavfilter/vf_blockdetect.c new file mode 100644 index 0000000000..624dcfdeda --- /dev/null +++ b/libavfilter/vf_blockdetect.c @@ -0,0 +1,294 @@ +/* + * Copyright (c) 2021 Thilo Borgmann <thilo.borgmann _at_ mail.de> + * + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +/** + * @file + * No-reference blockdetect filter + * + * Implementing: + * Remco Muijs and Ihor Kirenko: "A no-reference blocking artifact measure for adaptive video processing." 2005 13th European signal processing conference. IEEE, 2005. + * http://www.eurasip.org/Proceedings/Eusipco/Eusipco2005/defevent/papers/cr10… + * + * @author Thilo Borgmann <thilo.borgmann _at_ mail.de> + */ + +#include "libavutil/imgutils.h" +#include "libavutil/opt.h" +#include "internal.h" + +typedef struct BLKContext { + const AVClass *class; + + int hsub, vsub; + int nb_planes; + + int period_min; // minimum period to search for + int period_max; // maximum period to search for + int planes; // number of planes to filter + + double block_total; + uint64_t nb_frames; + + float *gradients; +} BLKContext; + +#define OFFSET(x) offsetof(BLKContext, x) +#define FLAGS AV_OPT_FLAG_FILTERING_PARAM|AV_OPT_FLAG_VIDEO_PARAM +static const AVOption blockdetect_options[] = { + { "period_min", "Minimum period to search for", OFFSET(period_min), AV_OPT_TYPE_INT, {.i64=3}, 2, 32, FLAGS}, + { "period_max", "Maximum period to search for", OFFSET(period_max), AV_OPT_TYPE_INT, {.i64=24}, 2, 64, FLAGS}, + { "planes", "set planes to filter", OFFSET(planes), AV_OPT_TYPE_INT, {.i64=1}, 0, 15, FLAGS }, + { NULL } +}; + +AVFILTER_DEFINE_CLASS(blockdetect); + +static av_cold int blockdetect_init(AVFilterContext *ctx) +{ + return 0; +} + +static int blockdetect_config_input(AVFilterLink *inlink) +{ + AVFilterContext *ctx = inlink->dst; + BLKContext *s = ctx->priv; + const int bufsize = inlink->w * inlink->h; + const AVPixFmtDescriptor *pix_desc; + + pix_desc = av_pix_fmt_desc_get(inlink->format); + s->hsub = pix_desc->log2_chroma_w; + s->vsub = pix_desc->log2_chroma_h; + s->nb_planes = av_pix_fmt_count_planes(inlink->format); + + s->gradients = av_calloc(bufsize, sizeof(*s->gradients)); + + if (!s->gradients) + return AVERROR(ENOMEM); + + return 0; +} + +static float calculate_blockiness(BLKContext *s, int w, int h, + float *grad, int grad_linesize, + uint8_t* src, int src_linesize) +{ + float block = 0.0f; + float nonblock = 0.0f; + int block_count = 0; + int nonblock_count = 0; + float ret = 0; + + // Calculate BS in horizontal and vertical directions according to (1)(2)(3). + // Also try to find integer pixel periods (grids) even for scaled images. + // In case of fractional periods, FFMAX of current and neighbor pixels + // can help improve the correlation with MQS. + // Skip linear correction term (4)(5), as it appears only valid for their own test samples. + + // horizontal blockiness (fixed width) + for (int j = 1; j < h; j++) { + for (int i = 3; i < w - 4; i++) { + float temp = 0.0f; + grad[j * grad_linesize + i] = + abs(src[j * src_linesize + i + 0] - src[j * src_linesize + i + 1]); + temp += abs(src[j * src_linesize + i + 1] - src[j * src_linesize + i + 2]); + temp += abs(src[j * src_linesize + i + 2] - src[j * src_linesize + i + 3]); + temp += abs(src[j * src_linesize + i + 3] - src[j * src_linesize + i + 4]); + temp += abs(src[j * src_linesize + i - 0] - src[j * src_linesize + i - 1]); + temp += abs(src[j * src_linesize + i - 1] - src[j * src_linesize + i - 2]); + temp += abs(src[j * src_linesize + i - 2] - src[j * src_linesize + i - 3]); + temp = FFMAX(1, temp); + grad[j * grad_linesize + i] /= temp; + + // use first row to store acculated results + grad[i] += grad[j * grad_linesize + i]; + } + } + + // find horizontal period + for (int period = s->period_min; period < s->period_max + 1; period++) { + float temp; + block = 0; + nonblock = 0; + block_count = 0; + nonblock_count = 0; + for (int i = 3; i < w - 4; i++) { + if ((i % period) == (period - 1)) { + block += FFMAX(FFMAX(grad[i + 0], grad[i + 1]), grad[i - 1]); + block_count++; + } else { + nonblock += grad[i]; + nonblock_count++; + } + } + temp = (block / block_count) / (nonblock / nonblock_count); + ret = FFMAX(ret, temp); + } + + // vertical blockiness (fixed height) + block_count = 0; + for (int j = 3; j < h - 4; j++) { + for (int i = 1; i < w; i++) { + float temp = 0.0f; + grad[j * grad_linesize + i] = + abs(src[(j + 0) * src_linesize + i] - src[(j + 1) * src_linesize + i]); + temp += abs(src[(j + 1) * src_linesize + i] - src[(j + 2) * src_linesize + i]); + temp += abs(src[(j + 2) * src_linesize + i] - src[(j + 3) * src_linesize + i]); + temp += abs(src[(j + 3) * src_linesize + i] - src[(j + 4) * src_linesize + i]); + temp += abs(src[(j - 0) * src_linesize + i] - src[(j - 1) * src_linesize + i]); + temp += abs(src[(j - 1) * src_linesize + i] - src[(j - 2) * src_linesize + i]); + temp += abs(src[(j - 2) * src_linesize + i] - src[(j - 3) * src_linesize + i]); + temp = FFMAX(1, temp); + grad[j * grad_linesize + i] /= temp; + + // use first column to store accumulated results + grad[j * grad_linesize] += grad[j * grad_linesize + i]; + } + } + + // find vertical period + for (int period = s->period_min; period < s->period_max + 1; period++) { + float temp; + block = 0; + nonblock = 0; + block_count = 0; + nonblock_count = 0; + for (int j = 3; j < h - 4; j++) { + if ((j % period) == (period - 1)) { + block += FFMAX(FFMAX(grad[(j + 0) * grad_linesize], + grad[(j + 1) * grad_linesize]), + grad[(j - 1) * grad_linesize]); + block_count++; + } else { + nonblock += grad[j * grad_linesize]; + nonblock_count++; + } + } + temp = (block / block_count) / (nonblock / nonblock_count); + ret = FFMAX(ret, temp); + } + + // return highest value of horz||vert + return ret; +} + +static void set_meta(AVDictionary **metadata, const char *key, float d) +{ + char value[128]; + snprintf(value, sizeof(value), "%f", d); + av_dict_set(metadata, key, value, 0); +} + +static int blockdetect_filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + BLKContext *s = ctx->priv; + AVFilterLink *outlink = ctx->outputs[0]; + + const int inw = inlink->w; + const int inh = inlink->h; + + float *gradients = s->gradients; + + float block = 0.0f; + int nplanes = 0; + AVDictionary **metadata; + metadata = &in->metadata; + + for (int plane = 0; plane < s->nb_planes; plane++) { + int hsub = plane == 1 || plane == 2 ? s->hsub : 0; + int vsub = plane == 1 || plane == 2 ? s->vsub : 0; + int w = AV_CEIL_RSHIFT(inw, hsub); + int h = AV_CEIL_RSHIFT(inh, vsub); + + if (!((1 << plane) & s->planes)) + continue; + + nplanes++; + + block += calculate_blockiness(s, w, h, gradients, w, in->data[plane], in->linesize[plane]); + } + + if (nplanes) + block /= nplanes; + + s->block_total += block; + + // write stats + av_log(ctx, AV_LOG_VERBOSE, "block: %.7f\n", block); + + set_meta(metadata, "lavfi.block", block); + + s->nb_frames = inlink->frame_count_in; + + return ff_filter_frame(outlink, in); +} + +static av_cold void blockdetect_uninit(AVFilterContext *ctx) +{ + BLKContext *s = ctx->priv; + + if (s->nb_frames > 0) { + av_log(ctx, AV_LOG_INFO, "block mean: %.7f\n", + s->block_total / s->nb_frames); + } + + av_freep(&s->gradients); +} + +static const enum AVPixelFormat pix_fmts[] = { + AV_PIX_FMT_GRAY8, + AV_PIX_FMT_GBRP, AV_PIX_FMT_GBRAP, + AV_PIX_FMT_YUV422P, AV_PIX_FMT_YUV420P, + AV_PIX_FMT_YUV444P, AV_PIX_FMT_YUV440P, + AV_PIX_FMT_YUV411P, AV_PIX_FMT_YUV410P, + AV_PIX_FMT_YUVJ440P, AV_PIX_FMT_YUVJ411P, AV_PIX_FMT_YUVJ420P, + AV_PIX_FMT_YUVJ422P, AV_PIX_FMT_YUVJ444P, + AV_PIX_FMT_YUVA444P, AV_PIX_FMT_YUVA422P, AV_PIX_FMT_YUVA420P, + AV_PIX_FMT_NONE +}; + +static const AVFilterPad blockdetect_inputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .config_props = blockdetect_config_input, + .filter_frame = blockdetect_filter_frame, + }, +}; + +static const AVFilterPad blockdetect_outputs[] = { + { + .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + }, +}; + +const AVFilter ff_vf_blockdetect = { + .name = "blockdetect", + .description = NULL_IF_CONFIG_SMALL("Blockdetect filter."), + .priv_size = sizeof(BLKContext), + .init = blockdetect_init, + .uninit = blockdetect_uninit, + FILTER_PIXFMTS_ARRAY(pix_fmts), + FILTER_INPUTS(blockdetect_inputs), + FILTER_OUTPUTS(blockdetect_outputs), + .priv_class = &blockdetect_class, + .flags = AVFILTER_FLAG_METADATA_ONLY, +}; diff --git a/tests/fate/filter-video.mak b/tests/fate/filter-video.mak index 97831bdf39..faed832cd4 100644 --- a/tests/fate/filter-video.mak +++ b/tests/fate/filter-video.mak @@ -687,6 +687,9 @@ fate-filter-metadata-avf-aphase-meter-out-of-phase: CMD = run $(FILTER_METADATA_ FATE_FILTER_SAMPLES-$(call TRANSCODE, RAWVIDEO H264, MOV, ARESAMPLE_FILTER AAC_FIXED_DECODER) += fate-filter-meta-4560-rotate0 fate-filter-meta-4560-rotate0: CMD = transcode mov $(TARGET_SAMPLES)/filter/sample-in-issue-505.mov mov "-c copy -metadata:s:v:0 rotate=0" "-af aresample" "" "" "-flags +bitexact -c:a aac_fixed" +FATE_FILTER_CMP_METADATA-$(CONFIG_BLOCKDETECT_FILTER) += fate-filter-refcmp-blockdetect-yuv +fate-filter-refcmp-blockdetect-yuv: CMD = cmp_metadata blockdetect yuv420p 0.015 + FATE_FILTER_CMP_METADATA-$(CONFIG_BLURDETECT_FILTER) += fate-filter-refcmp-blurdetect-yuv fate-filter-refcmp-blurdetect-yuv: CMD = cmp_metadata blurdetect yuv420p 0.015 diff --git a/tests/ref/fate/filter-refcmp-blockdetect-yuv b/tests/ref/fate/filter-refcmp-blockdetect-yuv new file mode 100644 index 0000000000..c3b3a3644f --- /dev/null +++ b/tests/ref/fate/filter-refcmp-blockdetect-yuv @@ -0,0 +1,10 @@ +frame:0 pts:0 pts_time:0 +lavfi.block=46.592525 +frame:1 pts:1 pts_time:1 +lavfi.block=40.478703 +frame:2 pts:2 pts_time:2 +lavfi.block=40.858681 +frame:3 pts:3 pts_time:3 +lavfi.block=39.519077 +frame:4 pts:4 pts_time:4 +lavfi.block=38.713215

1 0

avcodec/dvdsubdec: use avpriv_fopen_utf8() instead of plain fopen()
by softworkz 24 May '22

24 May '22

ffmpeg | branch: master | softworkz <softworkz(a)hotmail.com> | Mon May 23 11:26:10 2022 +0000| [6b32ad59c8fe16fc792ca5a468b95ce5232ff6d1] | committer: Martin Storsjö avcodec/dvdsubdec: use avpriv_fopen_utf8() instead of plain fopen() Unify file access operations by replacing usages of direct calls to posix fopen() to prepare for long filename support on Windows. Signed-off-by: softworkz <softworkz(a)hotmail.com> Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6b32ad59c8fe16fc7… --- libavcodec/dvdsubdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/dvdsubdec.c b/libavcodec/dvdsubdec.c index 30fe4d41de..b54073393e 100644 --- a/libavcodec/dvdsubdec.c +++ b/libavcodec/dvdsubdec.c @@ -617,7 +617,7 @@ static int parse_ifo_palette(DVDSubContext *ctx, char *p) const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP; ctx->has_palette = 0; - if ((ifo = fopen(p, "r")) == NULL) { + if ((ifo = avpriv_fopen_utf8(p, "r")) == NULL) { av_log(ctx, AV_LOG_WARNING, "Unable to open IFO file \"%s\": %s\n", p, av_err2str(AVERROR(errno))); return AVERROR_EOF; }

1 0

avfilter: use avpriv_fopen_utf8() instead of plain fopen()
by softworkz 24 May '22

24 May '22

ffmpeg | branch: master | softworkz <softworkz(a)hotmail.com> | Mon May 23 11:26:09 2022 +0000| [f579a1d08b269b6dfc89596af20582c01950adb2] | committer: Martin Storsjö avfilter: use avpriv_fopen_utf8() instead of plain fopen() Unify file access operations by replacing usages of direct calls to posix fopen() to prepare for long filename support on Windows. Signed-off-by: softworkz <softworkz(a)hotmail.com> Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f579a1d08b269b6df… --- libavfilter/af_firequalizer.c | 2 +- libavfilter/vf_deshake.c | 2 +- libavfilter/vf_psnr.c | 2 +- libavfilter/vf_signature.c | 4 ++-- libavfilter/vf_ssim.c | 2 +- libavfilter/vf_vidstabdetect.c | 2 +- libavfilter/vf_vidstabtransform.c | 2 +- libavfilter/vf_vmafmotion.c | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libavfilter/af_firequalizer.c b/libavfilter/af_firequalizer.c index c19a2fe122..85bdb59209 100644 --- a/libavfilter/af_firequalizer.c +++ b/libavfilter/af_firequalizer.c @@ -604,7 +604,7 @@ static int generate_kernel(AVFilterContext *ctx, const char *gain, const char *g if (ret < 0) return ret; - if (s->dumpfile && (!s->dump_buf || !s->analysis_rdft || !(dump_fp = fopen(s->dumpfile, "w")))) + if (s->dumpfile && (!s->dump_buf || !s->analysis_rdft || !(dump_fp = avpriv_fopen_utf8(s->dumpfile, "w")))) av_log(ctx, AV_LOG_WARNING, "dumping failed.\n"); vars[VAR_CHS] = inlink->ch_layout.nb_channels; diff --git a/libavfilter/vf_deshake.c b/libavfilter/vf_deshake.c index 4f28467bb2..b37cffba9d 100644 --- a/libavfilter/vf_deshake.c +++ b/libavfilter/vf_deshake.c @@ -353,7 +353,7 @@ static av_cold int init(AVFilterContext *ctx) } if (deshake->filename) - deshake->fp = fopen(deshake->filename, "w"); + deshake->fp = avpriv_fopen_utf8(deshake->filename, "w"); if (deshake->fp) fwrite("Ori x, Avg x, Fin x, Ori y, Avg y, Fin y, Ori angle, Avg angle, Fin angle, Ori zoom, Avg zoom, Fin zoom\n", 1, 104, deshake->fp); diff --git a/libavfilter/vf_psnr.c b/libavfilter/vf_psnr.c index 19852eaa69..fdfd211401 100644 --- a/libavfilter/vf_psnr.c +++ b/libavfilter/vf_psnr.c @@ -280,7 +280,7 @@ static av_cold int init(AVFilterContext *ctx) if (!strcmp(s->stats_file_str, "-")) { s->stats_file = stdout; } else { - s->stats_file = fopen(s->stats_file_str, "w"); + s->stats_file = avpriv_fopen_utf8(s->stats_file_str, "w"); if (!s->stats_file) { int err = AVERROR(errno); char buf[128]; diff --git a/libavfilter/vf_signature.c b/libavfilter/vf_signature.c index 4ca57ebf1d..5cff149756 100644 --- a/libavfilter/vf_signature.c +++ b/libavfilter/vf_signature.c @@ -386,7 +386,7 @@ static int xml_export(AVFilterContext *ctx, StreamContext *sc, const char* filen FILE* f; unsigned int pot3[5] = { 3*3*3*3, 3*3*3, 3*3, 3, 1 }; - f = fopen(filename, "w"); + f = avpriv_fopen_utf8(filename, "w"); if (!f) { int err = AVERROR(EINVAL); char buf[128]; @@ -500,7 +500,7 @@ static int binary_export(AVFilterContext *ctx, StreamContext *sc, const char* fi if (!buffer) return AVERROR(ENOMEM); - f = fopen(filename, "wb"); + f = avpriv_fopen_utf8(filename, "wb"); if (!f) { int err = AVERROR(EINVAL); char buf[128]; diff --git a/libavfilter/vf_ssim.c b/libavfilter/vf_ssim.c index 32f313817d..bceb3288ef 100644 --- a/libavfilter/vf_ssim.c +++ b/libavfilter/vf_ssim.c @@ -404,7 +404,7 @@ static av_cold int init(AVFilterContext *ctx) if (!strcmp(s->stats_file_str, "-")) { s->stats_file = stdout; } else { - s->stats_file = fopen(s->stats_file_str, "w"); + s->stats_file = avpriv_fopen_utf8(s->stats_file_str, "w"); if (!s->stats_file) { int err = AVERROR(errno); char buf[128]; diff --git a/libavfilter/vf_vidstabdetect.c b/libavfilter/vf_vidstabdetect.c index 267a62ea9b..044911ec27 100644 --- a/libavfilter/vf_vidstabdetect.c +++ b/libavfilter/vf_vidstabdetect.c @@ -126,7 +126,7 @@ static int config_input(AVFilterLink *inlink) av_log(ctx, AV_LOG_INFO, " show = %d\n", s->conf.show); av_log(ctx, AV_LOG_INFO, " result = %s\n", s->result); - s->f = fopen(s->result, "w"); + s->f = avpriv_fopen_utf8(s->result, "w"); if (s->f == NULL) { av_log(ctx, AV_LOG_ERROR, "cannot open transform file %s\n", s->result); return AVERROR(EINVAL); diff --git a/libavfilter/vf_vidstabtransform.c b/libavfilter/vf_vidstabtransform.c index 4619e9b256..de303554cd 100644 --- a/libavfilter/vf_vidstabtransform.c +++ b/libavfilter/vf_vidstabtransform.c @@ -191,7 +191,7 @@ static int config_input(AVFilterLink *inlink) av_log(ctx, AV_LOG_INFO, " zoomspeed = %g\n", tc->conf.zoomSpeed); av_log(ctx, AV_LOG_INFO, " interpol = %s\n", getInterpolationTypeName(tc->conf.interpolType)); - f = fopen(tc->input, "r"); + f = avpriv_fopen_utf8(tc->input, "r"); if (!f) { int ret = AVERROR(errno); av_log(ctx, AV_LOG_ERROR, "cannot open input file %s\n", tc->input); diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c index 8b7e9b17ef..6ae968f7e9 100644 --- a/libavfilter/vf_vmafmotion.c +++ b/libavfilter/vf_vmafmotion.c @@ -312,7 +312,7 @@ static av_cold int init(AVFilterContext *ctx) if (!strcmp(s->stats_file_str, "-")) { s->stats_file = stdout; } else { - s->stats_file = fopen(s->stats_file_str, "w"); + s->stats_file = avpriv_fopen_utf8(s->stats_file_str, "w"); if (!s->stats_file) { int err = AVERROR(errno); char buf[128];

1 0

avfilter/af_afftfilt: add threads support
by Paul B Mahol 24 May '22

24 May '22

ffmpeg | branch: master | Paul B Mahol <onemda(a)gmail.com> | Tue May 24 08:52:25 2022 +0200| [d2ef44fbb16f3c5675b0c9aa0f281618f7a2a921] | committer: Paul B Mahol avfilter/af_afftfilt: add threads support > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2ef44fbb16f3c567… --- libavfilter/af_afftfilt.c | 139 ++++++++++++++++++++++++++++++---------------- 1 file changed, 92 insertions(+), 47 deletions(-) diff --git a/libavfilter/af_afftfilt.c b/libavfilter/af_afftfilt.c index a5d3dfe307..b10fa24b09 100644 --- a/libavfilter/af_afftfilt.c +++ b/libavfilter/af_afftfilt.c @@ -35,7 +35,7 @@ typedef struct AFFTFiltContext { char *img_str; int fft_size; - AVTXContext *fft, *ifft; + AVTXContext **fft, **ifft; av_tx_fn tx_fn, itx_fn; AVComplexFloat **fft_in; AVComplexFloat **fft_out; @@ -104,19 +104,28 @@ static int config_input(AVFilterLink *inlink) AFFTFiltContext *s = ctx->priv; char *saveptr = NULL; int ret = 0, ch; - float overlap, scale; + float overlap, scale = 1.f; char *args; const char *last_expr = "1"; int buf_size; s->channels = inlink->ch_layout.nb_channels; - ret = av_tx_init(&s->fft, &s->tx_fn, AV_TX_FLOAT_FFT, 0, s->fft_size, &scale, 0); - if (ret < 0) - return ret; + s->fft = av_calloc(s->channels, sizeof(*s->fft)); + s->ifft = av_calloc(s->channels, sizeof(*s->ifft)); + if (!s->fft || !s->ifft) + return AVERROR(ENOMEM); - ret = av_tx_init(&s->ifft, &s->itx_fn, AV_TX_FLOAT_FFT, 1, s->fft_size, &scale, 0); - if (ret < 0) - return ret; + for (int ch = 0; ch < s->channels; ch++) { + ret = av_tx_init(&s->fft[ch], &s->tx_fn, AV_TX_FLOAT_FFT, 0, s->fft_size, &scale, 0); + if (ret < 0) + return ret; + } + + for (int ch = 0; ch < s->channels; ch++) { + ret = av_tx_init(&s->ifft[ch], &s->itx_fn, AV_TX_FLOAT_FFT, 1, s->fft_size, &scale, 0); + if (ret < 0) + return ret; + } s->window_size = s->fft_size; buf_size = FFALIGN(s->window_size, av_cpu_max_align()); @@ -220,59 +229,50 @@ fail: return ret; } -static int filter_frame(AVFilterLink *inlink, AVFrame *in) +static int tx_channel(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) { - AVFilterContext *ctx = inlink->dst; - AVFilterLink *outlink = ctx->outputs[0]; AFFTFiltContext *s = ctx->priv; - const int window_size = s->window_size; - const float *window_lut = s->window_func_lut; - const float f = sqrtf(1.f - s->overlap); - double values[VAR_VARS_NB]; - int ch, n, ret, i; - AVFrame *out; + const int channels = s->channels; + const int start = (channels * jobnr) / nb_jobs; + const int end = (channels * (jobnr+1)) / nb_jobs; - for (ch = 0; ch < inlink->ch_layout.nb_channels; ch++) { - const int offset = s->window_size - s->hop_size; - float *src = (float *)s->window->extended_data[ch]; + for (int ch = start; ch < end; ch++) { AVComplexFloat *fft_in = s->fft_in[ch]; + AVComplexFloat *fft_out = s->fft_out[ch]; - memmove(src, &src[s->hop_size], offset * sizeof(float)); - memcpy(&src[offset], in->extended_data[ch], in->nb_samples * sizeof(float)); - memset(&src[offset + in->nb_samples], 0, (s->hop_size - in->nb_samples) * sizeof(float)); - - for (n = 0; n < window_size; n++) { - fft_in[n].re = src[n] * window_lut[n]; - fft_in[n].im = 0; - } + s->tx_fn(s->fft[ch], fft_out, fft_in, sizeof(float)); } - values[VAR_PTS] = in->pts; - values[VAR_SAMPLE_RATE] = inlink->sample_rate; - values[VAR_NBBINS] = window_size / 2; - values[VAR_CHANNELS] = inlink->ch_layout.nb_channels; + return 0; +} - for (ch = 0; ch < inlink->ch_layout.nb_channels; ch++) { - AVComplexFloat *fft_in = s->fft_in[ch]; - AVComplexFloat *fft_out = s->fft_out[ch]; +static int filter_channel(AVFilterContext *ctx, void *arg, int jobnr, int nb_jobs) +{ + AFFTFiltContext *s = ctx->priv; + const int window_size = s->window_size; + const float *window_lut = s->window_func_lut; + const float f = sqrtf(1.f - s->overlap); + const int channels = s->channels; + const int start = (channels * jobnr) / nb_jobs; + const int end = (channels * (jobnr+1)) / nb_jobs; + double values[VAR_VARS_NB]; - s->tx_fn(s->fft, fft_out, fft_in, sizeof(float)); - } + memcpy(values, arg, sizeof(values)); - for (ch = 0; ch < inlink->ch_layout.nb_channels; ch++) { + for (int ch = start; ch < end; ch++) { AVComplexFloat *fft_out = s->fft_out[ch]; AVComplexFloat *fft_temp = s->fft_temp[ch]; float *buf = (float *)s->buffer->extended_data[ch]; - int x; + values[VAR_CHANNEL] = ch; if (ctx->is_disabled) { - for (n = 0; n < window_size; n++) { + for (int n = 0; n < window_size; n++) { fft_temp[n].re = fft_out[n].re; fft_temp[n].im = fft_out[n].im; } } else { - for (n = 0; n <= window_size / 2; n++) { + for (int n = 0; n <= window_size / 2; n++) { float fr, fi; values[VAR_BIN] = n; @@ -286,20 +286,59 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) fft_temp[n].im = fi; } - for (n = window_size / 2 + 1, x = window_size / 2 - 1; n < window_size; n++, x--) { + for (int n = window_size / 2 + 1, x = window_size / 2 - 1; n < window_size; n++, x--) { fft_temp[n].re = fft_temp[x].re; fft_temp[n].im = -fft_temp[x].im; } } - s->itx_fn(s->ifft, fft_out, fft_temp, sizeof(float)); + s->itx_fn(s->ifft[ch], fft_out, fft_temp, sizeof(float)); memmove(buf, buf + s->hop_size, window_size * sizeof(float)); - for (i = 0; i < window_size; i++) { + for (int i = 0; i < window_size; i++) buf[i] += fft_out[i].re * window_lut[i] * f; + } + + return 0; +} + +static int filter_frame(AVFilterLink *inlink, AVFrame *in) +{ + AVFilterContext *ctx = inlink->dst; + AVFilterLink *outlink = ctx->outputs[0]; + AFFTFiltContext *s = ctx->priv; + const int window_size = s->window_size; + const float *window_lut = s->window_func_lut; + double values[VAR_VARS_NB]; + int ch, n, ret; + AVFrame *out; + + for (ch = 0; ch < inlink->ch_layout.nb_channels; ch++) { + const int offset = s->window_size - s->hop_size; + float *src = (float *)s->window->extended_data[ch]; + AVComplexFloat *fft_in = s->fft_in[ch]; + + memmove(src, &src[s->hop_size], offset * sizeof(float)); + memcpy(&src[offset], in->extended_data[ch], in->nb_samples * sizeof(float)); + memset(&src[offset + in->nb_samples], 0, (s->hop_size - in->nb_samples) * sizeof(float)); + + for (n = 0; n < window_size; n++) { + fft_in[n].re = src[n] * window_lut[n]; + fft_in[n].im = 0; } } + values[VAR_PTS] = in->pts; + values[VAR_SAMPLE_RATE] = inlink->sample_rate; + values[VAR_NBBINS] = window_size / 2; + values[VAR_CHANNELS] = inlink->ch_layout.nb_channels; + + ff_filter_execute(ctx, tx_channel, NULL, NULL, + FFMIN(s->channels, ff_filter_get_nb_threads(ctx))); + + ff_filter_execute(ctx, filter_channel, values, NULL, + FFMIN(s->channels, ff_filter_get_nb_threads(ctx))); + out = ff_get_audio_buffer(outlink, s->hop_size); if (!out) { ret = AVERROR(ENOMEM); @@ -360,10 +399,12 @@ static av_cold void uninit(AVFilterContext *ctx) AFFTFiltContext *s = ctx->priv; int i; - av_tx_uninit(&s->fft); - av_tx_uninit(&s->ifft); for (i = 0; i < s->channels; i++) { + if (s->ifft) + av_tx_uninit(&s->ifft[i]); + if (s->fft) + av_tx_uninit(&s->fft[i]); if (s->fft_in) av_freep(&s->fft_in[i]); if (s->fft_out) @@ -371,6 +412,9 @@ static av_cold void uninit(AVFilterContext *ctx) if (s->fft_temp) av_freep(&s->fft_temp[i]); } + + av_freep(&s->fft); + av_freep(&s->ifft); av_freep(&s->fft_in); av_freep(&s->fft_out); av_freep(&s->fft_temp); @@ -412,5 +456,6 @@ const AVFilter ff_af_afftfilt = { FILTER_SINGLE_SAMPLEFMT(AV_SAMPLE_FMT_FLTP), .activate = activate, .uninit = uninit, - .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL, + .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_INTERNAL | + AVFILTER_FLAG_SLICE_THREADS, };

1 0

Switch uses of av_fopen_utf8 to avpriv_fopen_utf8
by Martin Storsjö 23 May '22

23 May '22

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Fri May 20 14:55:46 2022 +0300| [6076dbcb55d0c9b6693d1acad12a63f7268301aa] | committer: Martin Storsjö Switch uses of av_fopen_utf8 to avpriv_fopen_utf8 The former has been deprecated. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6076dbcb55d0c9b66… --- libavfilter/af_arnndn.c | 2 +- libavfilter/opencl.c | 2 +- libavfilter/vf_curves.c | 2 +- libavfilter/vf_dnn_classify.c | 2 +- libavfilter/vf_dnn_detect.c | 2 +- libavfilter/vf_fieldhint.c | 2 +- libavfilter/vf_lut3d.c | 4 ++-- libavfilter/vf_nnedi.c | 2 +- libavfilter/vf_paletteuse.c | 2 +- libavformat/ipfsgateway.c | 2 +- 10 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libavfilter/af_arnndn.c b/libavfilter/af_arnndn.c index fe562e81a1..5e3403ca6a 100644 --- a/libavfilter/af_arnndn.c +++ b/libavfilter/af_arnndn.c @@ -1478,7 +1478,7 @@ static int open_model(AVFilterContext *ctx, RNNModel **model) if (!s->model_name) return AVERROR(EINVAL); - f = av_fopen_utf8(s->model_name, "r"); + f = avpriv_fopen_utf8(s->model_name, "r"); if (!f) { av_log(ctx, AV_LOG_ERROR, "Failed to open model file: %s\n", s->model_name); return AVERROR(EINVAL); diff --git a/libavfilter/opencl.c b/libavfilter/opencl.c index 70d5edb78c..c8e7e6e1a5 100644 --- a/libavfilter/opencl.c +++ b/libavfilter/opencl.c @@ -210,7 +210,7 @@ int ff_opencl_filter_load_program_from_file(AVFilterContext *avctx, const char *src_const; int err; - file = av_fopen_utf8(filename, "r"); + file = avpriv_fopen_utf8(filename, "r"); if (!file) { av_log(avctx, AV_LOG_ERROR, "Unable to open program " "source file \"%s\".\n", filename); diff --git a/libavfilter/vf_curves.c b/libavfilter/vf_curves.c index 22a1f8aa70..82e2753f01 100644 --- a/libavfilter/vf_curves.c +++ b/libavfilter/vf_curves.c @@ -416,7 +416,7 @@ static int dump_curves(const char *fname, uint16_t *graph[NB_COMP + 1], AVBPrint buf; const double scale = 1. / (lut_size - 1); static const char * const colors[] = { "red", "green", "blue", "#404040", }; - FILE *f = av_fopen_utf8(fname, "w"); + FILE *f = avpriv_fopen_utf8(fname, "w"); av_assert0(FF_ARRAY_ELEMS(colors) == NB_COMP + 1); diff --git a/libavfilter/vf_dnn_classify.c b/libavfilter/vf_dnn_classify.c index c612ba8e80..852f5ddcee 100644 --- a/libavfilter/vf_dnn_classify.c +++ b/libavfilter/vf_dnn_classify.c @@ -131,7 +131,7 @@ static int read_classify_label_file(AVFilterContext *context) FILE *file; DnnClassifyContext *ctx = context->priv; - file = av_fopen_utf8(ctx->labels_filename, "r"); + file = avpriv_fopen_utf8(ctx->labels_filename, "r"); if (!file){ av_log(context, AV_LOG_ERROR, "failed to open file %s\n", ctx->labels_filename); return AVERROR(EINVAL); diff --git a/libavfilter/vf_dnn_detect.c b/libavfilter/vf_dnn_detect.c index dd4507250f..68bd2cd0c3 100644 --- a/libavfilter/vf_dnn_detect.c +++ b/libavfilter/vf_dnn_detect.c @@ -244,7 +244,7 @@ static int read_detect_label_file(AVFilterContext *context) FILE *file; DnnDetectContext *ctx = context->priv; - file = av_fopen_utf8(ctx->labels_filename, "r"); + file = avpriv_fopen_utf8(ctx->labels_filename, "r"); if (!file){ av_log(context, AV_LOG_ERROR, "failed to open file %s\n", ctx->labels_filename); return AVERROR(EINVAL); diff --git a/libavfilter/vf_fieldhint.c b/libavfilter/vf_fieldhint.c index e7afac1116..e6061c6d3c 100644 --- a/libavfilter/vf_fieldhint.c +++ b/libavfilter/vf_fieldhint.c @@ -73,7 +73,7 @@ static av_cold int init(AVFilterContext *ctx) av_log(ctx, AV_LOG_ERROR, "Hint file must be set.\n"); return AVERROR(EINVAL); } - s->hint = av_fopen_utf8(s->hint_file_str, "r"); + s->hint = avpriv_fopen_utf8(s->hint_file_str, "r"); if (!s->hint) { ret = AVERROR(errno); av_log(ctx, AV_LOG_ERROR, "%s: %s\n", s->hint_file_str, av_err2str(ret)); diff --git a/libavfilter/vf_lut3d.c b/libavfilter/vf_lut3d.c index a5190b6688..c7ecb7018e 100644 --- a/libavfilter/vf_lut3d.c +++ b/libavfilter/vf_lut3d.c @@ -1243,7 +1243,7 @@ static av_cold int lut3d_init(AVFilterContext *ctx) return set_identity_matrix(ctx, 32); } - f = av_fopen_utf8(lut3d->file, "r"); + f = avpriv_fopen_utf8(lut3d->file, "r"); if (!f) { ret = AVERROR(errno); av_log(ctx, AV_LOG_ERROR, "%s: %s\n", lut3d->file, av_err2str(ret)); @@ -2134,7 +2134,7 @@ static av_cold int lut1d_init(AVFilterContext *ctx) return 0; } - f = av_fopen_utf8(lut1d->file, "r"); + f = avpriv_fopen_utf8(lut1d->file, "r"); if (!f) { ret = AVERROR(errno); av_log(ctx, AV_LOG_ERROR, "%s: %s\n", lut1d->file, av_err2str(ret)); diff --git a/libavfilter/vf_nnedi.c b/libavfilter/vf_nnedi.c index 370f643678..e5a16918bd 100644 --- a/libavfilter/vf_nnedi.c +++ b/libavfilter/vf_nnedi.c @@ -957,7 +957,7 @@ static av_cold int init(AVFilterContext *ctx) size_t bytes_read; int ret = 0; - weights_file = av_fopen_utf8(s->weights_file, "rb"); + weights_file = avpriv_fopen_utf8(s->weights_file, "rb"); if (!weights_file) { av_log(ctx, AV_LOG_ERROR, "No weights file provided, aborting!\n"); return AVERROR(EINVAL); diff --git a/libavfilter/vf_paletteuse.c b/libavfilter/vf_paletteuse.c index e57882a64c..5c491a290c 100644 --- a/libavfilter/vf_paletteuse.c +++ b/libavfilter/vf_paletteuse.c @@ -538,7 +538,7 @@ static void disp_node(AVBPrint *buf, static int disp_tree(const struct color_node *node, const char *fname) { AVBPrint buf; - FILE *f = av_fopen_utf8(fname, "w"); + FILE *f = avpriv_fopen_utf8(fname, "w"); if (!f) { int ret = AVERROR(errno); diff --git a/libavformat/ipfsgateway.c b/libavformat/ipfsgateway.c index 9b0d3dea59..83d52293b4 100644 --- a/libavformat/ipfsgateway.c +++ b/libavformat/ipfsgateway.c @@ -139,7 +139,7 @@ static int populate_ipfs_gateway(URLContext *h) } // Get the contents of the gateway file. - gateway_file = av_fopen_utf8(ipfs_gateway_file, "r"); + gateway_file = avpriv_fopen_utf8(ipfs_gateway_file, "r"); if (!gateway_file) { av_log(h, AV_LOG_WARNING, "The IPFS gateway file (full uri: %s) doesn't exist. "

1 0

libavutil: Deprecate av_fopen_utf8, provide an avpriv version
by Martin Storsjö 23 May '22

23 May '22

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Fri May 20 14:45:21 2022 +0300| [4cdc14aa955805931b918d30d9c7349ab924dd52] | committer: Martin Storsjö libavutil: Deprecate av_fopen_utf8, provide an avpriv version Since every DLL can use an individual CRT on Windows, having an exported function that opens a FILE* won't work if that FILE* is going to be used from a different DLL (or from user application code). Internally within the libraries, the issue can be worked around by duplicating the function in all libraries (this already happened implicitly because the function resided in file_open.c) and renaming the function to ff_fopen_utf8 (so that it doesn't end up exported from the DLLs) and duplicating it in all libraries that use it. This makes the avpriv_fopen_utf8 / ff_fopen_utf8 function work in the exact same way as the existing avpriv_open / ff_open, with the same setup as introduced in e743e7ae6ee7e535c4394bec6fe6650d2b0dbf65. That mechanism doesn't work for external users, thus deprecate the existing function. Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4cdc14aa955805931… --- doc/APIchanges | 3 +++ fftools/fopen_utf8.h | 2 +- libavfilter/Makefile | 1 + libavfilter/file_open.c | 1 + libavutil/avutil.h | 6 ++++++ libavutil/file_open.c | 9 ++++++++- libavutil/internal.h | 8 ++++++++ libavutil/version.h | 5 +++-- tests/ref/fate/source | 1 + 9 files changed, 32 insertions(+), 4 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 1a9f0a303e..337f1466d8 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -14,6 +14,9 @@ libavutil: 2021-04-27 API changes, most recent first: +2022-05-23 - xxxxxxxxx - lavu 57.25.100 - avutil.h + Deprecate av_fopen_utf8() without replacement. + 2022-03-16 - xxxxxxxxxx - all libraries - version_major.h Add lib<name>/version_major.h as new installed headers, which only contain the major version number (and corresponding API deprecation diff --git a/fftools/fopen_utf8.h b/fftools/fopen_utf8.h index db57fcaec4..cd18fe8ce1 100644 --- a/fftools/fopen_utf8.h +++ b/fftools/fopen_utf8.h @@ -21,7 +21,7 @@ #include <stdio.h> -/* The fopen_utf8 function here is essentially equivalent to av_fopen_utf8, +/* The fopen_utf8 function here is essentially equivalent to avpriv_fopen_utf8, * except that it doesn't set O_CLOEXEC, and that it isn't exported * from a different library. (On Windows, each DLL might use a different * CRT, and FILE* handles can't be shared across them.) */ diff --git a/libavfilter/Makefile b/libavfilter/Makefile index ee2ea51e69..78ccfa37d3 100644 --- a/libavfilter/Makefile +++ b/libavfilter/Makefile @@ -23,6 +23,7 @@ OBJS = allfilters.o \ version.o \ video.o \ +OBJS-$(HAVE_LIBC_MSVCRT) += file_open.o OBJS-$(HAVE_THREADS) += pthread.o # subsystems diff --git a/libavfilter/file_open.c b/libavfilter/file_open.c new file mode 100644 index 0000000000..494a5d37a4 --- /dev/null +++ b/libavfilter/file_open.c @@ -0,0 +1 @@ +#include "libavutil/file_open.c" diff --git a/libavutil/avutil.h b/libavutil/avutil.h index 4d633156d1..64b68bdbd3 100644 --- a/libavutil/avutil.h +++ b/libavutil/avutil.h @@ -331,12 +331,18 @@ unsigned av_int_list_length_for_size(unsigned elsize, #define av_int_list_length(list, term) \ av_int_list_length_for_size(sizeof(*(list)), list, term) +#if FF_API_AV_FOPEN_UTF8 /** * Open a file using a UTF-8 filename. * The API of this function matches POSIX fopen(), errors are returned through * errno. + * @deprecated Avoid using it, as on Windows, the FILE* allocated by this + * function may be allocated with a different CRT than the caller + * who uses the FILE*. No replacement provided in public API. */ +attribute_deprecated FILE *av_fopen_utf8(const char *path, const char *mode); +#endif /** * Return the fractional representation of the internal time base. diff --git a/libavutil/file_open.c b/libavutil/file_open.c index cc302f2f76..fb64c2e4ee 100644 --- a/libavutil/file_open.c +++ b/libavutil/file_open.c @@ -155,7 +155,7 @@ int avpriv_tempfile(const char *prefix, char **filename, int log_offset, void *l return fd; /* success */ } -FILE *av_fopen_utf8(const char *path, const char *mode) +FILE *avpriv_fopen_utf8(const char *path, const char *mode) { int fd; int access; @@ -188,3 +188,10 @@ FILE *av_fopen_utf8(const char *path, const char *mode) return NULL; return fdopen(fd, mode); } + +#if FF_API_AV_FOPEN_UTF8 +FILE *av_fopen_utf8(const char *path, const char *mode) +{ + return avpriv_fopen_utf8(path, mode); +} +#endif diff --git a/libavutil/internal.h b/libavutil/internal.h index 79c2130be0..b44cbaaa7b 100644 --- a/libavutil/internal.h +++ b/libavutil/internal.h @@ -37,6 +37,7 @@ #include <stdint.h> #include <stddef.h> #include <assert.h> +#include <stdio.h> #include "config.h" #include "attributes.h" #include "timer.h" @@ -183,8 +184,10 @@ void avpriv_request_sample(void *avc, #pragma comment(linker, "/include:" EXTERN_PREFIX "avpriv_snprintf") #endif +#define avpriv_fopen_utf8 ff_fopen_utf8 #define avpriv_open ff_open #define avpriv_tempfile ff_tempfile + #define PTRDIFF_SPECIFIER "Id" #define SIZE_SPECIFIER "Iu" #else @@ -256,6 +259,11 @@ static av_always_inline av_const int64_t ff_rint64_clip(double a, int64_t amin, av_warn_unused_result int avpriv_open(const char *filename, int flags, ...); +/** + * Open a file using a UTF-8 filename. + */ +FILE *avpriv_fopen_utf8(const char *path, const char *mode); + /** * Wrapper to work around the lack of mkstemp() on mingw. * Also, tries to create file in /tmp first, if possible. diff --git a/libavutil/version.h b/libavutil/version.h index 6735c20090..1b4b41d81f 100644 --- a/libavutil/version.h +++ b/libavutil/version.h @@ -79,8 +79,8 @@ */ #define LIBAVUTIL_VERSION_MAJOR 57 -#define LIBAVUTIL_VERSION_MINOR 24 -#define LIBAVUTIL_VERSION_MICRO 101 +#define LIBAVUTIL_VERSION_MINOR 25 +#define LIBAVUTIL_VERSION_MICRO 100 #define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \ LIBAVUTIL_VERSION_MINOR, \ @@ -113,6 +113,7 @@ #define FF_API_FIFO_OLD_API (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_XVMC (LIBAVUTIL_VERSION_MAJOR < 58) #define FF_API_OLD_CHANNEL_LAYOUT (LIBAVUTIL_VERSION_MAJOR < 58) +#define FF_API_AV_FOPEN_UTF8 (LIBAVUTIL_VERSION_MAJOR < 58) /** * @} diff --git a/tests/ref/fate/source b/tests/ref/fate/source index 69dcdc4f27..16ea7ef9c1 100644 --- a/tests/ref/fate/source +++ b/tests/ref/fate/source @@ -8,6 +8,7 @@ libavcodec/reverse.c libavdevice/file_open.c libavdevice/reverse.c libavfilter/af_arnndn.c +libavfilter/file_open.c libavfilter/log2_tab.c libavformat/file_open.c libavformat/golomb_tab.c

1 0

fftools: Stop using av_fopen_utf8
by Martin Storsjö 23 May '22

23 May '22

ffmpeg | branch: master | Martin Storsjö <martin(a)martin.st> | Fri May 20 23:37:15 2022 +0300| [3fb924464244bc317a5d19ab25625ae35abde512] | committer: Martin Storsjö fftools: Stop using av_fopen_utf8 Provide a header based inline reimplementation of it. Using av_fopen_utf8 doesn't work outside of the libraries when built with MSVC as shared libraries (in the default configuration, where each DLL gets a separate statically linked CRT). Signed-off-by: Martin Storsjö <martin(a)martin.st> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3fb924464244bc317… --- fftools/ffmpeg_opt.c | 3 ++- fftools/fopen_utf8.h | 71 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 73 insertions(+), 1 deletion(-) diff --git a/fftools/ffmpeg_opt.c b/fftools/ffmpeg_opt.c index 47e8b9b7bd..a5cd989d35 100644 --- a/fftools/ffmpeg_opt.c +++ b/fftools/ffmpeg_opt.c @@ -28,6 +28,7 @@ #endif #include "ffmpeg.h" +#include "fopen_utf8.h" #include "cmdutils.h" #include "opt_common.h" @@ -1882,7 +1883,7 @@ static OutputStream *new_video_stream(OptionsContext *o, AVFormatContext *oc, in video_enc->stats_in = logbuffer; } if (video_enc->flags & AV_CODEC_FLAG_PASS1) { - f = av_fopen_utf8(logfilename, "wb"); + f = fopen_utf8(logfilename, "wb"); if (!f) { av_log(NULL, AV_LOG_FATAL, "Cannot write log file '%s' for pass-1 encoding: %s\n", diff --git a/fftools/fopen_utf8.h b/fftools/fopen_utf8.h new file mode 100644 index 0000000000..db57fcaec4 --- /dev/null +++ b/fftools/fopen_utf8.h @@ -0,0 +1,71 @@ +/* + * This file is part of FFmpeg. + * + * FFmpeg is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * FFmpeg is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with FFmpeg; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef FFTOOLS_FOPEN_UTF8_H +#define FFTOOLS_FOPEN_UTF8_H + +#include <stdio.h> + +/* The fopen_utf8 function here is essentially equivalent to av_fopen_utf8, + * except that it doesn't set O_CLOEXEC, and that it isn't exported + * from a different library. (On Windows, each DLL might use a different + * CRT, and FILE* handles can't be shared across them.) */ + +#ifdef _WIN32 +#include "libavutil/wchar_filename.h" + +static inline FILE *fopen_utf8(const char *path_utf8, const char *mode) +{ + wchar_t *path_w, *mode_w; + FILE *f; + + /* convert UTF-8 to wide chars */ + if (utf8towchar(path_utf8, &path_w)) /* This sets errno on error. */ + return NULL; + if (!path_w) + goto fallback; + + if (utf8towchar(mode, &mode_w)) + return NULL; + if (!mode_w) { + /* If failing to interpret the mode string as utf8, it is an invalid + * parameter. */ + av_freep(&path_w); + errno = EINVAL; + return NULL; + } + + f = _wfopen(path_w, mode_w); + av_freep(&path_w); + av_freep(&mode_w); + + return f; +fallback: + /* path may be in CP_ACP */ + return fopen(path_utf8, mode); +} + +#else + +static inline FILE *fopen_utf8(const char *path, const char *mode) +{ + return fopen(path, mode); +} +#endif + +#endif /* FFTOOLS_FOPEN_UTF8_H */

1 0