From patchwork Sat Jan 7 15:22:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 39914 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp1908643pzb; Sat, 7 Jan 2023 07:23:07 -0800 (PST) X-Google-Smtp-Source: AMrXdXsnX3V3to8iJgsjNrAQ83mbkSnSjdR8u3skDDGnrNeal79eZVsARJ3rLPBvPB6wwA0gsXm9 X-Received: by 2002:a17:906:9519:b0:836:3d32:2cf9 with SMTP id u25-20020a170906951900b008363d322cf9mr48025390ejx.55.1673104987336; Sat, 07 Jan 2023 07:23:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673104987; cv=none; d=google.com; s=arc-20160816; b=Dh1z4HB9CXa887ecK+YvubT8+ZCNf7z1QHYp2xpMwrlJ26u6B1njW0UFcCKQ4IlgDH GzdJ0XOCRAiSvaFtC6sBUWjjkSFAZlBwW+DOu3zKCJIyfiC3xE5e7yKgeDzuFuYb+QM9 fUsxtZBRwm6DM0uSMFC+e31hmQutEDzn/h4HK9FiivtaHOKDj+5XQtdkc2qSDfzOYJeb OAFUSb0VU/iK52rNkjWlRENbsdKU7h7g+45Ql48r+dBN3lvFcQ+os+9/+eGIEtzZWz6H z9vEvUDo375uxILXJ+Wa0NIyoMfZVNtvn4ngA92Ntm5KY+QU1w5yLqiLPvww6hsCAPH/ Ju3Q== 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 :dkim-signature:delivered-to; bh=i6R5nBtkn4KEWotXbqpwqfWUYhiXBMurY7/SphpHzrE=; b=khwGv0Vu9dlbmuYeiPc/szwTgiPD1rtg2tq7TR5Ut8l/MeYbuDIbR6O5gD0g6jdMsC /I8Zx8vLBCL6SoGfT5xSMY4XaH5XOJLQ75kiw2sYV8MA72Oy+nCsxCfplmwX3fPtz86r jpQx4Othf5tL9QoZ6vD5uBm34fWKpQ6/y9WwU5d3AFjalNz4BteMiaQfOKmRQmdXkrbz 4agyvrcVrgzYqK5Xzy7NtGHzj8mxKT0T1FC+mdO96X8jnJPUwqNII25v2i1YanjTn/mt NlNTZa+VgGmwRMCebt4KhJf11+mtctT+t14smzAKae6PnrTdi160kZl0rKRCjb4xQ9pO 3NMg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="cSn/xHyl"; 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 gs43-20020a1709072d2b00b0084d2e5c7027si2467575ejc.926.2023.01.07.07.23.06; Sat, 07 Jan 2023 07:23:07 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b="cSn/xHyl"; 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 4D30968BAE4; Sat, 7 Jan 2023 17:23:03 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f54.google.com (mail-oa1-f54.google.com [209.85.160.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 44F7568B9FA for ; Sat, 7 Jan 2023 17:22:56 +0200 (EET) Received: by mail-oa1-f54.google.com with SMTP id 586e51a60fabf-15027746720so4441895fac.13 for ; Sat, 07 Jan 2023 07:22:56 -0800 (PST) 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:to :from:from:to:cc:subject:date:message-id:reply-to; bh=y7FqkNxBfXQfbP2QRUbi4AcyqjYdX3TFyJONj7nHw+g=; b=cSn/xHyloh9liStlZq9R56PaQJl8Vb2Yqwd1SSOtbE0ZBMs6QtNzq8FdBhsi7eTzNj 8JlocP1tNEEAP9c56s0qeX7AgWm7JYl49wNZTzhqP4SFRrGkARBkl5dfL632RAYV5ulv aP48zy99MZALTegslnHehKoZ0RXgvuq+Rg0wO4J0bW4ANPGD/b2i9g3gDseptzdENVWd /CPLtILsciyYOmit+U6v5xKzuZ/YRb+kdv4WDQnZ2QvdMLDt4+1nllazkp/+9jlra21A QOtiP57DGdc5dgtJMI3kFeyMa6mxjxgc1yLxGTBYl+IQDUkZp8INzI1YTFUtCy7urLz9 VwHA== 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:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=y7FqkNxBfXQfbP2QRUbi4AcyqjYdX3TFyJONj7nHw+g=; b=DCwgFSNR2TKr15M5jyEDi46sdGkFvffeLf0fm5edzRfEhPTEULN7ORnFn9pcBcgA8b 3G68+LJZif/9Fh66fx1imUbRfMeqlDhwfIAiiGl66hBxeKQ2g+JHbTMdiM9BtbLS2D7g guTCR/OkvrZCGCjslHGDIlFBX0DmcKm8LCLrPtRWE6bhTVBixV/lUJm5D2Aw+Y9ugKnQ zH9MqYMaBXxdalhVg+3Im1zwo6yo/FCmoBiJjo+RYOEUsIBegmDLCtlPs3h1KHhk9D3G bP+S2eSZf10tCpcPKDwI9/FEX7oyPx/DQk3GGYyd53MJsF/wD/DEpi54xhd1Kafy8++6 3aWQ== X-Gm-Message-State: AFqh2kpCyamGRabjHdoq91SfIYgPMwziEoZ5GUqBd7PZDxLIqiL7s6va DmAvV/aZl2pUqpfN8iVodbRpmH7GWrk= X-Received: by 2002:a05:6871:850c:b0:150:411f:3a9c with SMTP id sx12-20020a056871850c00b00150411f3a9cmr15784367oab.37.1673104974223; Sat, 07 Jan 2023 07:22:54 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id m34-20020a056870562200b00143ae7d4ccesm1787379oao.45.2023.01.07.07.22.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 07 Jan 2023 07:22:53 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Sat, 7 Jan 2023 12:22:36 -0300 Message-Id: <20230107152236.41449-1-jamrial@gmail.com> X-Mailer: git-send-email 2.39.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/av1_parser: export timing information when present 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: Pg+5/qEaFfCo Signed-off-by: James Almer --- libavcodec/av1_parser.c | 8 ++++ tests/ref/fate/webm-av1-extradata-update | 48 ++++++++++++------------ 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/libavcodec/av1_parser.c b/libavcodec/av1_parser.c index 4cbd7408a0..afa006ed08 100644 --- a/libavcodec/av1_parser.c +++ b/libavcodec/av1_parser.c @@ -162,6 +162,14 @@ static int av1_parser_parse(AVCodecParserContext *ctx, avctx->color_trc = (enum AVColorTransferCharacteristic) color->transfer_characteristics; avctx->color_range = color->color_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG; + if (seq->timing_info_present_flag) { + const AV1RawTimingInfo *timing = &seq->timing_info; + av_reduce(&avctx->framerate.den, &avctx->framerate.num, + timing->num_units_in_display_tick, timing->time_scale, INT_MAX); + if (timing->equal_picture_interval) + avctx->ticks_per_frame = timing->num_ticks_per_picture_minus_1 + 1; + } + if (avctx->framerate.num) avctx->time_base = av_inv_q(av_mul_q(avctx->framerate, (AVRational){avctx->ticks_per_frame, 1})); diff --git a/tests/ref/fate/webm-av1-extradata-update b/tests/ref/fate/webm-av1-extradata-update index 9dd2056e0e..68bbb9ad89 100644 --- a/tests/ref/fate/webm-av1-extradata-update +++ b/tests/ref/fate/webm-av1-extradata-update @@ -6,27 +6,27 @@ fbf3091fdf05b2856c578e7c948d68c3 *tests/data/fate/webm-av1-extradata-update.webm #codec_id 0: av1 #dimensions 0: 240x100 #sar 0: 3/1 -0, 0, 0, 0, 8168, 0x1851ab62 -0, 42, 42, 0, 7040, 0x967788f9, F=0x0 -0, 83, 83, 0, 4, 0x01f400e2, F=0x0 -0, 125, 125, 0, 48, 0x49ad107e, F=0x0 -0, 167, 167, 0, 4, 0x021c00fa, F=0x0 -0, 208, 208, 0, 279, 0x69728439, F=0x0 -0, 250, 250, 0, 4, 0x01c400d2, F=0x0 -0, 292, 292, 0, 63, 0x9bbf1836, F=0x0 -0, 333, 333, 0, 4, 0x026c012a, F=0x0 -0, 375, 375, 0, 1065, 0xce2003ac, F=0x0 -0, 417, 417, 0, 4, 0x019400c2, F=0x0 -0, 458, 458, 0, 52, 0x7a0112f1, F=0x0 -0, 500, 500, 0, 4, 0x021c010a, F=0x0 -0, 542, 542, 0, 689, 0x1e8b49e7, F=0x0 -0, 583, 583, 0, 4, 0x01e400f2, F=0x0 -0, 625, 625, 0, 209, 0x124c6790, F=0x0 -0, 667, 667, 0, 42, 0xea690e31, F=0x0 -0, 708, 708, 0, 3521, 0xd76ee284, F=0x0 -0, 750, 750, 0, 63, 0x4572188f, F=0x0 -0, 792, 792, 0, 386, 0xb078c259, F=0x0 -0, 833, 833, 0, 178, 0x1ebb5121, F=0x0 -0, 875, 875, 0, 60, 0x729317f7, F=0x0 -0, 917, 917, 0, 40, 0xad970a66, F=0x0 -0, 958, 958, 0, 61, 0xcc0d1a20, F=0x0 +0, 0, 0, 41, 8168, 0x1851ab62 +0, 42, 42, 41, 7040, 0x967788f9, F=0x0 +0, 83, 83, 41, 4, 0x01f400e2, F=0x0 +0, 125, 125, 41, 48, 0x49ad107e, F=0x0 +0, 167, 167, 41, 4, 0x021c00fa, F=0x0 +0, 208, 208, 41, 279, 0x69728439, F=0x0 +0, 250, 250, 41, 4, 0x01c400d2, F=0x0 +0, 292, 292, 41, 63, 0x9bbf1836, F=0x0 +0, 333, 333, 41, 4, 0x026c012a, F=0x0 +0, 375, 375, 41, 1065, 0xce2003ac, F=0x0 +0, 417, 417, 41, 4, 0x019400c2, F=0x0 +0, 458, 458, 41, 52, 0x7a0112f1, F=0x0 +0, 500, 500, 41, 4, 0x021c010a, F=0x0 +0, 542, 542, 41, 689, 0x1e8b49e7, F=0x0 +0, 583, 583, 41, 4, 0x01e400f2, F=0x0 +0, 625, 625, 41, 209, 0x124c6790, F=0x0 +0, 667, 667, 41, 42, 0xea690e31, F=0x0 +0, 708, 708, 41, 3521, 0xd76ee284, F=0x0 +0, 750, 750, 41, 63, 0x4572188f, F=0x0 +0, 792, 792, 41, 386, 0xb078c259, F=0x0 +0, 833, 833, 41, 178, 0x1ebb5121, F=0x0 +0, 875, 875, 41, 60, 0x729317f7, F=0x0 +0, 917, 917, 41, 40, 0xad970a66, F=0x0 +0, 958, 958, 41, 61, 0xcc0d1a20, F=0x0