From patchwork Tue Jun 20 14:40:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42254 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp1442276pzb; Tue, 20 Jun 2023 07:41:56 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6OB0n6rX1AkvX2XXIf+ZzkmmmJZjWTYra+awvNWptaT2ZBo8ZMd9/RVgfT1dyNYK1kDdZs X-Received: by 2002:aa7:c55a:0:b0:51a:4d8d:e4db with SMTP id s26-20020aa7c55a000000b0051a4d8de4dbmr5815531edr.23.1687272115697; Tue, 20 Jun 2023 07:41:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687272115; cv=none; d=google.com; s=arc-20160816; b=kbtPN1sZxZgGhjbLT+QVgMoOItDqtfwu5UCk/4g1u8ua1EIiGt6nlxskdXPaLmSw8R bvbvhBuG6vK14gL05r8V83onOCeXwt0FvqoiFrdgWDsQnuyCaAOCggsUo/8TEHF1zF7p Jl/xEP1p3G484sbvzLMknV47Ddgal+8rXmxcZb1HJ5MGteXIfXx+5wf/EdfAXD40jPaW Pgp82AkSEX6EAuTqWV0HlpcYzOBGuEfJK8WTRxxLgDlv5quWmrTkBmiYJGA47CPvu7Zq xEQCxW6lk0nE6D3d96xNn2LSgwEj0z9+RioA6qyegq1vAUsj9eQ4V+BRh98xCI0ffJg+ m4Kw== 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=WdodJa30uZx/qLe0egv1SrPN5re5Dxh/ujCwPV15U4Y=; b=XV7Vt2v/3tzMwYg4Iwrz3u1ZuH82cKI7RErRDm6dC7sieKTtVSFua8Aeyfd/IMJ7Ih 7jow7pN+C12nrAxH5WZhKRBxerKVW/YC1Lxu3Tle88kKolq8SWJjURYg1RbAJmsKYxDv J9ZRqpul5EQNgl927IJ+PQx2DLdV7ugr7f+7zgC1wgzwS1+VFGhcWwIyQSpnAumZdRSb iUXQB1Dd+XfAIlDybh+jmhfUm4lEqGwOb3vds8S4Ejj2+O/Mk1LRCSmZR8bc8riSwREJ eGwV+itFvMOtxqPdepISso6SvzTDP1NeH+Fh25JEByIwDphlSh9HL+5YiUyV+o0BNUdE Exxg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b="LZ/4MLbr"; 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 bf20-20020a0564021a5400b0051a327d1940si1225834edb.89.2023.06.20.07.41.55; Tue, 20 Jun 2023 07:41:55 -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="LZ/4MLbr"; 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 668DC68C1E7; Tue, 20 Jun 2023 17:41:01 +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 25E1D68C1AF for ; Tue, 20 Jun 2023 17:40:54 +0300 (EEST) Received: by mail-oa1-f52.google.com with SMTP id 586e51a60fabf-1a9a2724a62so4308977fac.2 for ; Tue, 20 Jun 2023 07:40:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687272052; x=1689864052; 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=aGsPe3kVWT90iNM/jX35HiOIz9ZOr44lB2fy7AHRicY=; b=LZ/4MLbrbiZ42z/xoJ23MsTK0v9WE4F6Vo1mcxKtcTugLHCfSbHevEofM6RT8/60VJ uGmigqhk7p9J49pYVBB3EizK4a0AEgyFcHx4yOAt/ADwrsA3gQBft4YKXBPLTBd+/UAM 2v4tQyFFAc1ZDQ96yN++ymnKUsEasU+FYBfAZ6SKZOsycEvjUbsS6CLFR3ZIHP5dm9m4 nAoiPb9Y2xxNTHSgdMT7uOJDAim9hqbQ28GKtAX0aUcc8/4pdXANxoUXRrzovLxUvGNA P9qzoAVZPk4Qm3bKHvVJOwjCzvdmeOd/epxWiFS/8lK14ajjJqOTCuOXPB5v1U1Z23ID ZqPQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687272052; x=1689864052; 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=aGsPe3kVWT90iNM/jX35HiOIz9ZOr44lB2fy7AHRicY=; b=lz+2oHQF8yfAvoytprYORildmfUU2fsWKCbi+ZVuDUxfZT1WjnO2GHTXX4dFUwaIdE bw8jQF46OrGIbNbjoytVApVqRDJrveGIo9aDimgI+eNGXFLUB6CVbwhDqSJEdO+kZXoe LJlTMYvzKtZK4p5hyrv4FUokJf0CvLH5yCksxYkdiaIY+n/wWu/48gyKSydkDuuImQcA Bb5mLpWjUSQ4zvqd++2UsdLCTFPfpr/n45o8Xjt8sIsUxy8elHkxUYSVenMYVavucOxd NK1fOkoKqaIzOe+rDxPNX206j5Fd9vQwHBIMYG7Bn8IIhIrTSqIAZtNowMzSrY1umkpF mShg== X-Gm-Message-State: AC+VfDzVXfpNEyEfBYVf42jP+KNRd84ODAA5RtU4mO8yihrwmLL7p1fr EvyY5WAHvQ/EbjH9dOhiqu5rXxYAfUo= X-Received: by 2002:a05:6871:6ba6:b0:19a:1331:f6df with SMTP id zh38-20020a0568716ba600b0019a1331f6dfmr6344967oab.45.1687272052434; Tue, 20 Jun 2023 07:40:52 -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.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 07:40:52 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2023 11:40:41 -0300 Message-ID: <20230620144042.9629-8-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 8/9] avcodec/evc_parser: use a GetBitContext to parse entire NALUs 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: UYFfyFNdU2tC Signed-off-by: James Almer --- libavcodec/evc_parse.c | 22 ---------------------- libavcodec/evc_parse.h | 22 ---------------------- libavcodec/evc_parser.c | 30 ++++++++++++------------------ 3 files changed, 12 insertions(+), 62 deletions(-) diff --git a/libavcodec/evc_parse.c b/libavcodec/evc_parse.c index dee48e947b..eff4b7bc38 100644 --- a/libavcodec/evc_parse.c +++ b/libavcodec/evc_parse.c @@ -21,28 +21,6 @@ #include "evc.h" #include "evc_parse.h" -// 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 temporal_id = 0; - uint16_t t = 0; - - if (bits_size < EVC_NALU_HEADER_SIZE) { - av_log(logctx, AV_LOG_ERROR, "Can't read NAL unit header\n"); - return 0; - } - - // forbidden_zero_bit - if ((bits[0] & 0x80) != 0) - return -1; - - t = AV_RB16(bits); - - temporal_id = (t >> 6) & 0x0007; - - return temporal_id; -} - // @see ISO_IEC_23094-1 (7.3.2.6 Slice layer RBSP syntax) int ff_evc_parse_slice_header(GetBitContext *gb, EVCParserSliceHeader *sh, const EVCParamSets *ps, enum EVCNALUnitType nalu_type) diff --git a/libavcodec/evc_parse.h b/libavcodec/evc_parse.h index 322f52c928..0f142976f5 100644 --- a/libavcodec/evc_parse.h +++ b/libavcodec/evc_parse.h @@ -81,25 +81,6 @@ typedef struct EVCParserPoc { int DocOffset; // the decoding order count of the previous picture } EVCParserPoc; -static inline int evc_get_nalu_type(const uint8_t *bits, int bits_size, void *logctx) -{ - int unit_type_plus1 = 0; - - if (bits_size >= EVC_NALU_HEADER_SIZE) { - unsigned char *p = (unsigned char *)bits; - // forbidden_zero_bit - if ((p[0] & 0x80) != 0) { - av_log(logctx, AV_LOG_ERROR, "Invalid NAL unit header\n"); - return -1; - } - - // nal_unit_type - unit_type_plus1 = (p[0] >> 1) & 0x3F; - } - - return unit_type_plus1 - 1; -} - static inline uint32_t evc_read_nal_unit_length(const uint8_t *bits, int bits_size, void *logctx) { uint32_t nalu_len = 0; @@ -114,9 +95,6 @@ static inline uint32_t evc_read_nal_unit_length(const uint8_t *bits, int bits_si return nalu_len; } -// 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(GetBitContext *gb, EVCParserSliceHeader *sh, const EVCParamSets *ps, enum EVCNALUnitType nalu_type); diff --git a/libavcodec/evc_parser.c b/libavcodec/evc_parser.c index ae399ef8cc..76790d8111 100644 --- a/libavcodec/evc_parser.c +++ b/libavcodec/evc_parser.c @@ -71,28 +71,29 @@ static int parse_nal_unit(AVCodecParserContext *s, AVCodecContext *avctx, return AVERROR_INVALIDDATA; } + ret = init_get_bits8(&gb, buf, buf_size); + if (ret < 0) + return ret; + // @see ISO_IEC_23094-1_2020, 7.4.2.2 NAL unit header semantic (Table 4 - NAL unit type codes and NAL unit type classes) // @see enum EVCNALUnitType in evc.h - nalu_type = evc_get_nalu_type(buf, buf_size, avctx); - if (nalu_type < EVC_NOIDR_NUT || nalu_type > EVC_UNSPEC_NUT62) { - av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit type: (%d)\n", nalu_type); + if (get_bits1(&gb)) {// forbidden_zero_bit + av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit header\n"); return AVERROR_INVALIDDATA; } - tid = ff_evc_get_temporal_id(buf, buf_size, avctx); - if (tid < 0) { - av_log(avctx, AV_LOG_ERROR, "Invalid temporial id: (%d)\n", tid); + nalu_type = get_bits(&gb, 6) - 1; + if (nalu_type < EVC_NOIDR_NUT || nalu_type > EVC_UNSPEC_NUT62) { + av_log(avctx, AV_LOG_ERROR, "Invalid NAL unit type: (%d)\n", nalu_type); return AVERROR_INVALIDDATA; } - buf += EVC_NALU_HEADER_SIZE; - buf_size -= EVC_NALU_HEADER_SIZE; + tid = get_bits(&gb, 3); + skip_bits(&gb, 5); // nuh_reserved_zero_5bits + skip_bits1(&gb); // nuh_extension_flag switch (nalu_type) { case EVC_SPS_NUT: - ret = init_get_bits8(&gb, buf, buf_size); - if (ret < 0) - return ret; ret = ff_evc_parse_sps(&gb, &ctx->ps); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "SPS parsing error\n"); @@ -100,9 +101,6 @@ static int parse_nal_unit(AVCodecParserContext *s, AVCodecContext *avctx, } break; case EVC_PPS_NUT: - ret = init_get_bits8(&gb, buf, buf_size); - if (ret < 0) - return ret; ret = ff_evc_parse_pps(&gb, &ctx->ps); if (ret < 0) { av_log(avctx, AV_LOG_ERROR, "PPS parsing error\n"); @@ -116,10 +114,6 @@ static int parse_nal_unit(AVCodecParserContext *s, AVCodecContext *avctx, EVCParserSliceHeader sh; int bit_depth; - 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");