From patchwork Mon May 9 18:52:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Aman Karmani X-Patchwork-Id: 35710 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:a885:b0:7f:4be2:bd17 with SMTP id ca5csp3050497pzb; Mon, 9 May 2022 11:52:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyaqe+fyD7/+8ORt/Sm0nV+VRn/6WL35TivoMGXFM5bE7vNgzwqLmgYa53xLpJln5N/g8lM X-Received: by 2002:a05:6402:3699:b0:428:3846:8222 with SMTP id ej25-20020a056402369900b0042838468222mr18506357edb.205.1652122335540; Mon, 09 May 2022 11:52:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1652122335; cv=none; d=google.com; s=arc-20160816; b=MiPuAPXJ/PKhnlr/PkSmhGz2SXJrhgOlWVq6rlWruhKeh3NqxNNvPGWUb92AziTxZE uQFLTozp3yfM6l9/lwayqWHdWxEHCZ1uUgbIn9s4I3YahK5Nq7BJVI4ALkZ/Wjc2fKm/ 6eILgL2nlKJY5QAHxPta4ilRylcNGhHeFVjxyCeGS2440SrMIsC5jCLsjKuy26zqTKZF hpImPorXtz6vpv1+YPobNk9S936Q7kbj1wrCli6c04XNC2eCjznDj4Nqgon3a3vCnYPp zlfKfSceYDmU0IGkdhaAprJJJWniK9OlnZO3weZpOX9p03rzbhfyKwcRWJkmhmmCEud1 MwoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:to:mime-version:fcc:date:references :in-reply-to:message-id:from:dkim-signature:delivered-to; bh=iezwH+uTGbtWC5xuk+jT02jMfddXM91jd57reumjdik=; b=H6k14VDFmAxNkXpdNcbWZSNNsdfJFJCu7/Vh7fAIrlY8T4IBtpCIFAo31ppYK1Q0UT d+Gg6YKk8sQJ6fysgh9p41rqQle2xEU+JOhwwAmLPXk0RqX0EePJyUCKSuFSaOXmsev5 VNhfFmyeLJyTWapR2IgHoMyQuA+gFOoYInuLyDx0FVtGhGUKJuo5kWWOmBOK4FQGC6wf JB1t7yuPAmvOxEesUdBeTIdMIUUgDYW+xK0oja68a7qeKdr5OYfqXw3WFuqXlp+PT/6l 2XhYbMt93N5tsV0r+F3gcSfwWaTICP+lIhgyJghCWZnnnMkvqVnijWGeUN7h3+v4Q9dU gLUQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=D7NxHlcq; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id b23-20020a1709062b5700b006e8bf488698si13862166ejg.202.2022.05.09.11.52.15; Mon, 09 May 2022 11:52:15 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=D7NxHlcq; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id A050168B3A7; Mon, 9 May 2022 21:52:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C50E268A318 for ; Mon, 9 May 2022 21:52:05 +0300 (EEST) Received: by mail-pg1-f181.google.com with SMTP id e5so12785775pgc.5 for ; Mon, 09 May 2022 11:52:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:message-id:in-reply-to:references:date:subject:fcc :content-transfer-encoding:mime-version:to:cc; bh=sQUhJ+/DT+3D+WuJdjgRY5j6mZ8pQullZ83PBIEkZuY=; b=D7NxHlcqaQjR0/0hgH5dxG0JeexkcjhUUcBW9gp241p6ljQaPwK604DFDm9Pb2ccSX igcBrRC+EheC96cRNux8jVVxUit33g9pvjjrq3P/PH3LL98Yea5TA/CTqer88VZq2Rqv cdfdNO+rrhkmwzsP/GIe79TAFr5Xpwg6/MSXvv5wb7csIxp1wKwXDQP40QsWFxzqkF7K bEJ/imPjjhzo8urfwMqg8dpmNxXV0fnkG0yCUtxgMW0YhdmtdjgEw1LzuKrDK3/eegou j9AHcaja4Qj5ygp89aBwOrr0Ctk7kNqGp6SJUhuiSoXSNI4JBNVSB+NlZOSeqnGJlsv0 8qlw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:message-id:in-reply-to:references:date :subject:fcc:content-transfer-encoding:mime-version:to:cc; bh=sQUhJ+/DT+3D+WuJdjgRY5j6mZ8pQullZ83PBIEkZuY=; b=bqNCxxBNRRafw+ZgITXblgCU1YOEwQhpQkgMpJ8b9xOU79BKBRA9RwjrEav1rgdmke tmsP9EJOWdn/BEsGNuDjXKrDjoXqyhPEnDFZG+uRXi9qeAKHdrMClSY32Ba6NvLtxrcT jn4xvnvucQXraeKMy1awIq7vp5zCUXtZN+c7axuQfQe78PEq88CV2eBAap9WI6Xzk0Rb WgijDt319ke0A/0b/kEL41u97z9DiW0pVVddnHfD7rhWbPMuDqWqUuYzPBrHo91wGO0o +s9z7CXx5Ky5mwPYHIW3sTLGtFGaf5fgOgY9HPtjXWspjhCbUHNCec8oMcrTjdFAgxLL 6ORw== X-Gm-Message-State: AOAM530qsAC3wDU0Jngdrgjpper26574hQNI86Uiiy0PbbQqcvk1uvXi 2O/gAvFovAsY9o/bTCrgfcIec2+5G4AqKw== X-Received: by 2002:a63:2c91:0:b0:3c6:bd44:6719 with SMTP id s139-20020a632c91000000b003c6bd446719mr5347782pgs.516.1652122324064; Mon, 09 May 2022 11:52:04 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id y80-20020a626453000000b0050dc7628133sm9287031pfb.13.2022.05.09.11.52.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 09 May 2022 11:52:03 -0700 (PDT) From: softworkz X-Google-Original-From: softworkz Message-Id: In-Reply-To: References: Date: Mon, 09 May 2022 18:52:02 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH v2] avfilter: use av_fopen_utf8() instead of plain fopen() X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Martin =?utf-8?q?Storsj=C3=B6?= , softworkz Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 66iy6HJymYHR From: softworkz Signed-off-by: softworkz --- use av_fopen_utf8() instead of plain fopen() Unify file access operations by replacing usages of direct calls to posix fopen() v2: Remove changes to fftools for now Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-26%2Fsoftworkz%2Fsubmit_replace_fopen-v2 Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-26/softworkz/submit_replace_fopen-v2 Pull-Request: https://github.com/ffstaging/FFmpeg/pull/26 Range-diff vs v1: 1: 5802c8526c < -: ---------- fftools: use av_fopen_utf8() instead of plain fopen() 2: 3266640a93 = 1: e47287be64 avfilter: use av_fopen_utf8() instead of plain fopen() libavfilter/af_firequalizer.c | 2 +- libavfilter/vf_deshake.c | 2 +- libavfilter/vf_signature.c | 4 ++-- libavfilter/vf_ssim.c | 2 +- libavfilter/vf_vmafmotion.c | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) base-commit: f3b7ba21ba49b32b4476a8c7c5a9bcdad15e3943 diff --git a/libavfilter/af_firequalizer.c b/libavfilter/af_firequalizer.c index c19a2fe122..e1497dcef0 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 = av_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..dea69e11cd 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 = av_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_signature.c b/libavfilter/vf_signature.c index 4ca57ebf1d..904123fd4e 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 = av_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 = av_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..4a82cbec06 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 = av_fopen_utf8(s->stats_file_str, "w"); if (!s->stats_file) { int err = AVERROR(errno); char buf[128]; diff --git a/libavfilter/vf_vmafmotion.c b/libavfilter/vf_vmafmotion.c index 8b7e9b17ef..2ac67e5935 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 = av_fopen_utf8(s->stats_file_str, "w"); if (!s->stats_file) { int err = AVERROR(errno); char buf[128];