From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id ABB5F46590 for ; Wed, 21 Jun 2023 17:00:01 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 5D7A168C062; Wed, 21 Jun 2023 19:59:58 +0300 (EEST) Received: from mail-ot1-f48.google.com (mail-ot1-f48.google.com [209.85.210.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 43E4E68BF73 for ; Wed, 21 Jun 2023 19:59:52 +0300 (EEST) Received: by mail-ot1-f48.google.com with SMTP id 46e09a7af769-6b58351327eso2962184a34.1 for ; Wed, 21 Jun 2023 09:59:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687366790; x=1689958790; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=5YX+ZIPHuf8psx/KO9eTucCuXf6jhEQhA82n0ti3Ubk=; b=nnczZue33P+AJ9LXoagvGaowKd40sa3f1vSgybEblz1xd/EW3L1ikjzfFzdN1uz5Eq lrDYxMo5/QuVZaYz49eBi9YqtjRamP9ubQQNQEa42+ynkQufCEl3CY6UE3gJ+Igmg5/0 xS0Lpan3fgtOzAfbeJ7YHc8fjQmEXMSrcKr55in4YH6lWGMz/2BD+moPPmqSTJ7sCCUH C5tNXwq32VFPSH/rnnQVAWia5PtsHw7RQmZPadPX6dHkgLiotEdrvCSa5iyXtDePThzs rw9DyqfCeNaVWYNbq5hCj3rrsylHnv+bFrUeIGodDgTqLW6ss7Bumy2DcS7++MmTuOXe 8O+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687366790; x=1689958790; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=5YX+ZIPHuf8psx/KO9eTucCuXf6jhEQhA82n0ti3Ubk=; b=jNk0wXIK+c38boE9ngbn0El2Gn0cafPCGDkzaVrYTeKq9HPRA3STnDO61oLnADTsbb rZlwZa8Ir+EpaL7Y2uOoVVZSjuu4l/pgx0K71ht6NSdnucBSd5pRz6Rq4KxfZo6FEWbV VmBsLPqSV49J9nAneMx+OFCSBNgQ9SK2UZj2bqDx5vuQG2ih0u6xiS3koWxgAk/xTqWm SNOtA2HxNJKJfVaFeQtwrKiaIL4qza3YSG09sJI3T1qsRnA5BAzjHofE7DmgPGSSxq5W K1MJzCnS6vYyr8xl9wyzJ2DDMUDvcrTnJ/xH88nfIO3igSjl3O0aKda+XbPehwEwf7p7 rtaA== X-Gm-Message-State: AC+VfDxXdf7reohDgvWMAaVYlsc1Yv8e5NBhVs00Y78K6wx2u0Q3YXAH JPzRXWKtSU657HhJRGgyku7APUSP4Pc= X-Google-Smtp-Source: ACHHUZ5eT3GosRO2mn/LqrUkoNvzvHkFpXZql/VHOEa+764mrgdk37rVZqFVtIKGLMe6ZyEzpLWH8g== X-Received: by 2002:a05:6871:603:b0:1a2:7432:c78d with SMTP id w3-20020a056871060300b001a27432c78dmr13506789oan.34.1687366790356; Wed, 21 Jun 2023 09:59:50 -0700 (PDT) Received: from localhost.localdomain (host197.190-225-105.telecom.net.ar. [190.225.105.197]) by smtp.gmail.com with ESMTPSA id z17-20020a056870c21100b001aa0d9cdf4csm3004692oae.43.2023.06.21.09.59.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Jun 2023 09:59:49 -0700 (PDT) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 21 Jun 2023 13:59:47 -0300 Message-ID: <20230621165949.1112-1-jamrial@gmail.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avcodec/evc_frame_merge: properly support packets with more than one NALU 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 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Parse through all NALUs in a packet, pull new ones when a complete AU could not be assembled, or keep them around if an AU was assembled while data remained in them. Signed-off-by: James Almer --- libavcodec/evc_frame_merge_bsf.c | 110 +++++++++++++++++++------------ 1 file changed, 69 insertions(+), 41 deletions(-) diff --git a/libavcodec/evc_frame_merge_bsf.c b/libavcodec/evc_frame_merge_bsf.c index a9b44f4d10..8af6095bf1 100644 --- a/libavcodec/evc_frame_merge_bsf.c +++ b/libavcodec/evc_frame_merge_bsf.c @@ -70,30 +70,14 @@ static void evc_frame_merge_flush(AVBSFContext *bsf) ctx->au_buffer.data_size = 0; } -static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) +static int parse_nal_unit(AVBSFContext *bsf, const uint8_t *buf, int buf_size) { EVCFMergeContext *ctx = bsf->priv_data; - AVPacket *in = ctx->in; - uint8_t *buffer; GetBitContext gb; enum EVCNALUnitType nalu_type; - 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; - - // NAL unit parsing needed to determine if end of AU was found - 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; - } + int tid, err; - err = init_get_bits8(&gb, in->data + EVC_NALU_LENGTH_PREFIX_SIZE, nalu_size); + err = init_get_bits8(&gb, buf, buf_size); if (err < 0) return err; @@ -101,15 +85,13 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) // @see enum EVCNALUnitType in evc.h if (get_bits1(&gb)) {// forbidden_zero_bit av_log(bsf, AV_LOG_ERROR, "Invalid NAL unit header\n"); - err = AVERROR_INVALIDDATA; - goto end; + return AVERROR_INVALIDDATA; } 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; + return AVERROR_INVALIDDATA; } tid = get_bits(&gb, 3); @@ -121,14 +103,14 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) err = ff_evc_parse_sps(&gb, &ctx->ps); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "SPS parsing error\n"); - goto end; + return err; } break; case EVC_PPS_NUT: err = ff_evc_parse_pps(&gb, &ctx->ps); if (err < 0) { av_log(bsf, AV_LOG_ERROR, "PPS parsing error\n"); - goto end; + return err; } break; case EVC_IDR_NUT: // Coded slice of a IDR or non-IDR picture @@ -138,16 +120,16 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) 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; + return err; } // 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 err = ff_evc_derive_poc(&ctx->ps, &sh, &ctx->poc, nalu_type, tid); if (err < 0) - goto end; + return err; - au_end_found = end_of_access_unit_found(&ctx->ps, &sh, &ctx->poc, nalu_type); + return end_of_access_unit_found(&ctx->ps, &sh, &ctx->poc, nalu_type); break; } @@ -158,8 +140,56 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) break; } + return 0; +} + +static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) +{ + EVCFMergeContext *ctx = bsf->priv_data; + AVPacket *in = ctx->in; + size_t data_size; + int au_end_found = 0, err; + + while (!au_end_found) { + uint8_t *buffer; + uint32_t nalu_size; + + if (!in->size) { + av_packet_unref(in); + err = ff_bsf_get_packet_ref(bsf, in); + if (err < 0) { + if (err == AVERROR_EOF && ctx->au_buffer.data_size > 0) + break; + return err; + } + } + + // Buffer size is not enough for buffer to store NAL unit 4-bytes prefix (length) + if (in->size < EVC_NALU_LENGTH_PREFIX_SIZE) + return AVERROR_INVALIDDATA; + + 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: (%u)\n", nalu_size); + err = AVERROR_INVALIDDATA; + goto end; + } + + if (in->size < nalu_size + EVC_NALU_LENGTH_PREFIX_SIZE) { + err = AVERROR_INVALIDDATA; + goto end; + } + + err = parse_nal_unit(bsf, in->data + EVC_NALU_LENGTH_PREFIX_SIZE, nalu_size); + if (err < 0) { + av_log(bsf, AV_LOG_ERROR, "Parsing of NAL unit failed\n"); + goto end; + } + au_end_found = err; + + nalu_size += EVC_NALU_LENGTH_PREFIX_SIZE; buffer = av_fast_realloc(ctx->au_buffer.data, &ctx->au_buffer.capacity, - ctx->au_buffer.data_size + in->size); + ctx->au_buffer.data_size + nalu_size); if (!buffer) { av_freep(&ctx->au_buffer.data); err = AVERROR_INVALIDDATA; @@ -167,30 +197,28 @@ static int evc_frame_merge_filter(AVBSFContext *bsf, AVPacket *out) } ctx->au_buffer.data = buffer; - memcpy(ctx->au_buffer.data + ctx->au_buffer.data_size, in->data, in->size); + memcpy(ctx->au_buffer.data + ctx->au_buffer.data_size, in->data, nalu_size); - ctx->au_buffer.data_size += in->size; + ctx->au_buffer.data_size += nalu_size; - av_packet_unref(in); + in->data += nalu_size; + in->size -= nalu_size; + } - if (au_end_found) { - size_t data_size = ctx->au_buffer.data_size; + av_packet_unref(in); + data_size = ctx->au_buffer.data_size; ctx->au_buffer.data_size = 0; err = av_new_packet(out, data_size); if (err < 0) - return err; + goto end; memcpy(out->data, ctx->au_buffer.data, data_size); - } else - err = AVERROR(EAGAIN); - - if (err < 0 && err != AVERROR(EAGAIN)) - ctx->au_buffer.data_size = 0; + err = 0; end: if (err < 0) - av_packet_unref(in); + evc_frame_merge_flush(bsf); return err; } -- 2.41.0 _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".