From patchwork Thu Feb 11 14:36:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 25564 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 05B23449EAA for ; Thu, 11 Feb 2021 16:43:02 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E05EC68AA4D; Thu, 11 Feb 2021 16:43:01 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0705468AA26 for ; Thu, 11 Feb 2021 16:42:55 +0200 (EET) Received: by mail-pg1-f171.google.com with SMTP id e7so4038909pge.0 for ; Thu, 11 Feb 2021 06:42:54 -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=csJ7+MxFIj5MQSxEqSZH/neQ4vpYhyQ1fSIktPqlPV8=; b=DhxiYgiC5bmvqoR+4W8mkEE0NgVbSn3GRzJ4j+RVr2PA9Yynwc6FPGNQMihBiKz9d3 4Wh6AAtQ01r9fQdvm7xukALH4eQgbs62WspHRMRqH0HQVFWsCwJwiiDG3a71L0WD9yu3 8wn8Du6fv6QKf78H3IZHlEo1V/83Qv2uoLj7/ZO6owJSE6jxEWkLN0BMGwFXeVFoom/Z SAzvml/N34otpksV3aOpi1Fwo4kVtxFP58059AZOIjfLd5MnekWkb5WtV2ee/YXLEq7A xXX0kRnbTMt27Y+nGXGpIl6BjssMXbpnYYlqPcJLyPQG4Zvh2iKA8XlTcd88U0lPZiCc wa/g== 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=csJ7+MxFIj5MQSxEqSZH/neQ4vpYhyQ1fSIktPqlPV8=; b=bsgeaClXPzdsN28fSU62TC+UQitevFC6l3XIGtdrA1TKmneFN8oWdxh79X+UerTz6C ZMd49/dbcPeanlcFahx718Q75Wmp7GA31yUwiga2xHEeOySeFzW4gAcqg0c35XHgrcNW gvWwVzTG/bjmpvk5h93U/VymvHJ80INZ+uQCh14pyGeydoWMKtEApwG5g7hYHXne7uSL L7sIjcZBLwKBL2w8lXqOqH7jjxsWOWUdquuDIr/NVgaaBatzssWf6XHEfmH0GuwLM9Xh wD4e5mo5sX/FDAAflDmb4l0xT2W27Cprs4YKuqQEuHAdSTe68kmhq6w2m7t35dApymn4 1lfg== X-Gm-Message-State: AOAM530i+n7KdGP9YGsIfIE8MH/kVT6zE95CpmxxfTaxd/ChA50TH1Cp wBNPjJcrlb/RBx5Ws71J4gfWtkDtRfE= X-Google-Smtp-Source: ABdhPJxkzkZrPEA0a2/nY7x9kD9ZSYkYJV0Zls0SPdn2viCUAIsx4pQ9U2y9kEEn1BJd5cBmSkTq4A== X-Received: by 2002:a63:1a1d:: with SMTP id a29mr8641381pga.236.1613054239673; Thu, 11 Feb 2021 06:37:19 -0800 (PST) Received: from Nuomi.localdomain (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id p29sm6564587pgm.64.2021.02.11.06.37.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Feb 2021 06:37:19 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Feb 2021 22:36:10 +0800 Message-Id: <20210211143611.5663-10-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210211143611.5663-1-nuomi2021@gmail.com> References: <20210125141507.11012-1-nuomi2021@gmail.com> <20210211143611.5663-1-nuomi2021@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v5 09/10] 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 81177c1096..6dc4f79930 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -604,8 +604,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.