From patchwork Mon Sep 23 15:14:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 51765 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2532131vqb; Mon, 23 Sep 2024 08:21:39 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCUOcs5p+2+2JoLtptE7CbP+QGAty/jD8BB8+3HKmqZKF+ayMPVzft6OK2GRnXGTfS/0CJZAxVeyWNeUBPT1epQB@gmail.com X-Google-Smtp-Source: AGHT+IGN6g+EkNSKjRFqmb2CiXmL8YFWhZG7mz5ALw+yPwed2BBYdSM2xawyE6gyqvmf+/5ohEIp X-Received: by 2002:a17:907:d3e4:b0:a77:d52c:c42d with SMTP id a640c23a62f3a-a90d549c411mr1178843466b.13.1727104899130; Mon, 23 Sep 2024 08:21:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727104899; cv=none; d=google.com; s=arc-20240605; b=Ce2vrzGXskWasbcDy7h78TqlmqvkpBFjGpgpSuUJ1LtK1jvbBVl/YrEq5/asP0Ts5k ntJ9/qjVLqdfL4TGqzDYkAlfKSyRtvz+FxzbYtBTwZYJE20sYnYjDANg1kl/8LYCaI/q E931imN+Mqjbj5UxjS25nJ1eMwLbZ0zfgofqpxII8TQLc+23UUfWbZ4v6tnUbVjoWn4q BBqTZaH4wKdV2KuolDgertB/Gu1bKz4MNfJfR25ZuaytOaAkxEPYx5dVdfYEIGmCGN89 NfiYFpnFrjs39Iptcyn290+uTCRBMdSsfmH2H/IZIGN8hqZa9CK7KVxP8LIQua3oLRsk rqxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:date:to:from:message-id :dkim-signature:delivered-to; bh=Yihd5vwPmlPWFpJwAkf0JO6SiWJK6EZiRfTYtYD2Edw=; fh=wek9E6axXVJZM/L90B0QZytKWHbBc1iBO6ghpWIxAD8=; b=J2QE+uuK2gzrd5F2F3pXgrByfVSeALoC1WjuFce3xxln6BBPQCrrmOlWwMTxmw2a8y aUAfXwCnswoqwPIJNKVPFU2iLLJYiRCVIAxfHGd64e9u5TAlJlFKc8JHwuyAez2w6fR+ Su8AY44r+Ovsawc+pVJRBzuJaFUzIl7htuprNARk0ygxB9SR9+dAgpQfdik8g0C6RpAp 8inNhjao4/Ni3lBzYLaDHJ16jVL3d9QfIsrEr7/pL7PEWH8n4MrEdb6p4lgb7G1s/Ilq NbqzN49cb1GbaGFdCFVPWd7ViV3dNVk7LrK9D+bn0fkT/LCq1YAvNk1TbNgI5AMWmTZd tmvQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=X34dHwtm; 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=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id a640c23a62f3a-a9061336c51si1387252866b.777.2024.09.23.08.21.38; Mon, 23 Sep 2024 08:21:39 -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=@foxmail.com header.s=s201512 header.b=X34dHwtm; 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=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2C7B368DBEC; Mon, 23 Sep 2024 18:21:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from xmbghk7.mail.qq.com (xmbghk7.mail.qq.com [43.163.128.49]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5CFBF68D67F for ; Mon, 23 Sep 2024 18:20:51 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1727104830; bh=oFevqIk5jrvUKlGqclOe61GE1PjN0KuligUmSP8pJkM=; h=From:To:Cc:Subject:Date; b=X34dHwtmxgqjO+T+T1WkhCzR8OYyL3kp694+b2uYhC1WjrS+gRN4btAHL8BaxCPUU AysLuy1kyUZ2hVf8+8OUpD+HE1Iqnzo5kCSfxXkn1OXKKa4ztQiTr7qxJsbwdWtOx8 Ea6q/2ugqGlOa7SiAIySvxOylKDhCZ39EDhHmQPI= Received: from ZHILIZHAO-MB1.tencent.com ([113.116.30.244]) by newxmesmtplogicsvrszb16-1.qq.com (NewEsmtp) with SMTP id 395954D3; Mon, 23 Sep 2024 23:14:21 +0800 X-QQ-mid: xmsmtpt1727104461t5hd3fnmy Message-ID: X-QQ-XMAILINFO: NQR8mRxMnur9HhmmRBPQD7wMzCU3FvD2u/bYUPSlVTW/5vs0tFcQxPMvdq31M+ 5vr7PkN8XRSoRVMz5MLQuL5xNQb452qaqNN8ezHRw9gHZNRZV04aGHLCB9Y1EMb74+dcQMCHkRWO 1PU04vMz0+ee3EXp6WfqoMxvymNex2BvGSNVak4UgFCTxVZ8SbdRWCjyG5lNXmpU5p2RF6dStADn jibPc6d1kqgZfIdOndsCcbUjEG0mrtwTanja+AMhRJkQTUM+ne6rMUdGm17aPDyZLA2JM+Bn0GZg cTB1K3Yhyqs5uGQcm8UvvJNukxqnpfRuaZ7N7tmojBd7lACGgfNvMumINYKKzVzklmSem3YmCzta WyLatqqEiSs1l8O8ak/yPBxOZrvqnoSrwmA7SEwwaXyDKTVa74PUKdJkDa/F1GQwjW83Z/glGAa8 jYqymQS6eGdtg/bGq9nH3MjF5twuz/xC0WnuRC0TsxwMcU33+/b51bbiB6LXLLqslZRkDta0dTXJ xisPhXC+o1F03xa+LhbiX4ridI/tPNVN6yKYdLWqLHVx9OgcOv9488w/C90gOL1e58YkyCcTr1to CgqPjfP7GQOks4VT+jbI5EYstbU+7CUMv+NER6iqqeHqGjlmoGNM7vIac0Dc/Km8SqJdthImmAQp G1nk4b2NjkcgNyN/C0VudK/hjAAlvBGjrpc5OadaHMGMW0jsWYeX/oF4X33FuHoH41gqWgYCRf8m 1HhBCqasYPzXiMFinqi8exvYaTUDiwUkO0aadMGDKBMCOMipHhw0IPWpui0Cv01g4ikNs7wbQ7Zf mdW1DEbadPeBOaMES0ItkQURFRdGWge8EPxJN+OJghL5nSzartlVpdr4/533RAPVfzDIME4WdHwO 0vfUHsEeJCLFz05aqUwN30XrKZtlvRjPShOKrdq4VJ1RG/aDxGxafi/9A3Xydsmj62fduySvIZa2 MO/thaVjo8fHD6v8tzl/uL0/GW7cx7PIxizieCIIXIJEBea1Jm607hpqBsHC3M+Bm54VpLo4m3Ml YthAzgk6tKVt7ObKKah9TLfLZPZLQtuQUwT8CAqjPCPzErIqu5cmTeYjoDFgw= X-QQ-XMRINFO: NyFYKkN4Ny6FSmKK/uo/jdU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Sep 2024 23:14:19 +0800 X-OQ-MSGID: <20240923151420.82962-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 1/2] avformat/internal: Add ff_get_frame_filename 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: Zhao Zhili , =?utf-8?b?RmlsaXAgTWHFoWnEhw==?= Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: o0/I4FIewZwf From: Zhao Zhili It's similar to av_get_frame_filename2 but with int64_t number support. Make av_get_frame_filename* a wrapper over ff_get_frame_filename. Co-authored-by: Filip Mašić --- libavformat/internal.h | 16 ++++++++++++++++ libavformat/utils.c | 11 ++++++++--- 2 files changed, 24 insertions(+), 3 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index 8e8971bfeb..6c026f08a0 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -745,6 +745,22 @@ void ff_format_set_url(AVFormatContext *s, char *url); */ int ff_match_url_ext(const char *url, const char *extensions); +/** + * Return in 'buf' the path with '%d' replaced by a number. + * + * Also handles the '%0nd' format where 'n' is the total number + * of digits and '%%'. + * + * @param buf destination buffer + * @param buf_size destination buffer size + * @param path path with substitution template + * @param number the number to substitute + * @param flags AV_FRAME_FILENAME_FLAGS_* + * @return 0 if OK, -1 on format error + */ +int ff_get_frame_filename(char *buf, int buf_size, const char *path, + int64_t number, int flags); + struct FFOutputFormat; struct FFInputFormat; void avpriv_register_devices(const struct FFOutputFormat * const o[], diff --git a/libavformat/utils.c b/libavformat/utils.c index e9ded627ad..e892e8bde7 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -280,7 +280,7 @@ uint64_t ff_parse_ntp_time(uint64_t ntp_ts) return (sec * 1000000) + usec; } -int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number, int flags) +int ff_get_frame_filename(char *buf, int buf_size, const char *path, int64_t number, int flags) { const char *p; char *q, buf1[20], c; @@ -313,7 +313,7 @@ int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number percentd_found = 1; if (number < 0) nd += 1; - snprintf(buf1, sizeof(buf1), "%0*d", nd, number); + snprintf(buf1, sizeof(buf1), "%0*" PRId64, nd, number); len = strlen(buf1); if ((q - buf + len) > buf_size - 1) goto fail; @@ -338,9 +338,14 @@ fail: return -1; } +int av_get_frame_filename2(char *buf, int buf_size, const char *path, int number, int flags) +{ + return ff_get_frame_filename(buf, buf_size, path, number, flags); +} + int av_get_frame_filename(char *buf, int buf_size, const char *path, int number) { - return av_get_frame_filename2(buf, buf_size, path, number, 0); + return ff_get_frame_filename(buf, buf_size, path, number, 0); } void av_url_split(char *proto, int proto_size,