From patchwork Tue May 2 09:37:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41444 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp3845932pzb; Tue, 2 May 2023 02:38:47 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5iGij86VnbroP87fsIyZpRIQKQYfsMWvmi6e/YkF85CgttmgQ5c4c/dO6mHmDL+1jX5xKW X-Received: by 2002:a05:6402:793:b0:506:bb0e:bc4e with SMTP id d19-20020a056402079300b00506bb0ebc4emr8595877edy.39.1683020327396; Tue, 02 May 2023 02:38:47 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683020327; cv=none; d=google.com; s=arc-20160816; b=DT90OUqCkDTEC6eHSaXZfiKJR5IUVpjFUa2+a37vGjo7OAgEI9IhD4rZRKJIjoasQH OtcScSnO3GHeQc1o7DT6ImA+Po4B371NheoCtNZjNPveD/HfaNuD4ho0rJu2NurE31lM wndXAwezgWhHW37JhX4Nb2GlTBxYcXfabAbD9EkW4y4F1s1g0D8y8Pyov3DCiv6VRiMt d3mxmyXz9FBwnJwNB3WxdiePUoT6js0sVJFn6Z4nNuahL+TS6y5Rr7xI1X8C7KnOjZPq uqWxvi33D7iit3lR7YVJ0ls2lifWrZRPq4ghdoKUn3anwxWUKAfGhCQur4BH3EmLTzOA fG3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=FCkowoMGmx0zrJTTquwJjgQt4YOVCQQXZ1Fbf5gGbyA=; b=RbWrhmK48qGjNkPPjtrK5U8kkotpoGQ7LnI0/9WV0HDkkF3bKyVCsd1wuebbh7wXZm YDhXhE+2juYyJyqSNAmBYsEYQl9aAp4J685lR2747ZQD/jgH3G0ldKEVtSC1fyk9ZAcp 3dEVSvPanYo1nBMnim2VYIPLq0PSVLEP7qTVeSQ0w/cCa6eWT/ZqRC89eG4/bhdwtSji X2b0JHUsVBtGiT11RAEpzmzkYMEsaSzUZklez1XlxYI9Ma/LVxZuowm9zMA2YQKK/7eu KjYfSdCK1UIy0C6RcrJ+LkEwLKSq3bsH7njZbAmObb7KWggv3sJLdyCzrQs8K2U4CFzi z3DQ== 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 bc3-20020a056402204300b005066af6d5cdsi22242134edb.297.2023.05.02.02.38.47; Tue, 02 May 2023 02:38:47 -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; 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 5BF5C68C13B; Tue, 2 May 2023 12:38:15 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D061168C126 for ; Tue, 2 May 2023 12:38:06 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 906722404F5 for ; Tue, 2 May 2023 11:38:06 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id C46UlJbWTTbO for ; Tue, 2 May 2023 11:38:04 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 9D5782404EC for ; Tue, 2 May 2023 11:38:04 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 2CFFB3A02A7 for ; Tue, 2 May 2023 11:37:58 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 May 2023 11:37:52 +0200 Message-Id: <20230502093755.9139-1-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/4] lavf/demux: use avg_frame_rate for packet durations for notimestamps formats 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: AkWeIYikyiUr avg_frame_rate, if set, should be more reliable than stream timebase in this case. --- libavformat/demux.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libavformat/demux.c b/libavformat/demux.c index 06de71cd6e..45e5f5c4c2 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -668,6 +668,11 @@ static void compute_frame_duration(AVFormatContext *s, int *pnum, int *pden, if (st->r_frame_rate.num && (!pc || !codec_framerate.num)) { *pnum = st->r_frame_rate.den; *pden = st->r_frame_rate.num; + } else if ((s->iformat->flags & AVFMT_NOTIMESTAMPS) && + !codec_framerate.num && + st->avg_frame_rate.num && st->avg_frame_rate.den) { + *pnum = st->avg_frame_rate.den; + *pden = st->avg_frame_rate.num; } else if (st->time_base.num * 1000LL > st->time_base.den) { *pnum = st->time_base.num; *pden = st->time_base.den; From patchwork Tue May 2 09:37:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41443 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp3845860pzb; Tue, 2 May 2023 02:38:37 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4DcX7Ihyi1Nihv5fz/vwNfsc1lItxip0NI0raexwLiNg8ukBs7bJgC5Ka4njDzYpXpdvbE X-Received: by 2002:a17:906:7945:b0:94e:d84e:d4d0 with SMTP id l5-20020a170906794500b0094ed84ed4d0mr15417837ejo.18.1683020316890; Tue, 02 May 2023 02:38:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683020316; cv=none; d=google.com; s=arc-20160816; b=al57jg+02IR8q0dct/ikBEwoDb2ZrYs9yukahadGBQBCfDtFNY0D7cIHkT4HPZGnOK y3ZHBHidJ6Phb3KXjAKOIiKxOY8y4da2IKhHElpxNiM6GpnQhVMJsiV9ZwLFkDFnPlBm iv/YD7ZBTSbAJJ0XZNM9m0qzJNPn27XX6drfERu/HQn+AQhuoTc6mCLcrJHk7KsuWSBV WNza9CoDmh+MseqOQ8rMS8NVOpQXY9m+A0U1P/lyRPXb1hVTWsMlh+NJ0TW3nAO3YL64 QjKBhX6FxhvHEJqG400ONjJuKeprV/tvi9rinKKTazgE99ZiapI+5lAV4tC9I70NF3v3 in9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=O0ICC3KknHRO+OneHA4IOY4UvKIaVL4ApCgF+vkiBdo=; b=JNXS78zejyEA66Rgr6otDopayoKB2xBESxJgl+gkwPTPNGYTdUgP4cK19hxkwwbfpT eUIUOkSIICSBE1vyyS+LO53FN78cHeTdvs0AeZCZ+OVjf6q0473N7qSjM5HBlW8lvu4g IJANJMe03CH0YefPWTp3Mu4xrw031hgMpf3KnLSQh6gGSA+RBriB8AJc/Z8dmQ2Hfi4Z X+woX64yIW6KyH6mWg6deSy4eIx3RnXOSuDXA8x8XZ7ltpzYnl1d7ynmYJG42G0Vlucl 4Tr1OUDt+YWkGWIAL6YJv6uZSuHUz9EvwAn6ypAfbSTbaV9kRIFnVXa0pHlSjddCzF6g cHZw== 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 vu7-20020a170907a64700b0095ed582174esi12802692ejc.871.2023.05.02.02.38.36; Tue, 02 May 2023 02:38:36 -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; 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 4945968C135; Tue, 2 May 2023 12:38:14 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 375A668C007 for ; Tue, 2 May 2023 12:38:06 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id F26132404EE for ; Tue, 2 May 2023 11:38:05 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id cxQrYrGqkxqd for ; Tue, 2 May 2023 11:38:05 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id A602B2404F5 for ; Tue, 2 May 2023 11:38:04 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 395FD3A048F for ; Tue, 2 May 2023 11:37:58 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 May 2023 11:37:53 +0200 Message-Id: <20230502093755.9139-2-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230502093755.9139-1-anton@khirnov.net> References: <20230502093755.9139-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/4] lavf/rawdec: stop setting codec context 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: M5BLrYIG4E/h Demuxers are not supposed to do this. --- libavformat/rawdec.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libavformat/rawdec.c b/libavformat/rawdec.c index 9126a9e53b..6b623d366e 100644 --- a/libavformat/rawdec.c +++ b/libavformat/rawdec.c @@ -87,7 +87,6 @@ int ff_raw_video_read_header(AVFormatContext *s) sti->need_parsing = AVSTREAM_PARSE_FULL_RAW; st->avg_frame_rate = s1->framerate; - sti->avctx->framerate = s1->framerate; avpriv_set_pts_info(st, 64, 1, 1200000); fail: From patchwork Tue May 2 09:37:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41441 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp3845793pzb; Tue, 2 May 2023 02:38:29 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6IE3sBrDFICB/fkhMkVyZDXNANoz+LTkIpDniy+FM0ZmQJNfk44J5V5SI54GoKbSTTixpb X-Received: by 2002:a17:907:16a9:b0:951:756d:6542 with SMTP id hc41-20020a17090716a900b00951756d6542mr16989239ejc.32.1683020309309; Tue, 02 May 2023 02:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683020309; cv=none; d=google.com; s=arc-20160816; b=wb634t5HSWqgnV4UZkITqZszcXmCggMvVE+b9YLxDH6keUNQ+HVd2rs+QL40MVB20b Y12lRaFxyWzPg3dxgNSGvp/8eMVzFu4O5wqvDlo4o1xiUAGqqENm/OLrE8nN1aSY3yuL Iip2xtEzXm8qfjs5RwetsQ+XxY3/hO20YFEv/ZgGlftEUUJGFShfCGIeabTBTZU5ZG6m kHfYO1wH0nBBPteX68W7cAE7vpu1wHieVI8HKf2f8nTK9X36P/YU9JZONS01uIq63erR 663L2lSnonwcy7mjcVbQ6jhUatl4nFVfB+vgtFcUZvlagtbZQH59yYoZ5Od+WzfuKrHB K7hQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=4yvmPbUCMfNBZe7DESwnRT9VBUvGOkzTeprsvrDJNVc=; b=D93d0rDkuXVqRMWyhr1qYwSssUGFOWzkpBpzs2jING88iUsYxVy6hEEZO6ubz14St1 l2wn3ztWE/z5zkVaD345Sdll6Zy1Y/nazOq7IO8YmGkgZKROj38w4BHVJlLIWovr/3Ay hqq3GMn0kfEoGEi1laBjYYeKoMlYuHT97aGqPM3RrzX6bSjxCFhu6lqYeaFZ8Lf9I/mt w/KfWLq00/1PctcR0hvMC83QJXwFPAh0LCLfAYNxVZfbqfMlLjR57q/z894RbLn6G6n5 NyqTg0zGYxGC1jph/GonKhTzh7xlyHCA71fSdJose7Y87zq0j3mnajJyjsYFtr9wzwyT 2FRw== 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 cd21-20020a170906b35500b0094fbea57d42si20847884ejb.933.2023.05.02.02.38.16; Tue, 02 May 2023 02:38:29 -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; 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 0E04A68C126; Tue, 2 May 2023 12:38:12 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 53CFB68BF5E for ; Tue, 2 May 2023 12:38:05 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 0C4832404F8 for ; Tue, 2 May 2023 11:38:05 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id 3kHTLWYWhwwm for ; Tue, 2 May 2023 11:38:04 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id 959DC240177 for ; Tue, 2 May 2023 11:38:04 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 4487D3A11B4 for ; Tue, 2 May 2023 11:37:58 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 May 2023 11:37:54 +0200 Message-Id: <20230502093755.9139-3-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230502093755.9139-1-anton@khirnov.net> References: <20230502093755.9139-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/4] lavf/av1dec: mark as notimestamps 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: lIkdtkqs2Lsg --- libavformat/av1dec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index d4b430af7e..ba7fee60cd 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -287,7 +287,7 @@ const AVInputFormat ff_av1_demuxer = { .read_packet = annexb_read_packet, .read_close = av1_read_close, .extensions = "obu", - .flags = AVFMT_GENERIC_INDEX, + .flags = AVFMT_GENERIC_INDEX | AVFMT_NOTIMESTAMPS, .priv_class = &av1_demuxer_class, }; #endif @@ -432,7 +432,7 @@ const AVInputFormat ff_obu_demuxer = { .read_packet = obu_read_packet, .read_close = av1_read_close, .extensions = "obu", - .flags = AVFMT_GENERIC_INDEX | AVFMT_NO_BYTE_SEEK, + .flags = AVFMT_GENERIC_INDEX | AVFMT_NO_BYTE_SEEK | AVFMT_NOTIMESTAMPS, .priv_class = &av1_demuxer_class, }; #endif From patchwork Tue May 2 09:37:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 41442 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:dca6:b0:f3:34fa:f187 with SMTP id ky38csp3845799pzb; Tue, 2 May 2023 02:38:30 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5zD21BOQ0ipbT224xqjUf6cbBAa4eaF/SC3Tp11h0+x1mTwVtzVwWiXu4TueHcDny1cBIM X-Received: by 2002:a17:907:70b:b0:958:4b79:b214 with SMTP id xb11-20020a170907070b00b009584b79b214mr15413834ejb.18.1683020309985; Tue, 02 May 2023 02:38:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683020309; cv=none; d=google.com; s=arc-20160816; b=gdWlGzUZbNA4L0j7u3BHyanHdDyf5AS8bBpm8uilQDFuBMK2taauGSsaYMuQYFATU2 MgrML/o64xZGiDLMeluTROA2RcpBdZDKv9ozrFwYYEvH5PXicjPf4iyj5UM8vtCyQP/k PCI5h/uScXHfMgMAsUoWjGXHdaoqKNe7VjT09nt10S/1kSxacJYT2LcMEB8i2EeNOyja XOf+sbHvWu2cQr4KFACBdTD0ertJd8vIwC5otZS3pRw6BDWj9Thtp9TERq5H8CnpKuez 85Ydhbu9LruYpn/I2fNHaPDL4Idmcao5nxccqlUgUtzjOgJ4tc0kLVyIyrFqXlb9Zuro 3uJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding: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=019Ewweaglb9b3PiIqHS1usC3FMV288BfzxPxSeYU2Y=; b=b81rnnFGOusqlFNjqtYMOKEOIP4AgDAvj7UNhP5HKVIMLS4cASFDO/iQNDXOZeMGy5 +b/AgKm1P4QlsevJXEwZ6FEXbOrnapDuu7ar/VcyKuoeZ+vtFuLkAK2arXPafAN0H2tM spn78WxgX7JC+qHG625/PoUdvxrtR6jbkwTaIGl6Jdk/y8iBWKbeQV5wlye7NT4J+4S2 tXVd24zknRQjYGGVi4CKoFxDM8X2PSwE5DDXkXA3Yy/AV8bzfAucQjPsWDCcL0WTGz68 +f54Buc5Fm+frOjUvubrVNWPAZpUG9QLejvNhOuMqIKk6ziVP+od0Hp5b3exLnOAejM5 5i4w== 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 vi8-20020a170907d40800b009602b859400si9885232ejc.117.2023.05.02.02.38.27; Tue, 02 May 2023 02:38:29 -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; 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 598CC68C12E; Tue, 2 May 2023 12:38:13 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail0.khirnov.net (red.khirnov.net [176.97.15.12]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id BCB3D68BF5E for ; Tue, 2 May 2023 12:38:05 +0300 (EEST) Received: from localhost (localhost [IPv6:::1]) by mail0.khirnov.net (Postfix) with ESMTP id 85DDC240177 for ; Tue, 2 May 2023 11:38:05 +0200 (CEST) Received: from mail0.khirnov.net ([IPv6:::1]) by localhost (mail0.khirnov.net [IPv6:::1]) (amavisd-new, port 10024) with ESMTP id Z9NATjbPTdWa for ; Tue, 2 May 2023 11:38:05 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail0.khirnov.net (Postfix) with ESMTPS id A13412404EE for ; Tue, 2 May 2023 11:38:04 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 500E73A11DB for ; Tue, 2 May 2023 11:37:58 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Tue, 2 May 2023 11:37:55 +0200 Message-Id: <20230502093755.9139-4-anton@khirnov.net> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230502093755.9139-1-anton@khirnov.net> References: <20230502093755.9139-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] lavf/av1dec: stop setting codec context 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 9EDKao5mFU3z Demuxers are not supposed to do this. --- libavformat/av1dec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/av1dec.c b/libavformat/av1dec.c index ba7fee60cd..216d4e2298 100644 --- a/libavformat/av1dec.c +++ b/libavformat/av1dec.c @@ -80,7 +80,7 @@ static int av1_read_header(AVFormatContext *s) st->codecpar->codec_id = AV_CODEC_ID_AV1; sti->need_parsing = AVSTREAM_PARSE_HEADERS; - sti->avctx->framerate = c->framerate; + st->avg_frame_rate = c->framerate; // taken from rawvideo demuxers avpriv_set_pts_info(st, 64, 1, 1200000);