From patchwork Wed Feb 17 01:51:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nuo Mi X-Patchwork-Id: 25682 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 BEC5744B0B1 for ; Wed, 17 Feb 2021 04:21:08 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id ABB5568A2C6; Wed, 17 Feb 2021 04:21:08 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CB14689E13 for ; Wed, 17 Feb 2021 04:21:02 +0200 (EET) Received: by mail-pg1-f173.google.com with SMTP id t26so7548638pgv.3 for ; Tue, 16 Feb 2021 18:21:02 -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=63yfoVaS1RuYu8uRf39/W1AlMHHQUt8Zj7ULDJRfJ+k=; b=dJTeB9kE7sq5oDG9DQhpZ/ur1rt4AhIR5z3AScaJz504zWmZOmeR93vuaQxaFpTy8w 59pwdlyay2mdLGQYtsbnPlMOhk4EGpJZakOydDFU9aISVNlbi9EIUu0itO4zbk0ahAcQ yx1qq/NOYwRZ0Qekg1Ltpe2bSpwYSDhBeWbDrX8T+iZ27rQKGN+iuPfAGApGQYnbjFw7 2Es0V5x3iBcZbAWVG6ECdfJ5aG6YVzvnz6f/ygONJrZWn31DgfAMOXQOJO8JHN1P0Z6w XjOcCM6Mek2r8o3KEKatfa2lQ5cpezVMbGH8OzoBjFy1KRyz2KepazBgEQy6uGC9i2L1 hs9A== 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=63yfoVaS1RuYu8uRf39/W1AlMHHQUt8Zj7ULDJRfJ+k=; b=HqyCALDMOW5g1bdF0WjNjzZEhy3aZX7Seyn8/kWIu2asri4+42k8feORCKLqX5h1WG V+ODe4qvkZS9Vs8McMWWu6MhK42wuwCZjs3PxgfNG8uvCVXtEvqK/F7VGrP3VPKsQGw9 9tn63ZkGqWQKcdTgeX6XQxx6l8GmOu29Ij5+pTncAfj7tfxBuM2B3qqtN0zBEI5Xd/+a XnLLgND0Bk1mhwW03Iz5WScbwIrzTiUx+WreGpIYrmoMZtV3rsEHZ8u5XzN1wnMOR5MA ZXP3iiQ+bDCIo3pkyf4U65Ey8LdsszEcVV4cl/Ysg1FBrI0ipdbEkBKJM/z6hmGqjsPu wK0g== X-Gm-Message-State: AOAM530tTOi30yM3CJnMQSZq/U/NEakC5LXAXnC1AiAx4tCh6CIDF43f Wxl966f8k3rnjwu04GpuQv1YO3b0l+I= X-Google-Smtp-Source: ABdhPJwHFNtssvpoAYiHbPvtJEoQsmXqA0LbiqOvAo3DFm6CdXIWTYZth0rp40eDDl5hg8AppGt0Iw== X-Received: by 2002:a63:c10f:: with SMTP id w15mr21248742pgf.99.1613526759311; Tue, 16 Feb 2021 17:52:39 -0800 (PST) Received: from Nuomi.localdomain (23.83.245.51.16clouds.com. [23.83.245.51]) by smtp.gmail.com with ESMTPSA id n15sm361125pgl.31.2021.02.16.17.52.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Feb 2021 17:52:38 -0800 (PST) From: Nuo Mi To: ffmpeg-devel@ffmpeg.org Date: Wed, 17 Feb 2021 09:51:42 +0800 Message-Id: <20210217015146.19724-6-nuomi2021@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210217015146.19724-1-nuomi2021@gmail.com> References: <20210211143611.5663-1-nuomi2021@gmail.com> <20210217015146.19724-1-nuomi2021@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v6 5/9] avcodec/h2645_parse: add nal header parser for h266/vvc 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/h2645_parse.c | 74 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 3 deletions(-) diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index a36ef4f5a0..35f9d035a9 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -1,5 +1,5 @@ /* - * H.264/HEVC common parsing code + * H.264/HEVC/VVC common parsing code * * This file is part of FFmpeg. * @@ -27,6 +27,7 @@ #include "libavutil/mem.h" #include "bytestream.h" +#include "vvc.h" #include "hevc.h" #include "h264.h" #include "h2645_parse.h" @@ -146,6 +147,47 @@ nsc: return si; } +static const char *const vvc_nal_type_name[32] = { + "TRAIL_NUT", // VVC_TRAIL_NUT + "STSA_NUT", // VVC_STSA_NUT + "RADL_NUT", // VVC_RADL_NUT + "RASL_NUT", // VVC_RASL_NUT + "RSV_VCL_4", // VVC_RSV_VCL_4 + "RSV_VCL_5", // VVC_RSV_VCL_5 + "RSV_VCL_6", // VVC_RSV_VCL_6 + "IDR_W_RADL", // VVC_IDR_W_RADL + "IDR_N_LP", // VVC_IDR_N_LP + "CRA_NUT", // VVC_CRA_NUT + "GDR_NUT", // VVC_GDR_NUT + "RSV_IRAP_11", // VVC_RSV_IRAP_11 + "OPI_NUT", // VVC_OPI_NUT + "DCI_NUT", // VVC_DCI_NUT + "VPS_NUT", // VVC_VPS_NUT + "SPS_NUT", // VVC_SPS_NUT + "PPS_NUT", // VVC_PPS_NUT + "PREFIX_APS_NUT",// VVC_PREFIX_APS_NUT + "SUFFIX_APS_NUT",// VVC_SUFFIX_APS_NUT + "PH_NUT", // VVC_PH_NUT + "AUD_NUT", // VVC_AUD_NUT + "EOS_NUT", // VVC_EOS_NUT + "EOB_NUT", // VVC_EOB_NUT + "PREFIX_SEI_NUT",// VVC_PREFIX_SEI_NUT + "SUFFIX_SEI_NUT",// VVC_SUFFIX_SEI_NUT + "FD_NUT", // VVC_FD_NUT + "RSV_NVCL_26", // VVC_RSV_NVCL_26 + "RSV_NVCL_27", // VVC_RSV_NVCL_27 + "UNSPEC_28", // VVC_UNSPEC_28 + "UNSPEC_29", // VVC_UNSPEC_29 + "UNSPEC_30", // VVC_UNSPEC_30 + "UNSPEC_31", // VVC_UNSPEC_31 +}; + +static const char *vvc_nal_unit_name(int nal_type) +{ + av_assert0(nal_type >= 0 && nal_type < 32); + return vvc_nal_type_name[nal_type]; +} + static const char *const hevc_nal_type_name[64] = { "TRAIL_N", // HEVC_NAL_TRAIL_N "TRAIL_R", // HEVC_NAL_TRAIL_R @@ -289,6 +331,31 @@ static int get_bit_length(H2645NAL *nal, int skip_trailing_zeros) * @return AVERROR_INVALIDDATA if the packet is not a valid NAL unit, * 0 otherwise */ +static int vvc_parse_nal_header(H2645NAL *nal, void *logctx) +{ + GetBitContext *gb = &nal->gb; + + if (get_bits1(gb) != 0) //forbidden_zero_bit + return AVERROR_INVALIDDATA; + + skip_bits1(gb); //nuh_reserved_zero_bit + + nal->nuh_layer_id = get_bits(gb, 6); + nal->type = get_bits(gb, 5); + nal->temporal_id = get_bits(gb, 3) - 1; + if (nal->temporal_id < 0) + return AVERROR_INVALIDDATA; + + if ((nal->type >= VVC_IDR_W_RADL && nal->type <= VVC_RSV_IRAP_11) && nal->temporal_id) + return AVERROR_INVALIDDATA; + + av_log(logctx, AV_LOG_DEBUG, + "nal_unit_type: %d(%s), nuh_layer_id: %d, temporal_id: %d\n", + nal->type, vvc_nal_unit_name(nal->type), nal->nuh_layer_id, nal->temporal_id); + + return 0; +} + static int hevc_parse_nal_header(H2645NAL *nal, void *logctx) { GetBitContext *gb = &nal->gb; @@ -503,8 +570,9 @@ int ff_h2645_packet_split(H2645Packet *pkt, const uint8_t *buf, int length, /* Reset type in case it contains a stale value from a previously parsed NAL */ nal->type = 0; - - if (codec_id == AV_CODEC_ID_HEVC) + if (codec_id == AV_CODEC_ID_VVC) + ret = vvc_parse_nal_header(nal, logctx); + else if (codec_id == AV_CODEC_ID_HEVC) ret = hevc_parse_nal_header(nal, logctx); else ret = h264_parse_nal_header(nal, logctx);