From patchwork Wed Mar 18 13:41:23 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 18285 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 7DA4E44B554 for ; Wed, 18 Mar 2020 15:41:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 601D168B6CC; Wed, 18 Mar 2020 15:41:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4222368B6C1 for ; Wed, 18 Mar 2020 15:41:32 +0200 (EET) Received: by mail-wr1-f66.google.com with SMTP id b2so24242972wrj.10 for ; Wed, 18 Mar 2020 06:41:32 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=gbAXPS/aBfZ0xa9LR/S/dno/bD6/60hCYT6HG6EYP+M=; b=drUhNM1QEnOhNqS67U+FezD0+bLsXJvPZj4vilwdf1RlTChRELzvr1Qq9iFnGFynlO Ie8Cph7Lqdz3A3iKTzqYyRClkA3EswPxjAWPi7Uugb0byaoJe+Kk7TQKWIkfHP9Qyrw8 xu4sOlEjTDNmdhsEGfesnORg2Chj24aHnmOQ22kSjA+3mikPb3a+d+GLPMq33V0qBhzl 4xg1iYGyafpofkHY2fSyzDP2TS2hLqTSPMLvbupHzfXl+XYER4zD7JdYtbqMbdRkZE7m ECUXgM5zayiUMPrqicXDCiDyWSAbAp4pcdR+43nfZDrwi0z7sq+otRaqopUQNckk72MN QApA== 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:mime-version :content-transfer-encoding; bh=gbAXPS/aBfZ0xa9LR/S/dno/bD6/60hCYT6HG6EYP+M=; b=b1Rm/VVVb5sWsHkJCHBibYCSxAQot2qntr/ewSa2j4WC8CyTtyzmAEpCNBybSYDmwF Gdgx8K1mWN54Yb1RozOJ96lRfiMUKdtPHLo1YxyoKKlhoyof9DZ/frnkCl4QMQ7wzN+Q IObvoICklVZQxL7P9Eiplul+q1Jx9Ovesw5Z/1N+vl+glhtjT990anse07ZG20/zpRqH 77WhXqq9bs0U+cOzEeC6ayUtp5MJvptycErUNpJVfAflggQ13T10fCBezek/OI29f2uK iD3a5CSUbctazfrkWVxvvlb0SwwqS9oozuEEdf886+lPMCBpPvug5Hk3EImtcVfYfD8D TOjw== X-Gm-Message-State: ANhLgQ0vzP3eEaR5R+lXBF5bxoAF4RChZWRSt/jkLPWxE3JkgmlWQ22W Yg4l4QKUd1WJXnuRHhh+iHHaZYMI X-Google-Smtp-Source: ADFU+vunfYImbx+4IjNY1QjYBRupzxMbhpnVPCmC8uOBq5ViwMd01IErYCeXqXY3Qrr9pnNoWgP5TQ== X-Received: by 2002:a5d:6388:: with SMTP id p8mr5541803wru.51.1584538891331; Wed, 18 Mar 2020 06:41:31 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1ab57.dynamic.kabel-deutschland.de. [188.193.171.87]) by smtp.gmail.com with ESMTPSA id y80sm4332764wmc.45.2020.03.18.06.41.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Mar 2020 06:41:30 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Mar 2020 14:41:23 +0100 Message-Id: <20200318134123.14932-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avcodec/hevc, h2645_parse: Fix HEVC NAL unit names and constants 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: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" This commit fixes the names and constants of the reserved NAL units with nal_unit_type 22 resp. 23. They were "IRAP_IRAP_VLC2x", but are actually "RSV_IRAP_VLC2x". This also required a change to cbs_h265_syntax_template.c. Signed-off-by: Andreas Rheinhardt --- Should I realign the enum? libavcodec/cbs_h265_syntax_template.c | 2 +- libavcodec/h2645_parse.c | 4 ++-- libavcodec/hevc.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/libavcodec/cbs_h265_syntax_template.c b/libavcodec/cbs_h265_syntax_template.c index 15114548c6..180a045c34 100644 --- a/libavcodec/cbs_h265_syntax_template.c +++ b/libavcodec/cbs_h265_syntax_template.c @@ -1275,7 +1275,7 @@ static int FUNC(slice_segment_header)(CodedBitstreamContext *ctx, RWContext *rw, flag(first_slice_segment_in_pic_flag); if (current->nal_unit_header.nal_unit_type >= HEVC_NAL_BLA_W_LP && - current->nal_unit_header.nal_unit_type <= HEVC_NAL_IRAP_VCL23) + current->nal_unit_header.nal_unit_type <= HEVC_NAL_RSV_IRAP_VCL23) flag(no_output_of_prior_pics_flag); ue(slice_pic_parameter_set_id, 0, 63); diff --git a/libavcodec/h2645_parse.c b/libavcodec/h2645_parse.c index 0f3343004f..2e03871640 100644 --- a/libavcodec/h2645_parse.c +++ b/libavcodec/h2645_parse.c @@ -169,8 +169,8 @@ static const char *hevc_nal_type_name[64] = { "IDR_W_RADL", // HEVC_NAL_IDR_W_RADL "IDR_N_LP", // HEVC_NAL_IDR_N_LP "CRA_NUT", // HEVC_NAL_CRA_NUT - "IRAP_IRAP_VCL22", // HEVC_NAL_IRAP_VCL22 - "IRAP_IRAP_VCL23", // HEVC_NAL_IRAP_VCL23 + "RSV_IRAP_VCL22", // HEVC_NAL_RSV_IRAP_VCL22 + "RSV_IRAP_VCL23", // HEVC_NAL_RSV_IRAP_VCL23 "RSV_VCL24", // HEVC_NAL_RSV_VCL24 "RSV_VCL25", // HEVC_NAL_RSV_VCL25 "RSV_VCL26", // HEVC_NAL_RSV_VCL26 diff --git a/libavcodec/hevc.h b/libavcodec/hevc.h index 56b5541d90..e15d89fa95 100644 --- a/libavcodec/hevc.h +++ b/libavcodec/hevc.h @@ -48,8 +48,8 @@ enum HEVCNALUnitType { HEVC_NAL_IDR_W_RADL = 19, HEVC_NAL_IDR_N_LP = 20, HEVC_NAL_CRA_NUT = 21, - HEVC_NAL_IRAP_VCL22 = 22, - HEVC_NAL_IRAP_VCL23 = 23, + HEVC_NAL_RSV_IRAP_VCL22 = 22, + HEVC_NAL_RSV_IRAP_VCL23 = 23, HEVC_NAL_RSV_VCL24 = 24, HEVC_NAL_RSV_VCL25 = 25, HEVC_NAL_RSV_VCL26 = 26,