From patchwork Mon Sep 23 15:10:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 51764 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2529174vqb; Mon, 23 Sep 2024 08:17:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV8hu6D5pFKbCK7BlpHgkmIvx3iT6Mp+ipq0rRw51MJlGiGyVaRPZFEXHxOo1KiF5tbYq/8qCcV8OQX9xef6KBL@gmail.com X-Google-Smtp-Source: AGHT+IHadbCWdb5IW41dzbC6XP+bPTA4sQa9DUaUUzPRtmWufmYeaEhSIgE4Ku2p+NvipLgIdD2e X-Received: by 2002:adf:e64b:0:b0:378:9560:32f with SMTP id ffacd0b85a97d-37b7d0d29a7mr1310352f8f.12.1727104645298; Mon, 23 Sep 2024 08:17:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727104645; cv=none; d=google.com; s=arc-20240605; b=WCnz+Gk9J+L0XiVdeq3LZomrjEe99HnZYfgPlY9sKriu3zoVlRi3GcnBR3+a2cz2Jd z1AtM3axuIXsSkWlQMu/ORtXKmvCzenBNtq6UlvbqrcgqbmIWEWtmrrWmme1t1kcMCCg iJx8Yl1ydJ3l4WgFL7QkMVyYisJ6ZZJA7KojuPlGpAycAcIe5JPAYFur7/VyE3btIv3g GhMVgEqodxxMGVyPEEpAcnof+0d+6Roa8DCtqq91TvHue926hWPSebc3F1EeMOCBnoar I+7dU36i/dw4qpIsBvPQJulnOA3zyW7VYJiqvMXVrguw6JOaMX3GdpSL+OOJYTINumO4 60iQ== 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=Z2QuGVVUSSu2yIWNcs0ASrKN16KTNG/YVQjRoYQK3al9nXAPqCjhvyGfhgSIgyrEYW lC//0xtoCiYsOBiHasIi+kziKRPdIjuNQTeYzF0Rg5VIkr4y2EOSkvJKNfMTF8zeZCiZ 3LxnJ5hMxCsSa6IQqhRubXmJyrCBeHseNXQz8Yko0kkiuxeBYHHFc0bF+8S6F/ArSSWC RvweAFZFh3OpGJMrC1cD9En47/agcP2pXyw+TfN95Xp+59oYZsjrqJodqXLjYrCaL3nZ Y1pBsVsOyx1cBf9rr4Dt2NuqXU43gj3LjaZfKAdZ3N3qzSoaH0EZZLp3iAAuEobEWDBw WMAQ==; 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=s8hmBFWi; 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-a90612cab44si1359468266b.384.2024.09.23.08.17.24; Mon, 23 Sep 2024 08:17:25 -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=s8hmBFWi; 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 06D0D68D6A7; Mon, 23 Sep 2024 18:17:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out203-205-221-149.mail.qq.com (out203-205-221-149.mail.qq.com [203.205.221.149]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B6A3D68D93D for ; Mon, 23 Sep 2024 18:17:12 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1727104628; bh=oFevqIk5jrvUKlGqclOe61GE1PjN0KuligUmSP8pJkM=; h=From:To:Cc:Subject:Date; b=s8hmBFWiM7f/u725GMIjfEdPrueKeRNr5PkBESiay8jxRxvsfRb07NlDZS9JkFR2y edRZNZZ1z1ZhuloCBWgvTYZ1OGwQGBrvkLSQyheU5ZPSDprtAm7NH4qSiMN+NUgEXo NxGA5AC61Ji0bscJoIoVst7ODWC6ggeUo1/NqiSc= Received: from ZHILIZHAO-MB1.tencent.com ([113.116.30.244]) by newxmesmtplogicsvrszc5-2.qq.com (NewEsmtp) with SMTP id 2BA81208; Mon, 23 Sep 2024 23:10:58 +0800 X-QQ-mid: xmsmtpt1727104258t4lmrwrm5 Message-ID: X-QQ-XMAILINFO: NvH2zBBgt3uTYCGzj8i1/Vlm937oYZfSOV3zTmAtx+0CoQphuaOw4uRu/iQvM3 4Ct4PNW99GGr82PhnshKEV7jPxSxJby85HU3qrQ6Hm7HMxFeg064tjJcDktP6gVir+OSWqJYjbTE ZJ1vklKORnNRVCY7rbYo4nVW0KWtrev8nlezoHHRRbf09hA7x5K7g+EGbm5uO3JEALIDGdsPZYrQ +/nhJ9lcYWa10BeusZNnnkC5KxyZKvoA76jI/v86+Wo2IZR77PTZMjCBoKT7iCAV77v46JO9UprX T1ARvb76N8vph9/LCcoD+dhyidveFpGbG7TuukCvQTViQeo0988mtRwYj5Y7vGCgBaCayxt5dvM9 +9ctuFnZ1CVe4UJq/BPzogQm+hPdI4joV7dFl2UFOusN/WLpeKFRXybsrmTkDSERJ1xeagh9o9sq wNuiYXcPIROlMEyIPOpHkE01FhtWlaa1UQ0wllHRevaiNmOy534ucPNRljvEHzR7pF2JilHyTJyg J+Y/XMEHKk1WHU1RbIoQryrbf5b5IjDGuJQANR7Ix8wKx0eSOV5flV4mc599JaQfyfKtsT0gXs4S yr6D9XEBpbiH56I+lwkphRE5WiMtkcW1jMDU18v0gXsvklnzUKB8+rJ7hMZaTNxGb2fjR6NPp7Gp wBluipfY2lY+wiB+/P8nEvPGUKNt4vlIqecK97zcSyfwI01uMiBobxyNLiHMenv6WnA88ZigEwCc 1IHPHfncmdTts/dE+o7FEOcQezYVevpTtGFX7HPqtp24dVtQTPbVOE4ZnrNG6JznZYNnLVGRifXF vJdMiqYabRapxec0kBaBw8QOxOLlZ4vAQdp5qjVOuBnOf495coEQuBbcluviL+kvt9ZUl+0RfXq4 xaVyeYCmd3JahqqShIye7ENh2sNIPNvo7sRl4Ih4vbgQ9+K+Y9elEFOikipqTCWG+qhmwvG9eDHq kx+XClTvvQ9B+maiiQm75Ni6DXihnWNzDp56vCL0izKaDo/mxAWJB7S8rEONFoL62om4sfBdo= X-QQ-XMRINFO: Mp0Kj//9VHAxr69bL5MkOOs= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Sep 2024 23:10:55 +0800 X-OQ-MSGID: <20240923151056.82011-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: LmDREYqgCui4 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,