From patchwork Mon Mar 8 14:05:52 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 26263 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 17CCE44A38C for ; Mon, 8 Mar 2021 16:14:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 001A868A6EB; Mon, 8 Mar 2021 16:14:33 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3F7D689E13 for ; Mon, 8 Mar 2021 16:14:26 +0200 (EET) Received: by mail-pf1-f175.google.com with SMTP id w18so7152055pfu.9 for ; Mon, 08 Mar 2021 06:14:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=V7p6+nVyhLP1H52huSdrXk3W8GDzuThVgIbXaZX+FLs=; b=m/lv1YeKnNf8exHDZpcZVeMOn9uPn43HxOXJyRNsMeseiHGhW/fE5n/PDe0T7vmEvp wA0Qb/BOhL/eGG0bIcnZTo6fjKpgrCSwoOjYM3fUwrGrTFzaHMVfVA2185669ZMLoyOz WbxrmmpE/JHPfqLRv2QZ2PpTcDpVl67JalskTmmKZNK6U9BO9RShGXeDu5WC6Ps3Xkzi f1tG9iCPRH1/PDnkIPomfebegRcCb2RABJQmxAeun+fGH2JyYjyCQTIiiyluhVTn3Pcc H9rfmw+ccidsTBSMBMb1BCa7sqzhX6Sh6xRXvWhWkrRHMerdVgU/HzjnB2jsubkvNfaT oBqQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=V7p6+nVyhLP1H52huSdrXk3W8GDzuThVgIbXaZX+FLs=; b=dzS7Us61jNj1h5VWNKZJ/wkfb4BmzrZbPWw8PJsSXsJkANtxasq5qFX6UWVMQoIJo2 xiKw6+zpFiCJ33TDkBv//zBL2gASdl88YW+eW2njaIsFNGnTiMO26d603t4xM/C9uywv XHVwJmV5kg9TXZdnfvKTkb3ybnJ4nEywGyBOBxJMZctR1ObXEdDYLO3dEhr8ScF3yc2d fmEsM5M6VHiqVYRFLP5a/3OB2Kj5s/3JCryBdt1PI6b7iFNakwSCIdolLDUEUvhkqjzf vfqpKYy0hLDoHwpSU9cOQBv827fTsrXWPu4Ca2BcFqSDkupsKp5uOkiozYHZYLU3kYDt bv2w== X-Gm-Message-State: AOAM530ZYP+OYhuVmcizziLzP3Bp2iZSlF0wZKsfkHLsrKhoP0wZu7u7 7KpbflEpD4gO/5qXvUdeTDHjEvbVp44= X-Google-Smtp-Source: ABdhPJymyNfehPQCd5qgL/uJofyh4zDCiDxfLmanCxXjhweEGxfhOZtD4xavLZnESjphPQgxM35Czg== X-Received: by 2002:a17:902:a404:b029:e6:23d:44ac with SMTP id p4-20020a170902a404b02900e6023d44acmr12274758plq.50.1615212404503; Mon, 08 Mar 2021 06:06:44 -0800 (PST) Received: from smith.tendawifi.com (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id y20sm10427392pfo.210.2021.03.08.06.06.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Mar 2021 06:06:44 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Mar 2021 22:05:52 +0800 Message-Id: <20210308140553.4054-9-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210308140553.4054-1-nuomi2021@gmail.com> References: <20210217015146.19724-1-nuomi2021@gmail.com> <20210308140553.4054-1-nuomi2021@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v7 8/9] avcodec/cbs_h2645: vvc, do not skip nals for nuh_layer_id > 0 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Nuo Mi Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" --- libavcodec/cbs_h2645.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 6e3b706813..c08a76e734 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -493,8 +493,9 @@ static int cbs_h2645_fragment_add_nals(CodedBitstreamContext *ctx, const H2645NAL *nal = &packet->nals[i]; AVBufferRef *ref; size_t size = nal->size; + enum AVCodecID codec_id = ctx->codec->codec_id; - if (nal->nuh_layer_id > 0) + if (codec_id != AV_CODEC_ID_VVC && nal->nuh_layer_id > 0) continue; // Remove trailing zeroes.