From patchwork Tue Mar 7 12:05:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 40605 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp3684084pzb; Tue, 7 Mar 2023 04:07:46 -0800 (PST) X-Google-Smtp-Source: AK7set9c5+FEZBtMIQX+kNzA/JX0U5tuYPvztH0HAJvbJym1gpaCrrPl2RbQxMoruV3+iEF5k5Sv X-Received: by 2002:a17:907:961c:b0:8b1:811e:cd30 with SMTP id gb28-20020a170907961c00b008b1811ecd30mr18048058ejc.22.1678190866615; Tue, 07 Mar 2023 04:07:46 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678190866; cv=none; d=google.com; s=arc-20160816; b=BF/JwYZiZtvRwiBIV2IZrEW/BYAx1VuuDM//vGyrw2jagRIzAAwuw259soh/tk8uML dlByipZ10LLZcLliwgv67IbiB6qa2Jz+TYKBTDt03BOsxEeoFxb4Cic8S9NgGExrG7Wf Mf1Ie5YQ0peM3VWnSg/bb7vrmgj1+C1bOWgaJ46AfpG+4vYCw9VKGNTMEskG4UHkPCi4 KN+Bnou8iXrI+CcAWSbXr8LO7KYRMpD4mWrRV+e8s5Ba9QwdfztK1j9Ins90G41lsVyV QABrt3eIUgwGImdAtEbrGEpjZg8srtmFbWawpXj/4eJL8QV5UL4T3+AczU5TRETslDcP yA6g== 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:dkim-signature:delivered-to; bh=tYD+uUKOdBTbYN7KKV5gtX4IG1f3v2RvfFRiKwyuia8=; b=DQgrig8WInOJALn3hiVUOlVSv1nJ39i2PmD5amAxslEbA+Y9jiuxXKXrQghimn34g8 a/Y8LMuipiQfQaWyx4cO80we2jQy/Z308EQxi43pBDSVmcCj92GYbOAcO4LInzI8mvgG ESAEpiqf7OHhsOgO/QHXTCG/3jG+f6XijPA2sox17pdD4NPd9Y5lcuMmmwaegzI5zoFw JeGkwQVt04cfgmGWW9x6vmnybJDok9bhWodUUURVHz+UViYfy/GmUBHKiFwzLdhzNDnQ bR1PA998dUG6BGq/Y7TPlT/8yDBluOmvsSSxELNcN5olpLoHRoiCIuTaZTv4kgZuyZx0 DNRA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=qfLScj0Y; 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 hs32-20020a1709073ea000b008daada6238dsi11185715ejc.64.2023.03.07.04.07.45; Tue, 07 Mar 2023 04:07:46 -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=qfLScj0Y; 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 98D6168BD09; Tue, 7 Mar 2023 14:07:42 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f45.google.com (mail-oa1-f45.google.com [209.85.160.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A0BCC68A1BA for ; Tue, 7 Mar 2023 14:07:35 +0200 (EET) Received: by mail-oa1-f45.google.com with SMTP id 586e51a60fabf-17671fb717cso13291950fac.8 for ; Tue, 07 Mar 2023 04:07:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1678190854; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=kD5FjPwFnrDZhT5z+XC+APxx/fvDOjsgfutGsbpzK1E=; b=qfLScj0Y/E/sdonJWJMHrHt3dlQd+r553ndMkDBJyS0vSDkUaEA+xE4TcaMaY7uz6/ JiFg2GRHdomwP4E1d1KQosYDvpQdRGxMkvorjN2sMnwQF1EbITrOowXNgZn14zifIuDR bdRLKSa9Ne2wlW/wYoc1Jhm+Nh12tT25svEmvGjfUPgOatYp4HUG/x+tLPGtkdyzEsba sPAr113uDQSzMvKf9IwI2yQN7yxG0e/nCNv7BmJeY0o3uMPd2QuZ8AeFQIciNgKJS3cP d7v3/asBmBqAmdkKeB9gU3174DnmNMmB6M7GVOaRD9ovW6lw6fIZKpWFXsA74ytfC+C0 268Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678190854; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kD5FjPwFnrDZhT5z+XC+APxx/fvDOjsgfutGsbpzK1E=; b=tFU+WLLfR+zMuOJvQBqYUNgRWPyky4NA5Aw3iv6iWXnZLj9RvvCiloWrGAJFBS+c6A p0n+m/f4EYz1njvvlhUZnT8WYzZEOshDLpmg2R3ZAwwjqrEzrNb3seljhSAGTCBD0vGy 8eVla0hvkIeELZaifrWlewYrDHiAjO5YGVXqiIskXh8YnK8OM5YVH08+ZeQoZv7znBix CSSx6ALc8nZmYwe/aptc6h5kH8HWI4fAUHexyBpNrGtxHMFv1/NKx09PgEP//Nt1OKNM cINizA+5l20siB4QbUjDwS/vT+aaxyqQp+ffs6eFhyPqtE6lyZJgL0xqAwJi8Fhd4zHx EgFQ== X-Gm-Message-State: AO0yUKVf/rmD7vDrlfqqJ/CtVWI2VjF7iamajSA50Dx5TfVqOnlh3XUH AYqr39quJVK7PxsmObgpUnXXBHYZnnA= X-Received: by 2002:a05:6870:7389:b0:176:66a7:b857 with SMTP id z9-20020a056870738900b0017666a7b857mr8687961oam.2.1678190853793; Tue, 07 Mar 2023 04:07:33 -0800 (PST) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id j2-20020a056870a48200b001723d62f997sm5004163oal.32.2023.03.07.04.07.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Mar 2023 04:07:32 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 7 Mar 2023 09:05:51 -0300 Message-Id: <20230307120551.461-1-jamrial@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230306165856.3398-1-jamrial@gmail.com> References: <20230306165856.3398-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/2] avcodec/av1dec: make CBS parse only the OBU types we care about 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: vGGTpJb0j7Yd Signed-off-by: James Almer --- libavcodec/av1dec.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/libavcodec/av1dec.c b/libavcodec/av1dec.c index 87b63eef84..a0720454c9 100644 --- a/libavcodec/av1dec.c +++ b/libavcodec/av1dec.c @@ -752,6 +752,16 @@ static int update_context_with_frame_header(AVCodecContext *avctx, return 0; } +static const CodedBitstreamUnitType decompose_unit_types[] = { + AV1_OBU_FRAME, + AV1_OBU_FRAME_HEADER, + AV1_OBU_METADATA, + AV1_OBU_REDUNDANT_FRAME_HEADER, + AV1_OBU_SEQUENCE_HEADER, + AV1_OBU_TEMPORAL_DELIMITER, + AV1_OBU_TILE_GROUP, +}; + static av_cold int av1_decode_init(AVCodecContext *avctx) { AV1DecContext *s = avctx->priv_data; @@ -781,6 +791,9 @@ static av_cold int av1_decode_init(AVCodecContext *avctx) if (ret < 0) return ret; + s->cbc->decompose_unit_types = decompose_unit_types; + s->cbc->nb_decompose_unit_types = FF_ARRAY_ELEMS(decompose_unit_types); + s->itut_t35_fifo = av_fifo_alloc2(1, sizeof(AV1RawMetadataITUTT35), AV_FIFO_FLAG_AUTO_GROW); if (!s->itut_t35_fifo)