From patchwork Thu Jul 7 16:13:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Timo Rothenpieler X-Patchwork-Id: 36701 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b27:b0:88:1bbf:7fd2 with SMTP id l39csp4996509pzh; Thu, 7 Jul 2022 09:13:42 -0700 (PDT) X-Google-Smtp-Source: AGRyM1sKZx7P3uJK+Beg5Xrr87SBwBF/Yzx+XELK1xiMeUxBEAhRyi4twh/J+xIzgfSRUhOilU+p X-Received: by 2002:a05:6402:1e92:b0:43a:7cd0:6bed with SMTP id f18-20020a0564021e9200b0043a7cd06bedmr19026455edf.423.1657210422185; Thu, 07 Jul 2022 09:13:42 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657210422; cv=none; d=google.com; s=arc-20160816; b=Cgj8Vz2YPlklPhtBts196AkAu4lrKvr6UrWCr1ZGPmyYPXf1VdPUedASzTy9DqG+CT 3hT6qvSmK5eYr0Ol7fv3aUTgZ0Lz0mX1Ba6qyjkdQWtCT7usVe+YH6bW9wmVgJf4akB8 W9r/1UJWjKjiBK0GhIDy/DHnCH8qvlPsq9pBPfRRf+QTh3tRZTY1AJqCDdckTNYCO4Os OaEtsRSZ/1G0KUUyR5R6NnrUvuJLQNXSAY54r3mAUPu0MBHWJ0Ew4V+3b9F95jEemZaS fphVGSom6PR4QalaBfSFNNdNZlOLEcBUcf1UFM6crSMWYa86iUY5QFvcHOMIYmmAHDA9 QgEA== 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:dkim-signature:delivered-to; bh=XRuXlhMy+1bIyYclInDSBcQPVSjzRADy0y4qdOQBbAk=; b=0gMEifLa20/YAoEHuEiv6aXyon807TQ4SlgoU32uV+L0rtc0nWl6FF3MW9ZOZUZGEB LXeyeEOjFGcc/pGfRW//mo2cnGnust6xSRbX83nNFR3gTGFbuPsbfmv3+Rrt10b7XPOA xsfODikdaZr80/KA0uS+9KkUE0E7RjIu2TMGJRHgoQnQoVChN6iY3qdYiaPq4BaZeipp r99S0HKFX2cBD/YgBDfRzYaMjD8N/Gig69yZbJ7kyOINUh/O1yWS/zyYPFiJp8mVAzLO 6KWt3Ei/YgtlC7tkpDvibYSboqYjMeSK0pvp1NKu6NVTnGXUC0Fy1bBNXCRFS5RPUmoT N5bQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@rothenpieler.org header.s=mail header.b=NjX8Pk4n; 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=rothenpieler.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id dn18-20020a17090794d200b006f3976ed175si3806483ejc.938.2022.07.07.09.13.40; Thu, 07 Jul 2022 09:13:42 -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=@rothenpieler.org header.s=mail header.b=NjX8Pk4n; 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=rothenpieler.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E5E4F68B8D1; Thu, 7 Jul 2022 19:13:24 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from btbn.de (btbn.de [136.243.74.85]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7D7C168B88B for ; Thu, 7 Jul 2022 19:13:17 +0300 (EEST) Received: from [authenticated] by btbn.de (Postfix) with ESMTPSA id 1B49A39E27C; Thu, 7 Jul 2022 18:13:17 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rothenpieler.org; s=mail; t=1657210397; bh=1nQPcAKKAqvzv0Vuf5xUolsyvwAiPr6eeSf6BqUx7aQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=NjX8Pk4nlOXllOWqlgqtAUGm0weojVe4OZgbStpwx9AyFKKKt6i4BsI3zBSpYM47w GIUSaPBHW6vrAucu6gksRV8IRyfqq2H1vfOQQUWxwWiKbO/55MsHR8m/WrRhuf+fGn GnLgrUbVUkNwUYzivDhlh3x3Cb3eNfEggG0B2UzbusLM7TS98DYS17/Lq9DdTosSDg WdszqAXyNmdQVEvV2Y980GJ+TCafPq1vQZDcQXE3Qa2XpWhbVfcnRD5dAHFXanSNPe wDxBOkmH2iAhBwJyFGdv0MoEGqFHbxOJ11qOyX85yNO6wRdihn9nJGg49WZQNulOUA KdjYup8VxDsmg== From: Timo Rothenpieler To: ffmpeg-devel@ffmpeg.org Date: Thu, 7 Jul 2022 18:13:07 +0200 Message-Id: <20220707161307.1136-2-timo@rothenpieler.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220707161307.1136-1-timo@rothenpieler.org> References: <20220707161307.1136-1-timo@rothenpieler.org> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avdevice/lavfi: pass forward video framerate 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: Timo Rothenpieler Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: cw/KfPNpNY1s --- libavdevice/lavfi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 1b282a70cb..246f7dff3b 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -287,6 +287,7 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) for (i = 0; i < lavfi->nb_sinks; i++) { AVFilterContext *sink = lavfi->sinks[lavfi->stream_sink_map[i]]; AVRational time_base = av_buffersink_get_time_base(sink); + AVRational frame_rate = av_buffersink_get_frame_rate(sink); AVStream *st = avctx->streams[i]; AVCodecParameters *const par = st->codecpar; avpriv_set_pts_info(st, 64, time_base.num, time_base.den); @@ -299,6 +300,10 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) avctx->probesize = FFMAX(avctx->probesize, sizeof(AVFrame) * 30); st ->sample_aspect_ratio = par->sample_aspect_ratio = av_buffersink_get_sample_aspect_ratio(sink); + if (frame_rate.num > 0 && frame_rate.den > 0) { + st->avg_frame_rate = frame_rate; + st->r_frame_rate = frame_rate; + } } else if (par->codec_type == AVMEDIA_TYPE_AUDIO) { par->sample_rate = av_buffersink_get_sample_rate(sink); ret = av_buffersink_get_ch_layout(sink, &par->ch_layout);