From patchwork Fri Jun 7 13:01:32 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anton Khirnov X-Patchwork-Id: 49663 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:c209:0:b0:460:55fa:d5ed with SMTP id d9csp1011582vqo; Fri, 7 Jun 2024 06:08:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCV4G0NB40ZeWPpob+ZrlBqK9C4WJlb+BQgbg9qtPpNk2hfj6dxAysyve5cVy38mi+FT2KrBqmx4d4SbxPZJYknPiyqOqZ20j7vPkQ== X-Google-Smtp-Source: AGHT+IHcfjHF3gHMS3HjVo2A05mJuziojRv+QnLB99oTKjrKnNof0110MI2DtkfKG+hEq7GD6XcG X-Received: by 2002:a50:cdd4:0:b0:57a:1e62:4d56 with SMTP id 4fb4d7f45d1cf-57c5087ff5dmr1454812a12.1.1717765705537; Fri, 07 Jun 2024 06:08:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1717765705; cv=none; d=google.com; s=arc-20160816; b=P/HhUgevaIQ69uxmID2kfp3Kh7wYBWuiu3AMSa1Ognldc4LInZywaODi/Sam2efVvs Z82SsqXLmNY1Or93MGCSgcihmxMoP3DH/G6YQ8wKiLvgKhyXZ4p1adp5ByS6BfmG7p0i 9eUeOxhysW4qNhQZcxfvWi1tyM3KWozAob4tU200GR7Lt2RPVFjypYQAutYEltzcjr/F z3MwYAUjaKEYOuV0lGArjKuWQNNxFKTAcrZKsBCKQ83OOZXFJFWlc+eeShv4R5K1LgAU 6EeUf55M8056E45IUHGW0xv/KKRyTuYPsnQdKLh+Dm9TJjzUF1bt6vaxPFkNXXmbM3T8 kd3Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=RCzr3cr7c+btoae+FjWxJxsxzdEe3a+XTVqS9PzPstE=; fh=YOA8vD9MJZuwZ71F/05pj6KdCjf6jQRmzLS+CATXUQk=; b=ac1Pw2+qPJQK0Tr7FDvDI4qnAj+vP2ct+Lb4imX6h6Z+1DyM/i7mNZAyY0tROdclSH dzRC4R+Qr1X/TqYbgAX8IbLiD4BBX3tVo/OxAYjVl7Cyc7hgMYyDZqHCCmv4Z2s0L2xB 8BUUBq4BDJxLQCEzte+3odrLJZ3k0CEEX0dml5PA3Ztl9x1zMg5vj19eqSyrGkiRHLbX 2jr6E+M3+OlwDhPHwspymCuT4i1VcbXXB7BVdHJOjAQjVTEqKHFfb8yZej3bFY7sHp9f Nam/Lag4xUe2YLnhVqcOeCd5s5o/OMX7x5/WOVVSvrnhM12CWuFlSwO3mMCDP1sSrxbx rxig==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@khirnov.net header.s=mail header.b="KU1J2/MP"; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 4fb4d7f45d1cf-57aae0fa2bfsi1805001a12.193.2024.06.07.06.08.24; Fri, 07 Jun 2024 06:08:25 -0700 (PDT) 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=@khirnov.net header.s=mail header.b="KU1J2/MP"; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7EE3268D83E; Fri, 7 Jun 2024 16:04:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail1.khirnov.net (quelana.khirnov.net [94.230.150.81]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6133A68D782 for ; Fri, 7 Jun 2024 16:03:51 +0300 (EEST) Authentication-Results: mail1.khirnov.net; dkim=pass (2048-bit key; unprotected) header.d=khirnov.net header.i=@khirnov.net header.a=rsa-sha256 header.s=mail header.b=KU1J2/MP; dkim-atps=neutral Received: from localhost (mail1.khirnov.net [IPv6:::1]) by mail1.khirnov.net (Postfix) with ESMTP id 4A31E4D42 for ; Fri, 7 Jun 2024 15:03:51 +0200 (CEST) Received: from mail1.khirnov.net ([IPv6:::1]) by localhost (mail1.khirnov.net [IPv6:::1]) (amavis, port 10024) with ESMTP id WoixkzKdX8pq for ; Fri, 7 Jun 2024 15:03:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=khirnov.net; s=mail; t=1717765422; bh=q4HK3pE1oAvBJizObCHv9wYRFMuyYvF3Po4iXjbtF40=; h=From:To:Subject:Date:In-Reply-To:References:From; b=KU1J2/MPxvCCHvFoqCjwsnfU3JHcCERa5owhNAkXf+g2nEzulwixMk8iMt/bfzAAL O6OvuiGBthjFyekP5oSwvnrmhNkh7llbn28/HaBO8hl0UWqjIj8+BwIN/qvK9555EF 46Swrcn7yw+jhMN1CZi+fiWZVJaS8z+XHTmiRrVMLZxUVRYyNfc6b8s3zbFqjN8Agp pS2RBrRXYtx1Qm0jzuXH5wb3G+cQNtWvOo5Tt/EBJc9ofjcogL0iRKsCmZQwbWC8jj YuYI5U5YHCppyZ/iAymkPwnUhKAwT4g5IF1CGwY/kuvlv0EYnpf2m5iyzKsyBfTi3y HU8Ru+PGm1ppQ== Received: from libav.khirnov.net (libav.khirnov.net [IPv6:2a00:c500:561:201::7]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "libav.khirnov.net", Issuer "smtp.khirnov.net SMTP CA" (verified OK)) by mail1.khirnov.net (Postfix) with ESMTPS id B10894E0B for ; Fri, 7 Jun 2024 15:03:42 +0200 (CEST) Received: from libav.khirnov.net (libav.khirnov.net [IPv6:::1]) by libav.khirnov.net (Postfix) with ESMTP id 0A7933A2729 for ; Fri, 07 Jun 2024 15:03:36 +0200 (CEST) From: Anton Khirnov To: ffmpeg-devel@ffmpeg.org Date: Fri, 7 Jun 2024 15:01:32 +0200 Message-ID: <20240607130135.9088-36-anton@khirnov.net> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240607130135.9088-1-anton@khirnov.net> References: <20240607130135.9088-1-anton@khirnov.net> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 36/39] lavc/hevcdec: factor decoding a slice NALU out of decode_nal_unit() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: OEg9YypQs6RX --- libavcodec/hevc/hevcdec.c | 97 +++++++++++++++++++++------------------ 1 file changed, 52 insertions(+), 45 deletions(-) diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c index b9aea45edb..7263b80a24 100644 --- a/libavcodec/hevc/hevcdec.c +++ b/libavcodec/hevc/hevcdec.c @@ -3065,10 +3065,60 @@ static int hevc_frame_end(HEVCContext *s) return 0; } +static int decode_slice(HEVCContext *s, const H2645NAL *nal, GetBitContext *gb) +{ + int ret; + + ret = hls_slice_header(&s->sh, s, gb); + if (ret < 0) + return ret; + + if ((s->avctx->skip_frame >= AVDISCARD_BIDIR && s->sh.slice_type == HEVC_SLICE_B) || + (s->avctx->skip_frame >= AVDISCARD_NONINTRA && s->sh.slice_type != HEVC_SLICE_I) || + (s->avctx->skip_frame >= AVDISCARD_NONKEY && !IS_IRAP(s)) || + ((s->nal_unit_type == HEVC_NAL_RASL_R || s->nal_unit_type == HEVC_NAL_RASL_N) && + s->no_rasl_output_flag)) { + return 0; + } + + if (s->sh.first_slice_in_pic_flag) { + if (s->cur_frame) { + av_log(s->avctx, AV_LOG_ERROR, "Two slices reporting being the first in the same frame.\n"); + return AVERROR_INVALIDDATA; + } + + ret = hevc_frame_start(s); + if (ret < 0) + return ret; + } else if (!s->cur_frame) { + av_log(s->avctx, AV_LOG_ERROR, "First slice in a frame missing.\n"); + return AVERROR_INVALIDDATA; + } + + if (s->nal_unit_type != s->first_nal_type) { + av_log(s->avctx, AV_LOG_ERROR, + "Non-matching NAL types of the VCL NALUs: %d %d\n", + s->first_nal_type, s->nal_unit_type); + return AVERROR_INVALIDDATA; + } + + ret = decode_slice_data(s, nal, gb); + if (ret < 0) + return ret; + if (ret >= s->cur_frame->ctb_count) { + ret = hevc_frame_end(s); + if (ret < 0) + return ret; + s->is_decoded = 1; + } + + return 0; +} + static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) { GetBitContext gb = nal->gb; - int ctb_addr_ts, ret; + int ret; s->nal_unit_type = nal->type; s->temporal_id = nal->temporal_id; @@ -3124,52 +3174,9 @@ static int decode_nal_unit(HEVCContext *s, const H2645NAL *nal) case HEVC_NAL_RADL_R: case HEVC_NAL_RASL_N: case HEVC_NAL_RASL_R: - ret = hls_slice_header(&s->sh, s, &gb); + ret = decode_slice(s, nal, &gb); if (ret < 0) - return ret; - - if ((s->avctx->skip_frame >= AVDISCARD_BIDIR && s->sh.slice_type == HEVC_SLICE_B) || - (s->avctx->skip_frame >= AVDISCARD_NONINTRA && s->sh.slice_type != HEVC_SLICE_I) || - (s->avctx->skip_frame >= AVDISCARD_NONKEY && !IS_IRAP(s)) || - ((s->nal_unit_type == HEVC_NAL_RASL_R || s->nal_unit_type == HEVC_NAL_RASL_N) && - s->no_rasl_output_flag)) { - break; - } - - if (s->sh.first_slice_in_pic_flag) { - if (s->cur_frame) { - av_log(s->avctx, AV_LOG_ERROR, "Two slices reporting being the first in the same frame.\n"); - ret = AVERROR_INVALIDDATA; - goto fail; - } - - ret = hevc_frame_start(s); - if (ret < 0) - return ret; - } else if (!s->cur_frame) { - av_log(s->avctx, AV_LOG_ERROR, "First slice in a frame missing.\n"); goto fail; - } - - if (s->nal_unit_type != s->first_nal_type) { - av_log(s->avctx, AV_LOG_ERROR, - "Non-matching NAL types of the VCL NALUs: %d %d\n", - s->first_nal_type, s->nal_unit_type); - return AVERROR_INVALIDDATA; - } - - ctb_addr_ts = decode_slice_data(s, nal, &gb); - if (ctb_addr_ts >= s->cur_frame->ctb_count) { - ret = hevc_frame_end(s); - if (ret < 0) - goto fail; - s->is_decoded = 1; - } - - if (ctb_addr_ts < 0) { - ret = ctb_addr_ts; - goto fail; - } break; case HEVC_NAL_EOS_NUT: case HEVC_NAL_EOB_NUT: