From patchwork Mon Jan 25 14:15:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 25166 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 5DC9E44BD19 for ; Mon, 25 Jan 2021 16:17:27 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4551968A2C0; Mon, 25 Jan 2021 16:17:27 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 439C0689F8E for ; Mon, 25 Jan 2021 16:17:26 +0200 (EET) Received: by mail-pj1-f53.google.com with SMTP id jx18so3283471pjb.5 for ; Mon, 25 Jan 2021 06:17: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=/w6nXCTHjLaemj7dQ2SXoHqP3lswauP3otQ/JkAIo2o=; b=hrgOC8JxZIUqzR4E6AoikPFS1XmRmwWN8L3tIDW24DCs+S3V2q1Ub1kw5rynNLOht6 A5sv8BtnP+6EdDjdwPD7ak6GWeslu2D9dqMQU7NprFw58zpmb1/kUO1uCPu5ManLvBTZ TVZKz4ke5lYoVlvLcyeom9vuSLVm79wkDy2yBXMJVDx/TSOsg8GYv6MQi1xuDq30KPle ceKlDPzvQxzEa6B7qPiRELuk3PB8bpIZKIvT2RZUvb6NF8y2LDHzAHcG+Wjn5wyOPb6f RjC0+hcPq8ixbap3DOwqH4SdYHNQCiWVbUXAp3HuFHE1DG9Xv3Mg9WJcj+7/z576m0VH hcCA== 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=/w6nXCTHjLaemj7dQ2SXoHqP3lswauP3otQ/JkAIo2o=; b=GS5kWwq0axVpNZmK4Wcki5TuoJ3mBiFEEbp67vasW0SjskGepfd75t1KcFD8NavYCm XTalihj2O6/8enVpN04P+9hgECzH4wIh+8I/EliIaOhEMW1Eg11qeU+UOJ//IkCnO+jZ sPH2e8ZVJfIhvHruxhMFqJr61XWD5STrDAPHzidKQOik3tfrTKqOnQdHjJnO5iZmdxta XBdAgWH1KuYr0UNorH4qki1vIdZxMx+V010FI3gtR+B5FKNC8gA2we12/SMCCwZRWG4H bLxBQB5wmUo8XRLG088FhiZj099o/ErHnHbZLyVB3ixsT2yhSnZP84cgdANDctMQfA0g rNyg== X-Gm-Message-State: AOAM530L8JflMaCZKUGZVP07DxQXPKvsNRLmI3TBgWEH6Q0TBxRC56yP 0WJUkLDIUiGUvtHfuwYQV03ejfq7fGw= X-Google-Smtp-Source: ABdhPJzhPyZf9LWH+uGVxt22dX5+4eQ2pz+23NPcQtwnnDpt1a/O07Mt3IgyhWEi12NPNhDRi9DYQA== X-Received: by 2002:a17:90a:4a08:: with SMTP id e8mr363152pjh.149.1611584244301; Mon, 25 Jan 2021 06:17:24 -0800 (PST) Received: from smith.tendawifi.com (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id z6sm5523328pfr.133.2021.01.25.06.17.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Jan 2021 06:17:23 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Mon, 25 Jan 2021 22:15:06 +0800 Message-Id: <20210125141507.11012-9-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210125141507.11012-1-nuomi2021@gmail.com> References: <20210111152357.3965-1-nuomi2021@gmail.com> <20210125141507.11012-1-nuomi2021@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v4 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 6f3abf6b0b..da541407cf 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -494,8 +494,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.