From patchwork Thu Jun 15 15:18:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42114 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:c526:b0:117:ac03:c9de with SMTP id gm38csp866271pzb; Thu, 15 Jun 2023 08:19:41 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ46pW8N9sdFODSRipRCJbkqjndok6HHeuVp+jXJD9Q5Bkj9JsVG7N8XqqiyUKGedUo8toEd X-Received: by 2002:a05:651c:10cc:b0:2af:1c62:c133 with SMTP id l12-20020a05651c10cc00b002af1c62c133mr8247397ljn.8.1686842381552; Thu, 15 Jun 2023 08:19:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1686842381; cv=none; d=google.com; s=arc-20160816; b=oeG31Ize08o/Jdzxu5DxXJQCrhUQIwnBv6gRBYWeJf6hLmDomIIE7+JBemInzAjGLK DCcglPutg3q7tnGZIfZyyb9b5icyBV5bCWMYw6ZxoT1llWIfdlr7dl7fND9WVndmn88y 2maqSWY2ywecdk7/derpi+VqPNHoRoC3ummQExsgjtOCS/jPS5RVX4O2qYU9W/cW8xQv P0grGdKE5ES+7zcGM5mmWuVFocd0tJuympaGTOvSwTpz+wbquEVBCqtfgxUfO36+ZwTb c/u3rdUqdmzca63POxrOlwLdF/St6zgcBnrMvxo+tuoHrDP83aAbDWthJrC/QR3k7o6T OWhw== 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=7EfMBZFnHuMpJ45sy2LdRdryThOmmxc8RvPuFU+m1xY=; b=hVPnCkJSwHm3eZmjTM7BsAclJOIPtkGPyZmyBuMCYhRqlFaMRHFgMyUzdibtcuu5T9 KrwImG3TFWPrDRjrIaiVjwJideFiI+zG59ljFdCnLZcrYD+s9tjTC9dR4YTD3HPPrbxf 2exEHqbP4wFir5bGaJz4+qXLd6Y8Oal1UjaiN/Y/lpRL1qhN2Oz7cyImAhxKFHws7JQr AtdXnMg2agiNs2vqYB3kGi7R33hfPNQhyC24ZQ7sYRFXY0531OKio6W6jwhO3xLnljxR xKl+/5cEbu+5jiBY9At6vYf5qTvrbfustA9rPpox+W74EkTT+D72JB65ucGBnTGFhdEo UJjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=phNxK10B; 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=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id j4-20020aa7c0c4000000b0051a2cf14d62si658082edp.39.2023.06.15.08.19.40; Thu, 15 Jun 2023 08:19:41 -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=@gmail.com header.s=20221208 header.b=phNxK10B; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 459EB68C559; Thu, 15 Jun 2023 18:19:07 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ot1-f51.google.com (mail-ot1-f51.google.com [209.85.210.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3C2B668C54C for ; Thu, 15 Jun 2023 18:19:01 +0300 (EEST) Received: by mail-ot1-f51.google.com with SMTP id 46e09a7af769-6b2c6238cf3so4978098a34.3 for ; Thu, 15 Jun 2023 08:19:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1686842339; x=1689434339; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=56TOzf8eyJYLWEaQzcBQIW3/5qRSuIq6UWYRI/MELvc=; b=phNxK10B3oQyL3LNp1o/FOQezVHU6ecVMcAyxYJw6RuqHdlwojOX8h54Fts4yFJWH7 nBdoFT6c3v0kAo+GEm63moErJFIblikknb8bK/VegvaUNC9WjQMTsyYMgiMKTlRtYK4p g50Nn/ceFAsCH9VvF99MQK48K5+pKMY77kPOUrSOdFG/Xz44pRk3hkUeq3NT+VwsCzBx HTSnnifxyqnhfcuKhpNUwFeQ93wLV3GcrZM8ioWpXK+DH7a1Fvft6TgoFHZ/G8cJP862 qVnrGLka/3rXRH5Xi3w2QoLSous4VUVhwkt2Q9UB0iHAeELLBe3fpyxTcR7l7uDiBoEi Wd3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1686842339; x=1689434339; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=56TOzf8eyJYLWEaQzcBQIW3/5qRSuIq6UWYRI/MELvc=; b=A1ptCRC6k2D0iPg9/YTSKWAyk6qL7CG+maB58WP/TcQKkLxLOLPBbXQvVAJjgltT08 FfN6cJXXyvTQ/eFq+R0d7sQC4O4pUdY77SH0mEMvHADyIJzPAZHxIkwCsjZ+7ljykfgs 2tvpj53u1bp0pWE5VavF3NL5F95JBGm9huCWQO/djpuIldHFb1uGKwI7ARHxX8tK9TNH QY3rjFZKJhziS2GsszFHsg2mZ8StSJ+G03pKuoiFTgIv9MzOshmNnu+pS9ZfoEP/f5Hv DTwWmUQ/PzHoz2GicYkDEtrDFcNi3UBLqOKr138D7OGz5AhJHsl/BQi1BkLnCmZHxwNu xPyA== X-Gm-Message-State: AC+VfDyHTf0RAZMNHrvTjjcfIgUkFbUSLQCmg8SUlODPtP4Iei4lpSBx NGLuoRfSR581XcWMLN53Km0N1yBOfyE= X-Received: by 2002:a05:6870:6296:b0:19f:14a7:b5f5 with SMTP id s22-20020a056870629600b0019f14a7b5f5mr13131529oan.18.1686842338460; Thu, 15 Jun 2023 08:18:58 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id ve17-20020a0568710c1100b001a6a3f99691sm4748405oab.27.2023.06.15.08.18.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Jun 2023 08:18:57 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 15 Jun 2023 12:18:29 -0300 Message-ID: <20230615151836.50535-5-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230615151836.50535-1-jamrial@gmail.com> References: <20230615151836.50535-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 05/11] avcodec/evc_parse: use a local EVCParserSliceHeader when parsing slices 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: YflhkIlEQPPk There's no need to store EVC_MAX_PPS_COUNT amount of slice headers in EVCParserContext. Signed-off-by: James Almer --- libavcodec/evc_parse.c | 50 +++++++++++++++++------------------------ libavcodec/evc_parse.h | 4 ---- libavcodec/evc_parser.c | 2 -- 3 files changed, 21 insertions(+), 35 deletions(-) diff --git a/libavcodec/evc_parse.c b/libavcodec/evc_parse.c index f8a4ca3e07..71e2605281 100644 --- a/libavcodec/evc_parse.c +++ b/libavcodec/evc_parse.c @@ -419,40 +419,33 @@ EVCParserPPS *ff_evc_parse_pps(EVCParserContext *ctx, const uint8_t *bs, int bs_ } // @see ISO_IEC_23094-1 (7.3.2.6 Slice layer RBSP syntax) -EVCParserSliceHeader *ff_evc_parse_slice_header(EVCParserContext *ctx, const uint8_t *bs, int bs_size) +static int evc_parse_slice_header(EVCParserContext *ctx, EVCParserSliceHeader *sh, const uint8_t *bs, int bs_size) { GetBitContext gb; - EVCParserSliceHeader *sh; EVCParserPPS *pps; EVCParserSPS *sps; int num_tiles_in_slice = 0; int slice_pic_parameter_set_id; + int ret; - if (init_get_bits8(&gb, bs, bs_size) < 0) - return NULL; + if ((ret = init_get_bits8(&gb, bs, bs_size)) < 0) + return ret; slice_pic_parameter_set_id = get_ue_golomb(&gb); if (slice_pic_parameter_set_id < 0 || slice_pic_parameter_set_id >= EVC_MAX_PPS_COUNT) - return NULL; - - if(!ctx->slice_header[slice_pic_parameter_set_id]) { - if((ctx->slice_header[slice_pic_parameter_set_id] = av_malloc(sizeof(EVCParserSliceHeader))) == NULL) - return NULL; - } - - sh = ctx->slice_header[slice_pic_parameter_set_id]; - memset(sh, 0, sizeof(*sh)); + return AVERROR_INVALIDDATA; pps = ctx->pps[slice_pic_parameter_set_id]; if(!pps) - return NULL; + return AVERROR_INVALIDDATA; sps = ctx->sps[slice_pic_parameter_set_id]; if(!sps) - return NULL; + return AVERROR_INVALIDDATA; + memset(sh, 0, sizeof(*sh)); sh->slice_pic_parameter_set_id = slice_pic_parameter_set_id; if (!pps->single_tile_in_pic_flag) { @@ -540,7 +533,7 @@ EVCParserSliceHeader *ff_evc_parse_slice_header(EVCParserContext *ctx, const uin // If necessary, add the missing fields to the EVCParserSliceHeader structure // and then extend parser implementation - return sh; + return 0; } int ff_evc_parse_nal_unit(EVCParserContext *ctx, const uint8_t *buf, int buf_size, void *logctx) @@ -660,17 +653,17 @@ int ff_evc_parse_nal_unit(EVCParserContext *ctx, const uint8_t *buf, int buf_siz break; case EVC_IDR_NUT: // Coded slice of a IDR or non-IDR picture case EVC_NOIDR_NUT: { - EVCParserSliceHeader *sh; + EVCParserSliceHeader sh; EVCParserSPS *sps; - int slice_pic_parameter_set_id; + int ret; - sh = ff_evc_parse_slice_header(ctx, data, nalu_size); - if (!sh) { + ret = evc_parse_slice_header(ctx, &sh, data, nalu_size); + if (ret < 0) { av_log(logctx, AV_LOG_ERROR, "Slice header parsing error\n"); - return AVERROR_INVALIDDATA; + return ret; } - switch (sh->slice_type) { + switch (sh.slice_type) { case EVC_SLICE_TYPE_B: { ctx->pict_type = AV_PICTURE_TYPE_B; break; @@ -692,8 +685,7 @@ int ff_evc_parse_nal_unit(EVCParserContext *ctx, const uint8_t *buf, int buf_siz // POC (picture order count of the current picture) derivation // @see ISO/IEC 23094-1:2020(E) 8.3.1 Decoding process for picture order count - slice_pic_parameter_set_id = sh->slice_pic_parameter_set_id; - sps = ctx->sps[slice_pic_parameter_set_id]; + sps = ctx->sps[sh.slice_pic_parameter_set_id]; if (sps && sps->sps_pocs_flag) { @@ -709,20 +701,20 @@ int ff_evc_parse_nal_unit(EVCParserContext *ctx, const uint8_t *buf, int buf_siz int prevPicOrderCntMsb = ctx->poc.PicOrderCntVal - prevPicOrderCntLsb; - if ((sh->slice_pic_order_cnt_lsb < prevPicOrderCntLsb) && - ((prevPicOrderCntLsb - sh->slice_pic_order_cnt_lsb) >= (MaxPicOrderCntLsb / 2))) + if ((sh.slice_pic_order_cnt_lsb < prevPicOrderCntLsb) && + ((prevPicOrderCntLsb - sh.slice_pic_order_cnt_lsb) >= (MaxPicOrderCntLsb / 2))) PicOrderCntMsb = prevPicOrderCntMsb + MaxPicOrderCntLsb; - else if ((sh->slice_pic_order_cnt_lsb > prevPicOrderCntLsb) && - ((sh->slice_pic_order_cnt_lsb - prevPicOrderCntLsb) > (MaxPicOrderCntLsb / 2))) + else if ((sh.slice_pic_order_cnt_lsb > prevPicOrderCntLsb) && + ((sh.slice_pic_order_cnt_lsb - prevPicOrderCntLsb) > (MaxPicOrderCntLsb / 2))) PicOrderCntMsb = prevPicOrderCntMsb - MaxPicOrderCntLsb; else PicOrderCntMsb = prevPicOrderCntMsb; } - ctx->poc.PicOrderCntVal = PicOrderCntMsb + sh->slice_pic_order_cnt_lsb; + ctx->poc.PicOrderCntVal = PicOrderCntMsb + sh.slice_pic_order_cnt_lsb; } else { if (nalu_type == EVC_IDR_NUT) { diff --git a/libavcodec/evc_parse.h b/libavcodec/evc_parse.h index d74a3b5159..1c1b8ec093 100644 --- a/libavcodec/evc_parse.h +++ b/libavcodec/evc_parse.h @@ -261,7 +261,6 @@ typedef struct EVCParserContext { //ParseContext pc; EVCParserSPS *sps[EVC_MAX_SPS_COUNT]; EVCParserPPS *pps[EVC_MAX_PPS_COUNT]; - EVCParserSliceHeader *slice_header[EVC_MAX_PPS_COUNT]; EVCParserPoc poc; @@ -349,9 +348,6 @@ EVCParserSPS *ff_evc_parse_sps(EVCParserContext *ctx, const uint8_t *bs, int bs_ // @see ISO_IEC_23094-1 (7.3.2.2 SPS RBSP syntax) EVCParserPPS *ff_evc_parse_pps(EVCParserContext *ctx, const uint8_t *bs, int bs_size); -// @see ISO_IEC_23094-1 (7.3.2.6 Slice layer RBSP syntax) -EVCParserSliceHeader *ff_evc_parse_slice_header(EVCParserContext *ctx, const uint8_t *bs, int bs_size); - int ff_evc_parse_nal_unit(EVCParserContext *ctx, const uint8_t *buf, int buf_size, void *logctx); #endif /* AVCODEC_EVC_PARSE_H */ diff --git a/libavcodec/evc_parser.c b/libavcodec/evc_parser.c index 5feb673b04..072fe41bf1 100644 --- a/libavcodec/evc_parser.c +++ b/libavcodec/evc_parser.c @@ -209,10 +209,8 @@ static void evc_parser_close(AVCodecParserContext *s) for(int i = 0; i < EVC_MAX_PPS_COUNT; i++) { EVCParserPPS *pps = ctx->pps[i]; - EVCParserSliceHeader *sh = ctx->slice_header[i]; av_freep(&pps); - av_freep(&sh); } }