From patchwork Mon Sep 23 12:17:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 51746 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:d154:0:b0:48e:c0f8:d0de with SMTP id bt20csp2410991vqb; Mon, 23 Sep 2024 05:17:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVWZe5uIzAyGQEBh7M/l8RQqP/NgOWckfqDRTcBzNvb4eO6bTmoSfEIC09gdyYGAEA82ji2/Gikdz8fJogMLVkv@gmail.com X-Google-Smtp-Source: AGHT+IG2oG+GBPu+4aYSCzKzb19ho2ccX/doQNxCUaEp8TjkdtgwZeLgp/1+l01OzUj0hT8vVTvj X-Received: by 2002:a2e:709:0:b0:2f5:c13:bd11 with SMTP id 38308e7fff4ca-2f7cc365ec9mr41366831fa.17.1727093873431; Mon, 23 Sep 2024 05:17:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1727093873; cv=none; d=google.com; s=arc-20240605; b=Q+j//8J+ZlszEg8EIFetobCKg6VrzcVr1fHsWcS+y7cun6cxkVg0R190QYgqjG/+K6 8lgWaMNH2Qk/wHVYyxj/CFbLluDFNJGaMSSmSa8Yv7GTmdDaRBVaI8ssfxyTibDiWTtD 3j6B+8WLffCFu5AsVocJJuucg2nIz/kqtQ2J1ifVznjVp7vlIH/hAtykqkMb7KW5wFop RyOQ9ymnZtlxujhOlg7/xL5vFGmVW4vVMzej3gAy0HJxglJfAhUkZtRtpA6pwNH1daNh zACnVZnf4SrJrRb09nXmlHPcW9hCKsWzy2DN12REohh+By/XHkVHVysVkYsFekiPjLxq E0ew== 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=Iy3ZjibcqMhkBIzq5TElKMDuaSIOxdC0BL6HEdKRKjI=; fh=HnHYuZ9XgUo86ZRXTLWWmQxhslYEI9B9taZ5X1DLFfc=; b=O2FBX/SfmSIkLeMi6DsxQzij7Y7sqtYmhz2tJU84/vMcqzke2pFUXneuvDivMNZAqR y3aYZYQhmSHpHXn+n4EKFJ/Ijt+O5mCLio/wdH9MHrKpChzs39wRWkFj6CyIbugURru4 Ki4pq2fJ1+5WORC/sJaz9rvXmPgetfYYq745GYvg2zJ5X//F8i4KCn1akYyZDRkdD3FA WUn8ZfbZF/06OZIvuCa3yd/uaaOVpODEJCEy7x+kDgLsIaafF0WZqGLrkc4hFBA/isAw EVFLyVBcHp4ynDdVNAjvwQdmxFsnFGV9V+Io3YjbGvDICidGhvLyHCq1tIDn1RofDEhm xYvw==; 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=KT4l9Fmj; 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 38308e7fff4ca-2f79d35d97bsi62725071fa.283.2024.09.23.05.17.52; Mon, 23 Sep 2024 05:17:53 -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=KT4l9Fmj; 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 9A1B668D9D1; Mon, 23 Sep 2024 15:17:48 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-57-252.mail.qq.com (out162-62-57-252.mail.qq.com [162.62.57.252]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 2883A68D8F2 for ; Mon, 23 Sep 2024 15:17:40 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1727093852; bh=He4Ye1swvAEo0GceC3cbz9gutbMJJCiGddwVz3qjwxA=; h=From:To:Cc:Subject:Date; b=KT4l9FmjA/vZ5LWh2hhkI4cIqhp11OLepCr3D0V38h4Ay6+0v16k+1KcrSlhjPEt1 U8Xn8gEbrBR7I5PVlW50O7pnDhHxsuQzItcWEy8GOKkxqXTiK2PaWYS3LgQx4F6FcE 7xF5D6aATxneoHlLeAfJVFsH34+iMqgwwIKjk8qs= Received: from ZHILIZHAO-MB1.tencent.com ([119.147.10.197]) by newxmesmtplogicsvrszb9-0.qq.com (NewEsmtp) with SMTP id 45E9E60F; Mon, 23 Sep 2024 20:17:30 +0800 X-QQ-mid: xmsmtpt1727093850t859c9mx3 Message-ID: X-QQ-XMAILINFO: NVWFp5Du+TZMkBkPZtTsn3Nh0USFCu8ShH6v7XsYidLE0xwxqFCJ9b5/lXSEY0 hHvYx8tD99yrb1yT/kejBzypwxSP4T0rekAKJ8a/G2fHK144Ownns+XBI+AN2CJzoy5gNM5oRIRB iazsqrrob5kKd7G+2kAFqX24e9Hy2/zhOL5LGO+CFEeO+mxkBL8DaHIxXbKmij34nLa5t4yLWNbm 9T4S13a+pR5cKW8mwKq6fROW//dKiyQoWINW1MQjzI8l5Ki/cuQ3KyypQU91aEVRplgQfa8DBoft sMJwdxhijj6epZtWLXRrqNI+OdV3Yvc4/gkgQ48jsRtUAIDyrNj/7+rtos55CeqUXYvWqH249DHB 7e6wlo5iGd2uRZaLIqljmMY3C+vb97MPnArNCKfYX33KHieZpnaxEC5vJXwAuRBk1KEn1vh7ZX9m 8z+IH8vBpMoxr3o7o7RleEm21K92roySuxcAuMNtT8LLvNH48YIRI1pFecLqfeD49+8BAXz10XiE +pd6arPRRV9KK90m6CcsEJa6FzSFwYpA+AQXuJ82QUyCNZ/v+IuZ9M+4gi77aF8bO1QuEqdt+xQb yho/BL0PuLb5T0ArSCayiwmL//8SLuejJSJUNgJMMh3LeZe62LRF/4UkIYZgYX5nSq1UDvwQthde WITZYgaH5swj6BTmBkbvT3nly/knIG+l+fk2nxRW3GKwoJqIM4r3hPJw2h5eZ3zgpMJAAPt35OTe lZom9nlSBAKFj2C3OPGswaK3xFKrJuYwo8XI1xPGsENN76wRit+v06QHe6edo37KvwYZY8nR5MIR nHYjCea/WLXsu9CxAd8qeBNF1vhsepWePXOmhaI95aW7x+C5QVPTASQ2rdkJrmwR/tGKBaDutgYO RD3KrUAGrk+SF88m4gyRgih/j/dNvnEUohOvpWo6nT52ufM25pMdSf+Q6q06Pq2gTbFShgdKsV6O rm4NRe0rJG3CZYIDZcayGXeDuMpJt8fkKu4eZ8wW3h6uhk/GirZ/J8ABQE872nK5tRk7QlyBKXNd 1WoAKspA== X-QQ-XMRINFO: OD9hHCdaPRBwq3WW+NvGbIU= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Mon, 23 Sep 2024 20:17:27 +0800 X-OQ-MSGID: <20240923121728.45145-1-quinkblack@foxmail.com> X-Mailer: git-send-email 2.42.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 68nN7zgx8zDW 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. --- 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..0b200dafd4 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 numbered sequence string + * @param number any number like timestamp or frame number + * @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,