From patchwork Tue Jun 20 14:40:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42252 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp1442106pzb; Tue, 20 Jun 2023 07:41:38 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4M/s1x2SPdaq6dnNbfJv3EDg1SyU+NyEczF+ZM7cITmVzWwZ66uL/9lnkugs1NzFGXSXDn X-Received: by 2002:aa7:d815:0:b0:51a:53e8:f576 with SMTP id v21-20020aa7d815000000b0051a53e8f576mr5091078edq.1.1687272098221; Tue, 20 Jun 2023 07:41:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687272098; cv=none; d=google.com; s=arc-20160816; b=osTlx+lQ6vAAHFQOS+M2pb5lYN7yNYdePqZf1fBnG7V65qmP0cNf8Uv3Wont497qll nZ+EStw9b+ZEVAf7m2NHoBqnhFDP2bjaxZbH/Q41/TCZqTiUXmB7UgXVgA7Q/e360iS5 Vh4V/Vdt82U319bwF2KDgtJRaqC5z7/fPn8m7UNryKF0eggXzSRMMZzRR3Os5Oh9nhOh dqD7pd2AOIWfz5GklLNOM42w/ieY08D/1HgodVfeqOfotpuQVI2uTpDTQSQzZMNeQoRa v2EydiWUJ+d3clnaxlzvFTesfRBVJ6jv4n5wpllBGzRTJpSdontwIp32PmkNDEOeHgcX MN1A== 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=KR4v53gbQMfNqusJM3TZs0rvq/VXQtzrSqGbc2BIccI=; b=0wH/ic2T3hzkWHJKRU8Z233Qey8BapBZ4n8/Kw8C1pzAhrOpnEGo2LiK+U4geUmG7t hL6e96DFibVIZsQln9+spnhKAPR8HHvX9ALxoqLEcviGM52ikaKoLvr2fikCLV0gfa0A RMBXs3zIFa0aHwpY6pc8d43o0TdqmYSQYb14/qg0B8BMnb49mOJ/p4L9X1Vz4cKW5WY/ 7tDgiINgcAOASEff8MR7BzHezjRa4LShad+1qji3UjsQJ8Z1fPSEEdE4ZY9ImsZnxqKf ZgcKTV6JQNK0eW77DgqL+W6PWUWn+4ffRiHBq7gygCLMJVA0mrjbWmnCYKt/YRjy/Cgf 1eXg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=QfBcpjRw; 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 s25-20020a056402165900b00514b1f2da27si1156449edx.222.2023.06.20.07.41.37; Tue, 20 Jun 2023 07:41:38 -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=QfBcpjRw; 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 71BF568C156; Tue, 20 Jun 2023 17:40:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f52.google.com (mail-oa1-f52.google.com [209.85.160.52]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8740668C10E for ; Tue, 20 Jun 2023 17:40:51 +0300 (EEST) Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-1a98a7fde3fso4506336fac.3 for ; Tue, 20 Jun 2023 07:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687272050; x=1689864050; 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=ykyRcIvO2R+5ZRSAIPZgFyh1U8DHQ6iBSLROhOa4OCs=; b=QfBcpjRwVj0dt1G5ruiYvXbBXzpEzrt51jdX8yoFpn3KKbKgxw38kp+yeh3y7pnEpx WfgaqZ4S4om0GZDn0HBX15Ny5ZqI1s8Dwzh8Uu7llbin6N5kzo+ocla719Qmwloxb3Da 6IVt3ftRkFrsumMYfofXFBVuAhKGh23rd+eC+0qdIbQj7tH7235pC604mgZ3Lm+K5Gt5 jxZWA65G4zD2qwBKGmG41paWqsHU4RUgRKEnQE+az0awlK9J20ssMqXAd2s17OVLT8EF WSNP0Pd4+NA5fTGrAtGpcqt8GX7R4ZzOXRFUFAHQUdhJRso02Bq87B5Sk1by/N5q42YV wrew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687272050; x=1689864050; 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=ykyRcIvO2R+5ZRSAIPZgFyh1U8DHQ6iBSLROhOa4OCs=; b=N9V+lmrCEW6dXL0hgymw81I3Vt3JdELFjKM7nUwrAXhBqOhcZ2cZxtMftwAzsaDwZ6 e9cr7Tui/Gb1HsvS1PcIFVuAppgMv/Xjxthzq1Yx2P3skyyrn8w+NfOKPkbuSUJBJFVY 9fKzkdL7CmKiB/9u1kY4rXapOrPmB9THEmoBoaOtZz73WvcDDSmujgEdBRGnMWbwQVhU B7Jmp12LJOX19iKdI6ssJPO0hpjdaM/P5nkMO71L29+7/YK/MnZL9KaumVeA9cM1RJxW bo95rYS1JHnkpKYhQP7n6pkpxi73k6Ucg5mk9z9/Z9motGm7RRsMDIdXzr0WDsfOGKh0 J5Iw== X-Gm-Message-State: AC+VfDxWnB5042/Tx+GuMNnQ6hjrgpjRPjkpS4uxSJPrIIOJFFQqIcik 5nBQoj/7QQMZXtjWCZaRtbFI9/WM4jc= X-Received: by 2002:a05:6871:c18a:b0:19f:6af1:87f8 with SMTP id yr10-20020a056871c18a00b0019f6af187f8mr8210885oab.41.1687272049729; Tue, 20 Jun 2023 07:40:49 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id nl13-20020a056871458d00b001a69e7efd13sm1417838oab.5.2023.06.20.07.40.48 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 07:40:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2023 11:40:39 -0300 Message-ID: <20230620144042.9629-6-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230620144042.9629-1-jamrial@gmail.com> References: <20230620144042.9629-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 6/9] avcodec/evc_parse: pass a GetBitContext to the slice header parsing function 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: fvatUQ78KNUX Signed-off-by: James Almer --- libavcodec/evc_frame_merge_bsf.c | 6 +++- libavcodec/evc_parse.c | 52 ++++++++++++++------------------ libavcodec/evc_parse.h | 4 +-- libavcodec/evc_parser.c | 6 +++- 4 files changed, 35 insertions(+), 33 deletions(-) diff --git a/libavcodec/evc_frame_merge_bsf.c b/libavcodec/evc_frame_merge_bsf.c index bd30a09b15..3904170ebd 100644 --- a/libavcodec/evc_frame_merge_bsf.c +++ b/libavcodec/evc_frame_merge_bsf.c @@ -145,7 +145,11 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) case EVC_NOIDR_NUT: { EVCParserSliceHeader sh; - err = ff_evc_parse_slice_header(&sh, &ctx->ps, nalu_type, nalu, nalu_size); + err = init_get_bits8(&gb, nalu, nalu_size); + if (err < 0) + return err; + + err = ff_evc_parse_slice_header(&gb, &sh, &ctx->ps, nalu_type); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "Slice header parsing error\n"); goto end; diff --git a/libavcodec/evc_parse.c b/libavcodec/evc_parse.c index 0c35e40b47..dee48e947b 100644 --- a/libavcodec/evc_parse.c +++ b/libavcodec/evc_parse.c @@ -44,21 +44,15 @@ int ff_evc_get_temporal_id(const uint8_t *bits, int bits_size, void *logctx) } // @see ISO_IEC_23094-1 (7.3.2.6 Slice layer RBSP syntax) -int ff_evc_parse_slice_header(EVCParserSliceHeader *sh, const EVCParamSets *ps, - enum EVCNALUnitType nalu_type, const uint8_t *bs, int bs_size) +int ff_evc_parse_slice_header(GetBitContext *gb, EVCParserSliceHeader *sh, + const EVCParamSets *ps, enum EVCNALUnitType nalu_type) { - GetBitContext gb; const EVCParserPPS *pps; const EVCParserSPS *sps; - int num_tiles_in_slice = 0; int slice_pic_parameter_set_id; - int ret; - - if ((ret = init_get_bits8(&gb, bs, bs_size)) < 0) - return ret; - slice_pic_parameter_set_id = get_ue_golomb(&gb); + 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 AVERROR_INVALIDDATA; @@ -75,47 +69,47 @@ int ff_evc_parse_slice_header(EVCParserSliceHeader *sh, const EVCParamSets *ps, sh->slice_pic_parameter_set_id = slice_pic_parameter_set_id; if (!pps->single_tile_in_pic_flag) { - sh->single_tile_in_slice_flag = get_bits1(&gb); - sh->first_tile_id = get_bits(&gb, pps->tile_id_len_minus1 + 1); + sh->single_tile_in_slice_flag = get_bits1(gb); + sh->first_tile_id = get_bits(gb, pps->tile_id_len_minus1 + 1); } else sh->single_tile_in_slice_flag = 1; if (!sh->single_tile_in_slice_flag) { if (pps->arbitrary_slice_present_flag) - sh->arbitrary_slice_flag = get_bits1(&gb); + sh->arbitrary_slice_flag = get_bits1(gb); if (!sh->arbitrary_slice_flag) - sh->last_tile_id = get_bits(&gb, pps->tile_id_len_minus1 + 1); + sh->last_tile_id = get_bits(gb, pps->tile_id_len_minus1 + 1); else { - sh->num_remaining_tiles_in_slice_minus1 = get_ue_golomb(&gb); + sh->num_remaining_tiles_in_slice_minus1 = get_ue_golomb(gb); num_tiles_in_slice = sh->num_remaining_tiles_in_slice_minus1 + 2; for (int i = 0; i < num_tiles_in_slice - 1; ++i) - sh->delta_tile_id_minus1[i] = get_ue_golomb(&gb); + sh->delta_tile_id_minus1[i] = get_ue_golomb(gb); } } - sh->slice_type = get_ue_golomb(&gb); + sh->slice_type = get_ue_golomb(gb); if (nalu_type == EVC_IDR_NUT) - sh->no_output_of_prior_pics_flag = get_bits1(&gb); + sh->no_output_of_prior_pics_flag = get_bits1(gb); if (sps->sps_mmvd_flag && ((sh->slice_type == EVC_SLICE_TYPE_B) || (sh->slice_type == EVC_SLICE_TYPE_P))) - sh->mmvd_group_enable_flag = get_bits1(&gb); + sh->mmvd_group_enable_flag = get_bits1(gb); else sh->mmvd_group_enable_flag = 0; if (sps->sps_alf_flag) { int ChromaArrayType = sps->chroma_format_idc; - sh->slice_alf_enabled_flag = get_bits1(&gb); + sh->slice_alf_enabled_flag = get_bits1(gb); if (sh->slice_alf_enabled_flag) { - sh->slice_alf_luma_aps_id = get_bits(&gb, 5); - sh->slice_alf_map_flag = get_bits1(&gb); - sh->slice_alf_chroma_idc = get_bits(&gb, 2); + sh->slice_alf_luma_aps_id = get_bits(gb, 5); + sh->slice_alf_map_flag = get_bits1(gb); + sh->slice_alf_chroma_idc = get_bits(gb, 2); if ((ChromaArrayType == 1 || ChromaArrayType == 2) && sh->slice_alf_chroma_idc > 0) - sh->slice_alf_chroma_aps_id = get_bits(&gb, 5); + sh->slice_alf_chroma_aps_id = get_bits(gb, 5); } if (ChromaArrayType == 3) { int sliceChromaAlfEnabledFlag = 0; @@ -136,23 +130,23 @@ int ff_evc_parse_slice_header(EVCParserSliceHeader *sh, const EVCParamSets *ps, } if (!sh->slice_alf_enabled_flag) - sh->slice_alf_chroma_idc = get_bits(&gb, 2); + sh->slice_alf_chroma_idc = get_bits(gb, 2); if (sliceChromaAlfEnabledFlag) { - sh->slice_alf_chroma_aps_id = get_bits(&gb, 5); - sh->slice_alf_chroma_map_flag = get_bits1(&gb); + sh->slice_alf_chroma_aps_id = get_bits(gb, 5); + sh->slice_alf_chroma_map_flag = get_bits1(gb); } if (sliceChroma2AlfEnabledFlag) { - sh->slice_alf_chroma2_aps_id = get_bits(&gb, 5); - sh->slice_alf_chroma2_map_flag = get_bits1(&gb); + sh->slice_alf_chroma2_aps_id = get_bits(gb, 5); + sh->slice_alf_chroma2_map_flag = get_bits1(gb); } } } if (nalu_type != EVC_IDR_NUT) { if (sps->sps_pocs_flag) - sh->slice_pic_order_cnt_lsb = get_bits(&gb, sps->log2_max_pic_order_cnt_lsb_minus4 + 4); + sh->slice_pic_order_cnt_lsb = get_bits(gb, sps->log2_max_pic_order_cnt_lsb_minus4 + 4); } // @note diff --git a/libavcodec/evc_parse.h b/libavcodec/evc_parse.h index a1fbbc643d..322f52c928 100644 --- a/libavcodec/evc_parse.h +++ b/libavcodec/evc_parse.h @@ -117,8 +117,8 @@ static inline uint32_t evc_read_nal_unit_length(const uint8_t *bits, int bits_si // nuh_temporal_id specifies a temporal identifier for the NAL unit int ff_evc_get_temporal_id(const uint8_t *bits, int bits_size, void *logctx); -int ff_evc_parse_slice_header(EVCParserSliceHeader *sh, const EVCParamSets *ps, - enum EVCNALUnitType nalu_type, const uint8_t *buf, int buf_size); +int ff_evc_parse_slice_header(GetBitContext *gb, EVCParserSliceHeader *sh, + const EVCParamSets *ps, enum EVCNALUnitType nalu_type); // 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 diff --git a/libavcodec/evc_parser.c b/libavcodec/evc_parser.c index 8dd6b5fda7..ae399ef8cc 100644 --- a/libavcodec/evc_parser.c +++ b/libavcodec/evc_parser.c @@ -116,7 +116,11 @@ static int parse_nal_unit(AVCodecParserContext *s, AVCodecContext *avctx, EVCParserSliceHeader sh; int bit_depth; - ret = ff_evc_parse_slice_header(&sh, &ctx->ps, nalu_type, buf, buf_size); + ret = init_get_bits8(&gb, buf, buf_size); + if (ret < 0) + return ret; + + ret = ff_evc_parse_slice_header(&gb, &sh, &ctx->ps, nalu_type); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "Slice header parsing error\n"); return ret;