From patchwork Tue Jun 20 14:40:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 42253 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:be15:b0:121:b37c:e101 with SMTP id ge21csp1442212pzb; Tue, 20 Jun 2023 07:41:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7sP7hHrZ3q8YyNTjDfd9BZcWEll8RLu9AB4mNDFAb8buXySs6RycuCqC3pKeMO98zDc8QN X-Received: by 2002:a2e:838b:0:b0:2b4:6f70:c390 with SMTP id x11-20020a2e838b000000b002b46f70c390mr4245851ljg.15.1687272109272; Tue, 20 Jun 2023 07:41:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687272109; cv=none; d=google.com; s=arc-20160816; b=Yt+7wVMukubnEP6Oanlx1oLjCPByrZ90pKN3fcX2vZf2b267v8kck6LLTST+z5zVU+ kqcNkomgrjTDD+vkJkAO2ObemSh+eEal7KVD0LKJnSYkhvljRtFTxboTRiZb8CSjrjm/ NvV59ZjykF/OXVrh7UVd9ZBoRgdIiLqkuHZWH4V4BuMHCu/CUYrNmNw3K6Z7BoSOXw/8 BPlhkSi5Op0LYHhi1HpBQVf6FyRBFiDFFfg8VlepT3/REAWTglTBRtvuN8JWUxBmr5c3 e+CllY8i+TK44NWtJejfYVqtYrpz4tGTnYFQSAifpGXP0gFQhCCr50UCPiYVTo8NVDYZ +KxQ== 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=Qwwi2Dk49bs2FgtSff1ejl0Zi/AKiK3zZZ3Y85HIeVo=; b=TVqPbfAp56KW8Pd4ngBR6o6v5133ckGFRIF0U3qKuJYJ19mT0HVoeXErg00IvXftdD qDGKektXUmKxto0HUo7aQMdPUQcxJrZO7eJOL0ccWBmpyI6Gw59ikyXDqmaPjwc/FFqF 5G9gO7lCHcgnzlJ0Ks+o0ti6hPhsCNamZiXQ78MTF0Xf6TljQJjxrWqN4APUAbiLN9LW V884FgIL3OCU8tGKVW8b0KsMX87YaPru9WKbwaaQ8/ta4kMPFiHo45RekeY9ETrs/ePA KOVmTRUDtOmBh4c30vOBaCWtUb9sSTs2WufrzomUaJzbrtIKkFEHbf+qoWgM9HO97W8t 400A== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20221208 header.b=KI1HcXbq; 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 lo15-20020a170906fa0f00b009889deab56esi1205019ejb.129.2023.06.20.07.41.46; Tue, 20 Jun 2023 07:41:49 -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=KI1HcXbq; 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 6C78D68C1D4; Tue, 20 Jun 2023 17:41:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-oa1-f45.google.com (mail-oa1-f45.google.com [209.85.160.45]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCF8C68C10E for ; Tue, 20 Jun 2023 17:40:52 +0300 (EEST) Received: by mail-oa1-f45.google.com with SMTP id 586e51a60fabf-1a98cf01151so4741618fac.2 for ; Tue, 20 Jun 2023 07:40:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687272051; x=1689864051; 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=cu79aQshYjcqRbhaAkzNAzthXHWK9BEjfDiM9sGP2dg=; b=KI1HcXbqtyYPxrt8V8VOHiGDkuB51xJFnQ+zjVTocoN/tlqyDYUgWPJGeCw98HBGlT d5HqmAMEekO5ofZYYw8RhFrek5KOnE9Cz3XOr9q8qjugMOHI4WgROslSqTd/Lj08khG2 d+JHpaKL3lk/fQiJIUasLQGKFQGamE1dkrSIBsib8Z724U8XZsrWIVOiHUUUaLH9voSg Fo8104L3p+h1we/zg5SyIpU3j9hRWhjx1mPjPSs+/AvgiJfMFe+VhD1vn2q6rW8Uarvv AT4mcmNfcXTb7IRGQuFo3SRSpg7/hZKPhhZxTr5pN+xWaSMleZMCntzowBpueSbDhmBJ VFZA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687272051; x=1689864051; 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=cu79aQshYjcqRbhaAkzNAzthXHWK9BEjfDiM9sGP2dg=; b=iecj466CTGsCP9kx120SdOYM6u0jEmqDESE4FEKR1bcb2tlxH/PFqlXtyLVoxkX/7o a7kfgoYMvFTN9nqT8AME+4Z8sbe1FNI13V237qpSIkkq/U9QjAm0F2lQqedBN2efGWzX IjAozDMe73uVDfFYb1j8bi+dJa9h44SD2KNTHz6diUcr8SHwKLHF2qYIenBZyEZIFGoe +E3ChHtks3i9M0XmGpijEmrvvgoPQQIRn1HBnlFzTVu9yG781P/XJZoN934V0q3fsp+B OL+IoNtrvq+VdaP0cW4h/vd+KL60fYWF6uv6NiLUfk8fBv32i0lklE9/2fe0VGjrnvrd AwIg== X-Gm-Message-State: AC+VfDz6Kf015R9OgObGeIRhdgMfEOz3WafNm5Jjmni7cNMctc4E0YOJ Ww5y/otQf8W4o3y9Ovcz5u4o8wZe3BA= X-Received: by 2002:a05:6870:3895:b0:1a6:8173:e1a4 with SMTP id y21-20020a056870389500b001a68173e1a4mr8802871oan.44.1687272051177; Tue, 20 Jun 2023 07:40:51 -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.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Jun 2023 07:40:50 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Tue, 20 Jun 2023 11:40:40 -0300 Message-ID: <20230620144042.9629-7-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 7/9] avcodec/evc_frame_merge: 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: 6nTdEvlGS6mR Signed-off-by: James Almer --- libavcodec/evc_frame_merge_bsf.c | 48 +++++++++++--------------------- 1 file changed, 17 insertions(+), 31 deletions(-) diff --git a/libavcodec/evc_frame_merge_bsf.c b/libavcodec/evc_frame_merge_bsf.c index 3904170ebd..a9b44f4d10 100644 --- a/libavcodec/evc_frame_merge_bsf.c +++ b/libavcodec/evc_frame_merge_bsf.c @@ -74,57 +74,50 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) { EVCFMergeContext *ctx = bsf->priv_data; AVPacket *in = ctx->in; - uint8_t *buffer, *nalu = NULL; + uint8_t *buffer; GetBitContext gb; enum EVCNALUnitType nalu_type; - int tid, nalu_size = 0; - int au_end_found = 0; + uint32_t nalu_size; + int tid, au_end_found = 0; int err; err = ff_bsf_get_packet_ref(bsf, in); if (err < 0) return err; - nalu_size = evc_read_nal_unit_length(in->data, EVC_NALU_LENGTH_PREFIX_SIZE, bsf); - if (nalu_size <= 0) { - err = AVERROR_INVALIDDATA; - goto end; - } - - nalu = in->data + EVC_NALU_LENGTH_PREFIX_SIZE; - nalu_size = in->size - EVC_NALU_LENGTH_PREFIX_SIZE; - // NAL unit parsing needed to determine if end of AU was found - if (nalu_size <= 0) { + nalu_size = evc_read_nal_unit_length(in->data, EVC_NALU_LENGTH_PREFIX_SIZE, bsf); + if (!nalu_size || nalu_size > INT_MAX) { av_log(bsf, AV_LOG_ERROR, "Invalid NAL unit size: (%d)\n", nalu_size); err = AVERROR_INVALIDDATA; goto end; } + err = init_get_bits8(&gb, in->data + EVC_NALU_LENGTH_PREFIX_SIZE, nalu_size); + if (err < 0) + return err; + // @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(nalu, nalu_size, bsf); - if (nalu_type < EVC_NOIDR_NUT || nalu_type > EVC_UNSPEC_NUT62) { - av_log(bsf, AV_LOG_ERROR, "Invalid NAL unit type: (%d)\n", nalu_type); + if (get_bits1(&gb)) {// forbidden_zero_bit + av_log(bsf, AV_LOG_ERROR, "Invalid NAL unit header\n"); err = AVERROR_INVALIDDATA; goto end; } - tid = ff_evc_get_temporal_id(nalu, nalu_size, bsf); - if (tid < 0) { - av_log(bsf, 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(bsf, AV_LOG_ERROR, "Invalid NAL unit type: (%d)\n", nalu_type); err = AVERROR_INVALIDDATA; goto end; } - nalu += EVC_NALU_HEADER_SIZE; - nalu_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: - err = init_get_bits8(&gb, nalu, nalu_size); - if (err < 0) - return err; err = ff_evc_parse_sps(&gb, &ctx->ps); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "SPS parsing error\n"); @@ -132,9 +125,6 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) } break; case EVC_PPS_NUT: - err = init_get_bits8(&gb, nalu, nalu_size); - if (err < 0) - return err; err = ff_evc_parse_pps(&gb, &ctx->ps); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "PPS parsing error\n"); @@ -145,10 +135,6 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) case EVC_NOIDR_NUT: { EVCParserSliceHeader sh; - 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");