From patchwork Sat Sep 14 10:45:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 51583 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:9fc3:0:b0:48e:c0f8:d0de with SMTP id k3csp300599vqy; Sat, 14 Sep 2024 04:11:58 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVluC7UdllBducHv6gfxxp4e+xzXIfSY7HYtuWZ4adXNvXqm4XzeJU8nsrfoZ+sKociDonUxtbyuoQOguO2BLBh@gmail.com X-Google-Smtp-Source: AGHT+IEbYmSHHM79XT0OwzzGKfYcHhTxu9SoaKdN//FmghO5qKhNJPf8tdvqaTBz6Y/P3UQ+w1t+ X-Received: by 2002:a05:6402:3209:b0:5c2:53a1:c209 with SMTP id 4fb4d7f45d1cf-5c413e4c638mr7989363a12.25.1726312318017; Sat, 14 Sep 2024 04:11:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1726312317; cv=none; d=google.com; s=arc-20240605; b=iRQqPFZiBUlF5eHBpFWR0/f4LtthNHDz2XngWZxWUugtMr9owulY1Jt0tvhVwmVedf KoPDImkhVZm4+nfk91/juaCOf9e/nmSUzQhbfdgRhKuGCg/77r4zm2rI7cWiQwIURzSJ b/RlfQcbYdUXlaREdmovRyiN4NpeLQqB/JI+2B/YZhj5SpM+IjhJEJhiAfsKQjCoaWZ1 sazf294Dp9wSaKepkaRe0sgUkgvugr53XHHu84DbYIu4rSaE9ypf9hTc7QTuCHDRb53L 6pnMrWjar5AqZ0l9qvqlZLJQQl6aM5kHB6J4Ag/6DGlnUUIQRR/8tGgb8ZlI0Nx0acXD LhOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; 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=Rjq4kJQl2LMad/fkJVkxJRvG5MMOi8USNpKTVj0ueEM=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=Uds+icIjO3UaUitvlZ2wQR/g59rAwZI+bQQW1XZgH416CoM9WO4EFj+meMBytdcJto p8+SgeAQifyt5Tu9XtOGz9LHELLfeNBRChn9oPxJVUEjT2PfswPWfcRcQtgdT11JH0YG KQ4hLmJFFnL8p4hMIDu51g49p7G+fXejU7a1rAjJ5kjscBTYn/1yzoe398tWMJuhKzLA KuDD9N0L9SQnlwiS1DWwN2P0JIiTSJ99DKbEUBJTWbrOyMwOx3sJypOZwYUfDFIOI4zt vjAaP9yUgljvhlP45Vrl7nFCCiOGIs8AHu+Gk5lOtZdJVrHH4pba8j0RbA2eIblAa4z2 bYrw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b=cRiXwJnZ; 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 4fb4d7f45d1cf-5c42bc90969si826707a12.447.2024.09.14.04.11.57; Sat, 14 Sep 2024 04:11:57 -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=@khirnov.net header.s=mail header.b=cRiXwJnZ; 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 056B868DDB8; Sat, 14 Sep 2024 14:11:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id B83EB68DB42 for ; Sat, 14 Sep 2024 14:10:53 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=cRiXwJnZ; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id AAE674E06 for ; Sat, 14 Sep 2024 13:10:49 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id FstMJ2Sk5NFS for ; Sat, 14 Sep 2024 13:10:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1726312246; bh=t+nqy3HKz4gaXiXjCSR++H8WcniNXaBA/05sXYV2Kj4=; h=From:To:Subject:Date:In-Reply-To:References:From; b=cRiXwJnZ9dmcqdrK4JuUGkj8LaJTFwkRT3ChKL4gl9a6Zkoophp2PkcKDs4Mlw0Oe zUDGAY3KAYQEehG9O2mUlqTBuuN8iIRU1GeQNiKf+bgmF/WsYFPxRyqgeHXfr2sRwx ZWz/kEwUhEoxs/aVdSUCv0kHcxVfHQJyqPFqvnHhymSO+WRyYgttvJrLL2x8s5PICX rTXheEAKzywg8+dj4LTjbV4mkH8H0sjzzpo0H+nHT4aMzufrmtP/YZycWveiY9u66a cH03CQN8HtrSuVF5UD7cGw8TosL0xO2bmdNvE7mzK03+b05r5w2G3X10jF7qfrQydY jbwVQSrx8hW+w== 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 mail1.khirnov.net (Postfix) with ESMTPS id 6CBDA4E0C for ; Sat, 14 Sep 2024 13:10:46 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 4EB6B3A1A1B for ; Sat, 14 Sep 2024 13:10:41 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Sat, 14 Sep 2024 12:45:35 +0200 Message-ID: <20240914111036.17164-11-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240914111036.17164-1-anton@khirnov.net> References: <20240914111036.17164-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 10/23] lavc/hevcdec/parse: process NALUs with nuh_layer_id>0 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: o4ritKc+kEAQ Otherwise parameter sets from extradata with nuh_layer_id>0 would be ignored. Needed for upcoming MV-HEVC support. --- libavcodec/hevc/parse.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/hevc/parse.c b/libavcodec/hevc/parse.c index ad84b7b152..29f21a5966 100644 --- a/libavcodec/hevc/parse.c +++ b/libavcodec/hevc/parse.c @@ -38,9 +38,6 @@ static int hevc_decode_nal_units(const uint8_t *buf, int buf_size, HEVCParamSets for (i = 0; i < pkt.nb_nals; i++) { H2645NAL *nal = &pkt.nals[i]; - if (nal->nuh_layer_id > 0) - continue; - /* ignore everything except parameter sets and VCL NALUs */ switch (nal->type) { case HEVC_NAL_VPS: