From patchwork Tue Jan 24 22:46:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Thompson X-Patchwork-Id: 40102 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3ca3:b0:b9:1511:ac2c with SMTP id b35csp715798pzj; Tue, 24 Jan 2023 14:47:17 -0800 (PST) X-Google-Smtp-Source: AMrXdXsVZZ6HVwaDyWyy7PwISrtbmGBLsmQGNvmeeNqQDCSDHaagWRM88uWAXCuKxCFwnjiFae2Y X-Received: by 2002:a17:906:7e14:b0:86e:2c11:9bce with SMTP id e20-20020a1709067e1400b0086e2c119bcemr31769174ejr.38.1674600437729; Tue, 24 Jan 2023 14:47:17 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1674600437; cv=none; d=google.com; s=arc-20160816; b=lJk4jFUUSvNMj5A1fU4JgTr/fat27SZY4AVAoFafVFm0Zrm5pbN18/ULmROzv3yYZF Hgt2p2LdmX9YrUnP4wf2MXFUdTRXGpmHpTRHZSv96llVj4DPqa/pqAEimP22o5EszzCQ v4wyftBFX7ArRJNAd+LpF41K53oLAyNEV2NdHBtWTMWYRlKpMhZFd/o0eHVqqrO9o3x8 I5BhTPfnIOwOWBzoY/UcSYCHwT/ISqvGhhdvkIJHsKyPwzmpaKLgaNnYEWxux2K36pti SST02MbfNpe1syYNVJk/wHsdXCjc/wAkJz/MZwmRcPPh7zu67Emzq+8SvuX8ifqeIDEf LmGw== 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=+e7QMf6XVUW0y90dYiJY2jTlrlgQCJQBxE/kYrEPqLs=; b=xPO9OCakRSApn+mmTSJXANslm1JE00iHzn4+7Gss3BleQz2xG6bgzbCaljsZQgAHKZ f+FeNlAR+ZJC0vyNO3pgQG/f866opGfQD5Qx8gKz4GoSS1KpzWePerGY+lvtJfGXUcWE /A6FSJbAPynzISFAzjYxW0y90dQ+aOnpTSF4vENP8Y5UIyRhxiX6Wn0hQWoJzddAfTCM NUFQEjrzs2E6zb8r3ERgtQYySHGBSbzhx8x8BL+/y/83cE2KZqFpBpui8ZBX/GUSQUdI alpVlR97oe7M+kBunGX56wtI7fCqdk4wgWg7ghATjmFd9EOj9N8yTd0hpEjomCpsavml GTrw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@jkqxz-net.20210112.gappssmtp.com header.s=20210112 header.b=n6+Bzr+z; 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 10-20020a170906224a00b0087787ae09f5si4420640ejr.412.2023.01.24.14.47.17; Tue, 24 Jan 2023 14:47:17 -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=@jkqxz-net.20210112.gappssmtp.com header.s=20210112 header.b=n6+Bzr+z; 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 50CE068BE70; Wed, 25 Jan 2023 00:46:49 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 713CE68BE5A for ; Wed, 25 Jan 2023 00:46:41 +0200 (EET) Received: by mail-wr1-f54.google.com with SMTP id bk16so15344377wrb.11 for ; Tue, 24 Jan 2023 14:46:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jkqxz-net.20210112.gappssmtp.com; s=20210112; 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=qnnPoyjmHaiuy09B2hoZXJQf3GHsRcI7O7vIf138NmE=; b=n6+Bzr+zNAuBmqa3p7Z8O58FhrHRF/pRfxOgagqRtU9SlC6VZ3cZT5qopfLpDJOzxN 8qu13NWwAXDlI3tW92TG+Xd3TN1lIBR9nQzuvT4bObNqe2z6nCs3pnWd99YlgjLB5TKq EhPjh14mi7lqjF0RYKhd22A1KM2OX5Ac2I75sGQ1TUZ7/q0vubt2A8wUDBvr7kbbI1Lu 753jf8pkxc9ovVzLCxu8ZmakRN4HvHvq/3b+E2gQUf7iCoWEjT9L6aVKA3e3VWo2O7XO mBkbadqnieHyRh+lfzzbLPRd6QVjTerOpb8Rbv51M9cZh7jC4DAF3R13s6S14zqWjp5w JIPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=qnnPoyjmHaiuy09B2hoZXJQf3GHsRcI7O7vIf138NmE=; b=Lk8fOx91GAqJoEClKytsN2ujTEv1i3F+NysIc9VrWEyaCovHobMeYhcAVzzjiw1GKS OK54JZjDYFId5qVeRpKZru44g9s89n5JYZewZXUF2fPjXWxBZVIFsv06YmvG2QbdzazS 4yELfwjmZYT44WyHJue/t2jLaHcwc6tXxy6IzPycv/pvjOsnwwt+aL9LxI67OAyfvU0W JsTQrH1LFtrXznwEC2hOflMtJd9hfLkUzOWSuLnkGZt88pGUUgy/R3wtwjYyxpdkeBj2 N2dFq+SB8Tw+etScEPNb8QD7NISs+P+J2uNBeN+tgfBzn79AH+lXKAyLArsnddR4qveO tTCw== X-Gm-Message-State: AFqh2kopDbaOMGS9Xfaf6tyz7IeQOKBt3bdQZF614Vg9kAx4ASFQaNRE Aybbfu4CU6WJKfBSeT5F512UggxHTOhUOulz X-Received: by 2002:a5d:42c2:0:b0:2bc:371a:8a1 with SMTP id t2-20020a5d42c2000000b002bc371a08a1mr25916027wrr.22.1674600400882; Tue, 24 Jan 2023 14:46:40 -0800 (PST) Received: from localhost.localdomain (cpc91224-cmbg18-2-0-cust209.5-4.cable.virginm.net. [81.106.228.210]) by smtp.gmail.com with ESMTPSA id j26-20020a5d453a000000b002bdf3809f59sm2848267wra.38.2023.01.24.14.46.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 24 Jan 2023 14:46:40 -0800 (PST) From: Mark Thompson To: ffmpeg-devel@ffmpeg.org Date: Tue, 24 Jan 2023 22:46:23 +0000 Message-Id: <20230124224623.1374077-4-sw@jkqxz.net> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230124224623.1374077-1-sw@jkqxz.net> References: <20230124224623.1374077-1-sw@jkqxz.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 4/4] av1_parse: Don't reject zero-size padding OBUs 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: ZZJABCYktnzd Padding OBUs are not required to be nonempty. --- libavcodec/av1_parse.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/av1_parse.c b/libavcodec/av1_parse.c index b1620eb043..e2f105a8e2 100644 --- a/libavcodec/av1_parse.c +++ b/libavcodec/av1_parse.c @@ -88,7 +88,9 @@ int ff_av1_packet_split(AV1Packet *pkt, const uint8_t *buf, int length, void *lo obu->size_bits = get_obu_bit_length(obu->data, obu->size, obu->type); - if (obu->size_bits < 0 || (!obu->size_bits && obu->type != AV1_OBU_TEMPORAL_DELIMITER)) { + if (obu->size_bits < 0 || + (obu->size_bits == 0 && (obu->type != AV1_OBU_TEMPORAL_DELIMITER && + obu->type != AV1_OBU_PADDING))) { av_log(logctx, AV_LOG_ERROR, "Invalid OBU of type %d, skipping.\n", obu->type); continue; }