From patchwork Fri Jan 6 15:52:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhao Zhili X-Patchwork-Id: 39892 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:bc95:b0:ad:ade2:bfd2 with SMTP id fx21csp958054pzb; Thu, 5 Jan 2023 23:53:02 -0800 (PST) X-Google-Smtp-Source: AMrXdXuHAopSoo6vAmCkGpcMTJpDEcD7imgC4Sk+QbW/9ng01gSrp4DTbj4t95uclzMkW9HgC/7x X-Received: by 2002:a17:907:c516:b0:7c1:e78:11ed with SMTP id tq22-20020a170907c51600b007c10e7811edmr49863997ejc.0.1672991582787; Thu, 05 Jan 2023 23:53:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1672991582; cv=none; d=google.com; s=arc-20160816; b=CdwEihtQSLGq3u0qCyG1/Ag1T+I++Rl5YlNR9zcCRjlWqkIey0y88eVNd+h3464IDe 3J9YVa8zgc0C1QolzCQM5T5bpDAfl2AJ5MOcbE92BIfNRdm0/NDu7aceF+ErGfM0nCdb bOu3qgzDY/bh084ycxM7qlnP0wrodMCaCJJVrVaYa4t+VPXfHqcb70Y1j8OMgFiO5LtB /Zg7RjbBIzlWu2KnqU/n7EJnrK3ElT9K02tp4VDpu9LaFJuxshVcw0DI5V65YMRAtqa9 yylwR/GJGwlR4L6+ihuu3Gk6AEv+fr4+wdeyRAGKtjLybKnPAb9jMjBbDVxr+lRIdJG1 +P2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:references:in-reply-to:date :to:from:message-id:dkim-signature:delivered-to; bh=Q/5YYpq7jkzQ0dzdvQkU84IrtiXQkpD+nFiEQJYE2u0=; b=GBgZ2q2XnU9AU2Kccvt3Gr/Q1m3onWuI3tkFhLxRrQ/4nMIHnhaN6lgMgfWnnLlxT1 F7yffJY/KxUk/Hjx1vAEnfwvLImnLbMnDC8JRKuVVxOMBa6R6vyKcbiYuh/kf092gGWb jM4sniPaTfKd5kRBnqs5sej4KCM3CxxJ+k3+OthcVpI7f2C5TM5qVG6PTXKVBr6uDNJ1 lwsbekVW9fgmJwTBHiJmooCZgILnLVDgkCBwGHGLaV/i2ryjW3aaxaEvv8QhK1Ts3sM6 d+R3NSlX+Z3TrneTtXWrh21iXST9jTQKeSLRic7jPMaLZG5ITYhVSljfBgxNVunwzSHe qLzw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=FPhgSq4Z; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ds12-20020a170907724c00b007ea638b5670si608528ejc.485.2023.01.05.23.53.02; Thu, 05 Jan 2023 23:53:02 -0800 (PST) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@foxmail.com header.s=s201512 header.b=FPhgSq4Z; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=foxmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id B531F68B9F1; Fri, 6 Jan 2023 09:52:46 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from out162-62-58-216.mail.qq.com (out162-62-58-216.mail.qq.com [162.62.58.216]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9FED368B9F1 for ; Fri, 6 Jan 2023 09:52:37 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=foxmail.com; s=s201512; t=1672991553; bh=RwkMnxXYNQW2ABBw7hrgj318Bbj/DdfLubJek59duaA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=FPhgSq4ZtDZ8e3lIgWEHICFQ5Mh13TbuW+R2Le1qn/dTuSjYE0BZBh3jcvYpeUsng k74NWU+cqxeXr0EdIurw7PGa5E7IXGn4kwS2VPy2gXHhlVu97dcCXHH5p2KXCm8F4a J6zaREy9IrrUed15pJaIOkAPYv86oc5naeiVBJVg= Received: from localhost.localdomain ([59.37.125.102]) by newxmesmtplogicsvrsza2-0.qq.com (NewEsmtp) with SMTP id D1E058B1; Fri, 06 Jan 2023 15:52:30 +0800 X-QQ-mid: xmsmtpt1672991552t2r5h3rcz Message-ID: X-QQ-XMAILINFO: ORuEwgb9eurk7oh+SXQYkGiZeOmo2/fyraSEarrb4M1WSYv3wgRHO4dsHtE5Yc Tqyv28PAJTiJdrzwdKXw+Jrsi6UXJSDtObZ2wOZ2iwP1idb+WuVW+rfbzDL7JXbKRtVNt8po5/dM CYzIiD58biZkyrjg/oovsN68r6A8oCbhTsoQB79Pl537Wsk52bKqnuE5MOPYngXRz6wKMcaL5BKq nndhio/jlmkxRuZmnkzSRVECRr+LW7UZPD+6en3pXm2eNx9raLvPk7qAjPAS9+2SpJHBHTsAhX3F PQkpLwma/ixVaWBgHERhXl7fwS9Tayp745i85cC3sO1LE2HOOJYdSXUuMrn9QaTL2xUd6yvtXLfE E/r2+CKB+dxV4opGWrCyfNfrVBC3czrRmgv9xuwiBs9jAUfw5/XunPJYACxlUf3g2tCaOGgSN+wl VbONaby2D2GPLD6yq95eyGg3eycp2g7iH+Ub3JFXejsT9Yb7S7WC8ANzajoZDQZfAyJ+0i5MpK86 iBgQ2KFVwJgPA+hMuXkEw955GeRGf8525yoY3CSv+sutmYugAUkqc2kmahbVd8+3HNLAEPzgsZro HObNKFa0UAbt66fjfGxlwbr1Wx5zzZr9bAHjCYOyczEog/huKwlB/6OHz6JR5GTJJahj0/14fek/ q+aH/qj1LPMYHMA/TZ1p9NwYTfdcbMnS5xO9JE9ZTQgDdcyr49UHBFsuYBQYkp8P1xs4+dqiq5o8 W0aHp+ZZTmoGPA8ksmMVLA5Xo5wy3uUyFgu4EifMglxfOwHnRyRkm2rgLuC8ePym87XBP+j0+5qC oLgcItj+Ob0iPyPnCeDpxXwY6RtgifGscoyDRWjnFC4Q3zYoxqnRJy3sX+VtXpkJpryymwxdE01a 9Kdm7RocS1NGrm7pZTc4lETT5nL3VUQmFsxtO0hPRPfr2Ft0rcHKy7kdDRM4Au9bRO8ZUMJa8tYa 3TAFgmQtOaTTeNM1YwPf9DDDOmRCyjFe46b8hw40k= From: Zhao Zhili To: ffmpeg-devel@ffmpeg.org Date: Fri, 6 Jan 2023 23:52:29 +0800 X-OQ-MSGID: <20230106155230.487282-4-quinkblack@foxmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230106155230.487282-1-quinkblack@foxmail.com> References: <20230106155230.487282-1-quinkblack@foxmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 3/4] avcodec/hevcdec: add nuh_layer_id option X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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: Zhao Zhili Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: SufzToKb3osj From: Zhao Zhili It can be used to decode selected independent non-base layer. One use case is alpha layer decoding. Partially fix #7965. Signed-off-by: Zhao Zhili --- libavcodec/hevcdec.c | 56 +++++++++++++++++++++++++++++++++++++++++++- libavcodec/version.h | 2 +- 2 files changed, 56 insertions(+), 2 deletions(-) diff --git a/libavcodec/hevcdec.c b/libavcodec/hevcdec.c index 567e8d81d4..0b3d4e84d4 100644 --- a/libavcodec/hevcdec.c +++ b/libavcodec/hevcdec.c @@ -2956,6 +2956,35 @@ static int hevc_frame_end(HEVCContext *s) return 0; } +static int check_layer(HEVCContext *s) +{ + const HEVCVPS *vps; + + if (!s->nuh_layer_id) + return 0; + + for (int i = 0; i < FF_ARRAY_ELEMS(s->ps.vps_list); i++) { + if (!s->ps.vps_list[i]) + continue; + + vps = (const HEVCVPS *)s->ps.vps_list[i]->data; + if (vps->vps_max_layers == 1) { + av_log(s->avctx, AV_LOG_ERROR, + "Specified nuh_layer_id is %d but vps_max_layers is 1.\n", + s->nuh_layer_id); + // Keep going for now. + } else if (s->nuh_layer_id > vps->vps_max_layer_id) { + av_log(s->avctx, AV_LOG_ERROR, + "Specified nuh_layer_id is %d but vps_max_layer_id is %d.\n", + s->nuh_layer_id, vps->vps_max_layer_id); + // It's a known issue that Apple videotoolbox encoder doesn't set + // vps_max_layer_id correctly. Keep going on purpose. + } + } + + return 0; +} + static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) { HEVCLocalContext *lc = s->HEVClc; @@ -2977,6 +3006,9 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) goto fail; } ret = ff_hevc_decode_nal_vps(gb, s->avctx, &s->ps); + if (ret < 0) + goto fail; + ret = check_layer(s); if (ret < 0) goto fail; break; @@ -3216,7 +3248,8 @@ static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length) if (s->avctx->skip_frame >= AVDISCARD_ALL || (s->avctx->skip_frame >= AVDISCARD_NONREF - && ff_hevc_nal_is_nonref(nal->type)) || nal->nuh_layer_id > 0) + && ff_hevc_nal_is_nonref(nal->type)) || + nal->nuh_layer_id != s->nuh_layer_id) continue; ret = decode_nal_unit(s, nal); @@ -3315,6 +3348,10 @@ static int hevc_decode_extradata(HEVCContext *s, uint8_t *buf, int length, int f if (ret < 0) return ret; + ret = check_layer(s); + if (ret < 0) + return ret; + /* export stream parameters from the first SPS */ for (i = 0; i < FF_ARRAY_ELEMS(s->ps.sps_list); i++) { if (first && s->ps.sps_list[i]) { @@ -3637,6 +3674,21 @@ static av_cold int hevc_decode_init(AVCodecContext *avctx) HEVCContext *s = avctx->priv_data; int ret; + if (s->nuh_layer_id > 0) { + if (avctx->strict_std_compliance > FF_COMPLIANCE_EXPERIMENTAL) { + av_log(avctx, AV_LOG_ERROR, + "Decoding selected nuh_layer_id is under development. " + "Use -strict experimental to use it anyway.\n"); + return AVERROR(EINVAL); + } + + if (avctx->hwaccel) { + av_log(avctx, AV_LOG_ERROR, + "Decoding selected nuh_layer_id doesn't work with hwaccel.\n"); + return AVERROR(EINVAL); + } + } + if (avctx->active_thread_type & FF_THREAD_SLICE) { s->threads_number = avctx->thread_count; ret = ff_slice_thread_init_progress(avctx); @@ -3691,6 +3743,8 @@ static const AVOption options[] = { AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, PAR }, { "strict-displaywin", "stricly apply default display window size", OFFSET(apply_defdispwin), AV_OPT_TYPE_BOOL, {.i64 = 0}, 0, 1, PAR }, + { "nuh_layer_id", "Select which nuh_layer_id to decode (only works with INBL)", OFFSET(nuh_layer_id), + AV_OPT_TYPE_INT, {.i64 = 0}, 0, 62, PAR }, { NULL }, }; diff --git a/libavcodec/version.h b/libavcodec/version.h index 6b8a1dbb79..15f7c3fe3d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 56 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \