From patchwork Fri Mar 11 17:16:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pierre-Anthony Lemieux X-Patchwork-Id: 34710 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1887684nkb; Fri, 11 Mar 2022 09:18:12 -0800 (PST) X-Google-Smtp-Source: ABdhPJzgexvK+sfMDg8y0wf/i3Q7mZPRhI7CdiNIYdT22nghn9m5BuFo1hl2ylnc1R+1iYGwT51y X-Received: by 2002:a17:907:7d8e:b0:6d7:12a2:a962 with SMTP id oz14-20020a1709077d8e00b006d712a2a962mr9552890ejc.565.1647019092684; Fri, 11 Mar 2022 09:18:12 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647019092; cv=none; d=google.com; s=arc-20160816; b=AYi/Vw82W1DSOtpktsmG0FLu0Gwatb87DuVG/usb0IR4D8Rj8TK46Zifmq6SeJKf65 VGF1Qwtsgjb8qB24UbSvV8xmB1I12ajbmbOehEORdF6QBL9KyED2vNXfyJD5gHfW6si/ EtS1f7WwndhOx9dYRANPJ91H+psbbw8iPQXQT7xmWFz9rAsCAwmqnrZP4gPqZkGwtERI Hks18oa0gk9aMJhqnu2NxjdwlnGlmBMwYtOX5tL4HDO4q84EyB/jOB1FX8qT1wfBjKlO /xuqysVUddL3f7buPFkMFg4oTqbyrw2VkdJE4D/i1epQQEdUVysV8u/aGvAlYBGTw+wX ZpOQ== 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:mime-version:references:in-reply-to :message-id:date:to:from:delivered-to; bh=adQHsgltQeHS2UnjRjS4TcLvuQRsXl+LhaQUMVUsku4=; b=rjcqwsKKOaiYDdT6/W8+0wlehRMSxX/67p0BSqmO6k4gwLRT21hU6Z1SSVpH1+Nzif vZQzFGcfbfSTyg4riSzVeddYsJQ0u8RL1dOKTVYGjQkO+Hrd8cP7nEoeWi8i6D9MmKeb hN0Gu9ehw9ulojCfTBMI0kxD8FdYkfpj6fNI1X0+uB6yoHNKYoByXhYOIQp2d88z+tYo pRXH40Dd/3ThUV55Mlznc2SeZ7772HPqMNgAbVD33JO+r98eoB2747sV54CBUd0yMozc d3bbOejkdSIEvfn4yMaXandvYfLz0yZt7w7EVHpRxQlCDmiO+gnM5TRl8J1UcZ9Jjfbc 4p0Q== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g13-20020a170906538d00b006db0207c412si5350231ejo.9.2022.03.11.09.18.12; Fri, 11 Mar 2022 09:18:12 -0800 (PST) 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; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 29C4468B1F5; Fri, 11 Mar 2022 19:17:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4D01268B1AD for ; Fri, 11 Mar 2022 19:17:37 +0200 (EET) Received: by mail-pl1-f173.google.com with SMTP id n2so8203397plf.4 for ; Fri, 11 Mar 2022 09:17:37 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=p2eS/ya7SK/Up3j1eIXTbZYev9YJ5Qysfbwmtd5llzE=; b=ZotQSUjSGRvyi6rvnH7nRqxnyWQkOkYXFQpd1wEW1+sL945RlVVeeHxheVMf9hzbNY zofnQBlgCEfmAXAUzKDJuwb9wJoWDlJnRYShI1k1GjNi7JAzpgre49DwMHQReVoY19oM CZ4MbQfk1RoDCkrCHqvUDexC+qSwR2i4yeeFgO11+ve9LlTOBDjxr1BuSXN++3vCJf3V 5hmyECgPEhb0Bbu10MNFd3lxqnr3kFnd99nJtR82ehl8TGLKRxGvj7FkArFCGWS9CO9/ JUsvRF1tBeQ2hSRJsbspF0TwADnuOnBNRLFB9Go95+3rg/yW1OkTlZfKD2w0KRS4gScu oZ2Q== X-Gm-Message-State: AOAM532UshZigQu6U3XwZ3/yfVfH4rJixxhAALczUREPc/bqkBe269Qa A8378itLq42BtiFqMY3Bf7w4ryb5upk= X-Received: by 2002:a17:903:230c:b0:151:93d0:5608 with SMTP id d12-20020a170903230c00b0015193d05608mr11147633plh.167.1647019055354; Fri, 11 Mar 2022 09:17:35 -0800 (PST) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id f22-20020a056a0022d600b004f7a0b47b0dsm147860pfj.109.2022.03.11.09.17.33 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Mar 2022 09:17:35 -0800 (PST) Received: by localhost (sSMTP sendmail emulation); Fri, 11 Mar 2022 09:17:31 -0800 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 09:16:53 -0800 Message-Id: <20220311171653.17420-7-pal@sandflow.com> X-Mailer: git-send-email 2.35.1.windows.2 In-Reply-To: <20220311171653.17420-1-pal@sandflow.com> References: <20220311171653.17420-1-pal@sandflow.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 7/7] avformat/concat: refactor to use ff_rescale_interval() 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: Pierre-Anthony Lemieux Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Zg6OuAC+vSTO From: Pierre-Anthony Lemieux --- libavformat/concatdec.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 0603c6e254..cfe1329105 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -816,16 +816,6 @@ static int concat_read_packet(AVFormatContext *avf, AVPacket *pkt) return 0; } -static void rescale_interval(AVRational tb_in, AVRational tb_out, - int64_t *min_ts, int64_t *ts, int64_t *max_ts) -{ - *ts = av_rescale_q (* ts, tb_in, tb_out); - *min_ts = av_rescale_q_rnd(*min_ts, tb_in, tb_out, - AV_ROUND_UP | AV_ROUND_PASS_MINMAX); - *max_ts = av_rescale_q_rnd(*max_ts, tb_in, tb_out, - AV_ROUND_DOWN | AV_ROUND_PASS_MINMAX); -} - static int try_seek(AVFormatContext *avf, int stream, int64_t min_ts, int64_t ts, int64_t max_ts, int flags) { @@ -838,8 +828,8 @@ static int try_seek(AVFormatContext *avf, int stream, if (stream >= 0) { if (stream >= cat->avf->nb_streams) return AVERROR(EIO); - rescale_interval(AV_TIME_BASE_Q, cat->avf->streams[stream]->time_base, - &min_ts, &ts, &max_ts); + ff_rescale_interval(AV_TIME_BASE_Q, cat->avf->streams[stream]->time_base, + &min_ts, &ts, &max_ts); } return avformat_seek_file(cat->avf, stream, min_ts, ts, max_ts, flags); } @@ -853,8 +843,8 @@ static int real_seek(AVFormatContext *avf, int stream, if (stream >= 0) { if (stream >= avf->nb_streams) return AVERROR(EINVAL); - rescale_interval(avf->streams[stream]->time_base, AV_TIME_BASE_Q, - &min_ts, &ts, &max_ts); + ff_rescale_interval(avf->streams[stream]->time_base, AV_TIME_BASE_Q, + &min_ts, &ts, &max_ts); } left = 0;