From patchwork Fri Mar 11 17:16:47 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: 34705 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:3486:0:0:0:0 with SMTP id ek6csp1886914nkb; Fri, 11 Mar 2022 09:17:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJyCSuqh5PshrarLUSx3hW9FGHabX8qRLVOgjGM3UAyz2rYrYmti1wIWwrJdtZEflLY8MUzb X-Received: by 2002:a17:906:7751:b0:6ce:e3c:81a6 with SMTP id o17-20020a170906775100b006ce0e3c81a6mr9071504ejn.278.1647019038210; Fri, 11 Mar 2022 09:17:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1647019038; cv=none; d=google.com; s=arc-20160816; b=pqHi8vRlR2QcqfZzlLd6OtS2pRB7FwO2Ut0ypVvC3YYr6V3bq+CsbBNgbk/7llin7A BFdnm90bY+zzY20l+UAeexbne+mk5CafSPbwVMbwXDq+S1x3WowuqKaFRc1HeiKluBhY v/BCZr0nRxDLdUQn02Khf4iuA9IEsBIBI5DFaqHCf3n4/1Gqbvx2sMiFjqi3rD8r5/HW edVoYSZ/7gPgr3AIGKiglvYR+G5PnYx2nJ55QWe7yqSYOQAIv3GXkLvUnLxqbg0gmKx9 Ld8KmqI2xgXKVfVJgExbeISNhbJY+pSBIJJ6VhfwHh6qHOpPcSCwL0koK/ZF+5qKn0nm Ygag== 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:message-id:date:to:from :delivered-to; bh=H+ryIY1krKWeQYvBRstmGSRZW1NrsQLYoYIYsG9bcp4=; b=VlcySNXHm0hf+Vpm5lH72yw7tFb3BjkWk1+9E3hAtoHXx7Ev+gZ7yuxLR3CAJcCHoP OjWEUYcaExCqEyg222j7LOSHnD50e7pnLjEpC31YljTO8cRAv9nz6XrOaMFy48AJe+Ut LroPd/Me8QnsSOEKfVd5imzWABowBuEOu9za6H1uyZt3OP8s41qDC5ugF2A9ny99/b8m a7yPBWbjIq/hk589i8XB1fiO9vbxEBDG63QmcdMMbjkCFWT3ZvrZ6WeeCrXFceMYD5m9 vWyWdf5+a+BUxY9vR9wRGOPsWvbEgUs0a3p1Dd2iuRvtb0EOBkY2tVq7DPPBDXpBI5Ak 73lA== 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 b7-20020a056402278700b004167d797a16si5626292ede.146.2022.03.11.09.17.16; Fri, 11 Mar 2022 09:17:18 -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 CF50768B0E7; Fri, 11 Mar 2022 19:17:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6522668A318 for ; Fri, 11 Mar 2022 19:17:05 +0200 (EET) Received: by mail-pj1-f47.google.com with SMTP id mv5-20020a17090b198500b001bf2a039831so11603426pjb.5 for ; Fri, 11 Mar 2022 09:17:05 -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:mime-version :content-transfer-encoding; bh=EkUEjmi6TQu1/uHyl90//cqLpXaCxAXM/4hR58KLTQw=; b=Tm1A0qFraVgyOd7deCAR0ivo8AxsCgbc/q5fTfalPyAumWTUmsNfpaXzWUNzjQixca sGmHPdGT9F8NkzsyDLNw8l+4U9PBHZmiRqxV1MqDU/hBkOXhIeMdjLm16FYDLx2lOb8G ztjGR4YYjh46vQ5J6+sF0OOObqYThaxK7nBP9uFLFS8Jg7VYK4J972fZGoF0Cw4ed790 pfLEV3yioXGlpt6BQ3sUA86PyCmaVKq9Yf9zNB7nT68nd4lYVao7RS0TsrSrfYzgP0WD r3JQ6wi6dQ7l9EtSAa97MTUhHvmng2Pb4sdKNLBfgj2P8Afic7km1p0hFMz2rFPVWsk5 SgOg== X-Gm-Message-State: AOAM532JnwpdJq1UWDDqL2aravaguGbRmwdPQRwYEf3UqKlE5Zr0Foaq 7juoQ4KsxbJBBchi1DDyjrJi7FmrMbM= X-Received: by 2002:a17:90b:250f:b0:1b8:f257:c39 with SMTP id ns15-20020a17090b250f00b001b8f2570c39mr11751889pjb.135.1647019022944; Fri, 11 Mar 2022 09:17:02 -0800 (PST) Received: from localhost (76-14-89-2.sf-cable.astound.net. [76.14.89.2]) by smtp.gmail.com with ESMTPSA id i11-20020a63bf4b000000b00380d3454c38sm6179862pgo.13.2022.03.11.09.17.00 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 11 Mar 2022 09:17:02 -0800 (PST) Received: by localhost (sSMTP sendmail emulation); Fri, 11 Mar 2022 09:16:58 -0800 From: pal@sandflow.com To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Mar 2022 09:16:47 -0800 Message-Id: <20220311171653.17420-1-pal@sandflow.com> X-Mailer: git-send-email 2.35.1.windows.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 1/7] avformat/imf: relocate static function imf_time_to_ts() 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: 9Tdl1xR0UewA From: Pierre-Anthony Lemieux --- libavformat/imfdec.c | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/libavformat/imfdec.c b/libavformat/imfdec.c index 3ce850b75a..b98af020d2 100644 --- a/libavformat/imfdec.c +++ b/libavformat/imfdec.c @@ -154,6 +154,25 @@ static int imf_uri_is_dos_abs_path(const char *string) return 0; } +static int imf_time_to_ts(int64_t *ts, AVRational t, AVRational time_base) +{ + int dst_num; + int dst_den; + AVRational r; + + r = av_div_q(t, time_base); + + if ((av_reduce(&dst_num, &dst_den, r.num, r.den, INT64_MAX) != 1)) + return 1; + + if (dst_den != 1) + return 1; + + *ts = dst_num; + + return 0; +} + /** * Parse a ASSETMAP XML file to extract the UUID-URI mapping of assets. * @param s the current format context, if any (can be NULL). @@ -772,25 +791,6 @@ static int get_resource_context_for_timestamp(AVFormatContext *s, IMFVirtualTrac return AVERROR_STREAM_NOT_FOUND; } -static int imf_time_to_ts(int64_t *ts, AVRational t, AVRational time_base) -{ - int dst_num; - int dst_den; - AVRational r; - - r = av_div_q(t, time_base); - - if ((av_reduce(&dst_num, &dst_den, r.num, r.den, INT64_MAX) != 1)) - return 1; - - if (dst_den != 1) - return 1; - - *ts = dst_num; - - return 0; -} - static int imf_read_packet(AVFormatContext *s, AVPacket *pkt) { IMFVirtualTrackResourcePlaybackCtx *resource = NULL;