From patchwork Sat Sep 10 16:42:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Izen X-Patchwork-Id: 37832 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:139a:b0:8f:1db5:eae2 with SMTP id w26csp1574117pzh; Sat, 10 Sep 2022 09:43:19 -0700 (PDT) X-Google-Smtp-Source: AA6agR7iQjdS84RnPrhkHOA+LDFUoDooHrDyp6YFiPU8R9hTyFIpPDKCwwCQsqaxCsmTGZCpJ9MD X-Received: by 2002:a05:6402:51d0:b0:451:e3d:4808 with SMTP id r16-20020a05640251d000b004510e3d4808mr6731692edd.388.1662828199031; Sat, 10 Sep 2022 09:43:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1662828199; cv=none; d=google.com; s=arc-20160816; b=iLkhe/Cuc+6HH1bgut4Yb8lBj5K1Mon3NP/PJD6LR3uTN7NCVMZlSJPjWowYUBrqTN 6dLrHKt+CXl8Y32vkGs61cfTQG5SlogjjeBpHskFrQ36Su0vckOiscVLacbAlYeyu4gb 6dqpPzdKIOR8YadgMQRqjDRHeGyM2b/tS2HVbfpLwr4DSer/43pj1rRMhLGdJ0lBMab+ 7nJpRCP0l6Htm+jWOJqpvBaiP6hcW5TPJ634adzuYYQgJrakhfYfI8bgD1jj6E1PZxjs Uo+28VmiwkRV6TqYnpOfkUZhmXb9nOhoHSjtJw8XzaqB07LvuZIhSh1fVpxStUfPs9A+ QjMw== 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 :dkim-signature:delivered-to; bh=UCSPPa2CrG03aHKE29qTtfNNO/FPwIOLpVnxF6i99Ck=; b=zyf9h5iSv+8w82MdpKksvpQy5xJ0dFPzviZqAPp1we7QkTrblnTHeCk71dI3NFA+c9 oP4n2+ig5Aof3+Qygv5qJPoZKijcbTZPghWpaPfc1wZsTzRvq13GPobHX5f7b1Cax2UN K9rKW/w9tY9vn/I5PZhMv3Q1VgVWd1jbfb+lhm1hzsb2M8bxg5iDaKcYjRIYqjRIcQDp mP7OmhC603hfa7nNjvwg036/ycgQH3JX0IruU5TUh3p1a0f8S4WNer5BejIC8qxI5zPw nRSuzEs9mQbMj7EgviwYpMezTPmKllg1A09yxuVGItgcBlFjp0G+VXopyl+KAkKDR3dI 6mAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=MKsXqtoC; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id f18-20020a056402355200b00447e24d55eesi3732490edd.81.2022.09.10.09.43.18; Sat, 10 Sep 2022 09:43:19 -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=@gmail.com header.s=20210112 header.b=MKsXqtoC; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B1A5868BA38; Sat, 10 Sep 2022 19:43:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7EF5168BA38 for ; Sat, 10 Sep 2022 19:43:09 +0300 (EEST) Received: by mail-qk1-f181.google.com with SMTP id d15so3319505qka.9 for ; Sat, 10 Sep 2022 09:43:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date; bh=QyDX0aja8zqAj9xLNBiH3Lbcv1CE3mch02u2PP6yRBw=; b=MKsXqtoCEduYOfUXEW8UUKgDPISITWouiKQtBdvNKLE0Fcl1usys9sR96HpIr0F5r5 oWfjymsK1ENDw/iPSf1ehryLSBDC0ZGQ41+HEvhxWKdOVn4E0hU8Mx0iBSa+898wPvGX daMMMyCkgOjS5vwqqey/jZsq2zq9Rv2Z9cYmIBw+UTJjgMUbh7BDVCrl4oQDLmaSnxGG nEZNZib5YeLEWw+nTewYmYK9wntHnIlJHZuMQiqpY3mYQP8ETOxhKptN8S+PLyRry23n ALNhssNVevxrKZzS19zjyBfHHu/trQcxa7G8+vwRgaEDuMXTJ1uPgWAZMejuWY4USe9o OAjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date; bh=QyDX0aja8zqAj9xLNBiH3Lbcv1CE3mch02u2PP6yRBw=; b=W+5c3H/Kp8ldL5Ylw0SUgmlnpo+5tLf0adU6RCqQ83JvdMwtDL5Z2OUlZLbyTuK9w+ jFXSJiEndQoaosvDAXSaEZy+qs0lAVwaTqE6CxvnvmmTRAFe4lD96SZXPNZEGdoZk4XB 4t82Dn7SmCwb11xvpAmklwknO7+jdST7j39HWsiNVZ34YLKn6pmkTY+cDDoRxlF/dpJp +DZLTp2JrVPXCOtLwPsOu+v729JqOL4ylgkvM81HkcBPWJPp9nHew1L92+lCMqEQr87C ZfWcuOs1nHREYjJqbB2Tv4ztQisLjuZ+QAGZWJwQy8/ghqfV5mwSCFdGvwMHTGo6siFp 5Lmw== X-Gm-Message-State: ACgBeo2vE7XcEwVCykFLiEAKMdjmiZm7ZJt5e2Yvm1Qq816Z66fVFX1n 2Ry7v2PXEotO3mXU6UfhjQP/1qCfNzo= X-Received: by 2002:a05:620a:4088:b0:6bc:60a5:bba9 with SMTP id f8-20020a05620a408800b006bc60a5bba9mr14150076qko.170.1662828188066; Sat, 10 Sep 2022 09:43:08 -0700 (PDT) Received: from gauss.local (c-68-41-54-207.hsd1.mi.comcast.net. [68.41.54.207]) by smtp.gmail.com with ESMTPSA id h63-20020a376c42000000b006b8d1914504sm3415235qkc.22.2022.09.10.09.43.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 10 Sep 2022 09:43:07 -0700 (PDT) From: Leo Izen To: ffmpeg-devel@ffmpeg.org Date: Sat, 10 Sep 2022 12:42:59 -0400 Message-Id: <20220910164259.213742-1-leo.izen@gmail.com> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fftools: allow decoders to set AVFrame time_base 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: Leo Izen Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: yrG4XEr3fZIV This patch allows decoders to set AVFrame->time_base, which determines the units that AVFrame->pts will use. Currently no decoders do this, but it will allow it in the future. --- fftools/ffmpeg.c | 3 ++- fftools/ffplay.c | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fftools/ffmpeg.c b/fftools/ffmpeg.c index 0e1477299d..e3ea7a6c29 100644 --- a/fftools/ffmpeg.c +++ b/fftools/ffmpeg.c @@ -2274,7 +2274,8 @@ static int decode_video(InputStream *ist, AVPacket *pkt, int *got_output, int64_ } if(best_effort_timestamp != AV_NOPTS_VALUE) { - int64_t ts = av_rescale_q(decoded_frame->pts = best_effort_timestamp, ist->st->time_base, AV_TIME_BASE_Q); + int64_t ts = av_rescale_q(decoded_frame->pts = best_effort_timestamp, + decoded_frame->time_base.num ? decoded_frame->time_base : ist->st->time_base, AV_TIME_BASE_Q); if (ts != AV_NOPTS_VALUE) ist->next_pts = ist->pts = ts; diff --git a/fftools/ffplay.c b/fftools/ffplay.c index 9242047f5c..986b0831ac 100644 --- a/fftools/ffplay.c +++ b/fftools/ffplay.c @@ -1771,7 +1771,7 @@ static int get_video_frame(VideoState *is, AVFrame *frame) double dpts = NAN; if (frame->pts != AV_NOPTS_VALUE) - dpts = av_q2d(is->video_st->time_base) * frame->pts; + dpts = av_q2d(frame->time_base.num ? frame->time_base : is->video_st->time_base) * frame->pts; frame->sample_aspect_ratio = av_guess_sample_aspect_ratio(is->ic, is->video_st, frame);