From patchwork Fri Mar 11 17:16:52 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: 34711 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1887854nkb; Fri, 11 Mar 2022 09:18:23 -0800 (PST) X-Google-Smtp-Source: ABdhPJxZJ7++8Ul4IBm+ZqNxiq40v+FFLcn/9HMbgTfCRMlNlv2i4Vx6WLluCwiS8dbTbAanQmuc X-Received: by 2002:a05:6402:1e8b:b0:3da:58e6:9a09 with SMTP id f11-20020a0564021e8b00b003da58e69a09mr9658278edf.155.1647019103124; Fri, 11 Mar 2022 09:18:23 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647019103; cv=none; d=google.com; s=arc-20160816; b=IcLNL+JEWgyu7kVmr5H55IV1WScD0YEWoEUk/4s8Z6nExJFwMf6auXQ3rKFQ72g8ts 2feDxyOXmxJTnILWkn4SZ1Pt9ctJd1TYLgCXB1sbp9tJeARbKAJfJ/2igRUL0X0cHFD6 UX6/Wb4D2kl2sOjK7T1NKdt3hogXQ9jny9tCl/0YJyxlOmRjE/XcVO0c3mYxqFR3zPtN jdlrc8rYRO7CCsNmMWnzpq3Rbcsxtuo1bGr9TDSGWVfcUgyNIacUuJ92aw3MIBgpcnbD AEDiihckLoqGkg1wrOKk9AF15E1O4T9Ixmu4WXqCsVoKhgaWvtNmU7LRhdMFRsZB4xlS jpsA== 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=XCUXXmyfBKf1z3nuvGVMphv+mYfOS3qPcNmA7mykuN4=; b=Le101hj89hRPzeslDZQOZhbAPDQrTP9HQVqWnGPhUJz6r//4S6QSrAAphG9XNuyUFh 1SAIcGiWuJu+Z3LGs4OumUr2xCAEAC3SYtpja00qfNGMCo6wrpmmSZEd3bVdesQKfgow Z3EueYmFsIxjG7+Dfm4RRm6Vj9TxDzvYvoUtt9pFgRtsu1TjUclufD6l4Zq9gLO3VKLh 2cSGs0bEJ451Ldh3xb1xfJOtoCZEWpzBVvwTA46NwcFcnZJHA61VsosxKZwKGafk0z/g Tl98MvNM4lNU7nhhg5hbNs/pMCq7HHr8uYCipwZWNx9EgDIo80IZjilFhhHC8meGuggF LBpg== 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 v6-20020a056402348600b004167eee00e7si6089336edc.149.2022.03.11.09.18.22; Fri, 11 Mar 2022 09:18:23 -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 0D8E368B252; Fri, 11 Mar 2022 19:17:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f176.google.com (mail-pg1-f176.google.com [209.85.215.176]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 23E1468B1B5 for ; Fri, 11 Mar 2022 19:17:35 +0200 (EET) Received: by mail-pg1-f176.google.com with SMTP id bc27so7973077pgb.4 for ; Fri, 11 Mar 2022 09:17:35 -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=rPGMObBRuj26RPvSu+2dG8DtZLw1ENbsXIR+DY1VKWM=; b=PD6yaaPaNXe0Ny005qPRbk4aeoRFxFIrbxHW9yUOvmrUAHCz2NpeAGVE2kORVtxtjx Wf3+ruHu5D022B7jQXgjhFq/1y8IbI1YvcdhO0wc/+KG3wYDYXvDvwoa90+cgLB3A8LI 4lXLaaU6Wk3wi8jd9Pl4r0fMj0DAT4sSTgVPbtYMPvImM3GdgiV7ZgCD97/HlPMr6JTu sL2vjmIKTlRAPIJywqbGKjGSanwxduHmVdBwyws5JfNITc2vQmhwDMIos0m+zR6f2QuY VsaqwXsQZTcV0mj2o/hycPgpZgD8LhK0djbbNRJzGlZdl57h8PhDlgYxnVNtHhdKlVVd lFGA== X-Gm-Message-State: AOAM533znlnIA8yu+6Sd172Rf74ZNd5qiBFNlZMton9rH+/amyzswgJo oBoK+T/i+ebNANZXbyr2V3F1wzblDQ4= X-Received: by 2002:a63:3c4:0:b0:380:2287:5f5b with SMTP id 187-20020a6303c4000000b0038022875f5bmr9239181pgd.478.1647019052946; Fri, 11 Mar 2022 09:17:32 -0800 (PST) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id bh6-20020a056a00308600b004f6aa0367f6sm9618082pfb.118.2022.03.11.09.17.31 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Mar 2022 09:17:32 -0800 (PST) Received: by localhost (sSMTP sendmail emulation); Fri, 11 Mar 2022 09:17:29 -0800 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 09:16:52 -0800 Message-Id: <20220311171653.17420-6-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 6/7] avformat/imf: 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: wpy3s9d8s67x From: Pierre-Anthony Lemieux --- libavformat/imfdec.c | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index ac212b05e1..a19e431df3 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -904,14 +904,6 @@ static int imf_probe(const AVProbeData *p) return AVPROBE_SCORE_MAX; } -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 coherent_ts(int64_t ts, AVRational in_tb, AVRational out_tb) { int dst_num; @@ -937,13 +929,13 @@ static int imf_seek(AVFormatContext *s, int stream_index, int64_t min_ts, /* rescale timestamps to Composition edit units */ if (stream_index < 0) - rescale_interval(AV_TIME_BASE_Q, - av_make_q(c->cpl->edit_rate.den, c->cpl->edit_rate.num), - &min_ts, &ts, &max_ts); + ff_rescale_interval(AV_TIME_BASE_Q, + av_make_q(c->cpl->edit_rate.den, c->cpl->edit_rate.num), + &min_ts, &ts, &max_ts); else - rescale_interval(s->streams[stream_index]->time_base, - av_make_q(c->cpl->edit_rate.den, c->cpl->edit_rate.num), - &min_ts, &ts, &max_ts); + ff_rescale_interval(s->streams[stream_index]->time_base, + av_make_q(c->cpl->edit_rate.den, c->cpl->edit_rate.num), + &min_ts, &ts, &max_ts); /* requested timestamp bounds are too close */ if (max_ts < min_ts)