From patchwork Sun Jul 7 23:14:01 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 13848 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 1DFBF449BD2 for ; Mon, 8 Jul 2019 02:14:24 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id E9C5068AE76; Mon, 8 Jul 2019 02:14:23 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 381AD68ADE8 for ; Mon, 8 Jul 2019 02:14:18 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id z1so10389952wru.13 for ; Sun, 07 Jul 2019 16:14:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=rOdQx2ptLTMiirqznTuYzXUeqEN5lWnpillMQK+Ng0I=; b=rvLiWQ/ZyiDHVXy9A/IHcAIsb+9fKEh/bP+Uzv8lLol5WIStc8Ou1RdwHmpLb28yhY NUEKlZwD18vaDNmtl9uEIXzNHSJyTl6im1FGU67gXeOvm7BR/+PMOjAe2KcjEHNvTHYe SpUiIB6+pTsAuzeGZKM8I5HGSnkCTolDQsN2M0+cMANdAtyc+FyMaa6vmoWg6Nw5RS7C +m/i5N/+6vUSd9QYxFBpjIS69wmH0PYPSJ5s/5cAZ7ojRtIBqOyaaKFFcYlxxCdxK63b lAswDwTfPaJ06EwfplAysP3AfSYWhf9pwvEdnagwZ0qj1FRfjwDgUj/YUkQ2XsCF4Unl O6vg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rOdQx2ptLTMiirqznTuYzXUeqEN5lWnpillMQK+Ng0I=; b=e0af/xxf4QvvPkneSbEy8+pL7QKVr6cRWZsPjriSUsK2DMwNd//8VmU2NbrNkvJ94M jgrJNNvs1prKScnBAyRwn432vI0Md/Feh6WhkFfU6fOHjEL9b1ByZwglIGqGAHTuXuPI eBVuwUs9gjGuO0pk8bBb1ol3FaKkNwO8ARp+3FfFLitS9JwZWkAVCAL0zdUeeNoasd5W d/JhIZ2+DkGqfW01/OM6iC18dGK/kTPR9me7szZ1wfQ5liCULKg6dO3IstTVFzqkTl0P ydGEn0qfhQqOoDTVOzZgKzyv4nB+ZhqxDNqljQLRGqDcXMaEVo29NbGP3lWcJTqWyYEU l/aw== X-Gm-Message-State: APjAAAWZrsSkf0cJR2RCOmCx4syIWrAGtbz4SKKhdMTgGL54MEpCe0d7 vQhCkLXlAev1Yen5oMB8xBOcYI9U X-Google-Smtp-Source: APXvYqz+BXDzbi2aYWA9MllhC6PyQlrC/yujFBgKiAz62WGz7xWSfCNeOGqIPrUBBKh0FpAN4SXguw== X-Received: by 2002:a5d:680d:: with SMTP id w13mr15136301wru.141.1562541257514; Sun, 07 Jul 2019 16:14:17 -0700 (PDT) Received: from localhost.localdomain (ipbcc08b8f.dynamic.kabel-deutschland.de. [188.192.139.143]) by smtp.gmail.com with ESMTPSA id r16sm42557919wrr.42.2019.07.07.16.14.16 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Sun, 07 Jul 2019 16:14:17 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Jul 2019 01:14:01 +0200 Message-Id: <20190707231402.46388-1-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: References: MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 11/12] cbs: ff_cbs_delete_unit: Replace return value with assert X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" ff_cbs_delete_unit never fails if the index of the unit to delete is valid, as it is with all current callers of the function. So just assert in ff_cbs_delete_unit that the index is valid and change the return value to void in order to remove the callers' checks for whether ff_cbs_delete_unit failed. Signed-off-by: Andreas Rheinhardt --- libavcodec/av1_metadata_bsf.c | 9 ++------- libavcodec/cbs.c | 12 +++++------- libavcodec/cbs.h | 8 +++++--- libavcodec/cbs_h2645.c | 6 +++--- libavcodec/h264_metadata_bsf.c | 8 +------- libavcodec/h264_redundant_pps_bsf.c | 4 +--- 6 files changed, 17 insertions(+), 30 deletions(-) diff --git a/libavcodec/av1_metadata_bsf.c b/libavcodec/av1_metadata_bsf.c index bb2ca2075b..226f7dffa4 100644 --- a/libavcodec/av1_metadata_bsf.c +++ b/libavcodec/av1_metadata_bsf.c @@ -167,13 +167,8 @@ static int av1_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) if (ctx->delete_padding) { for (i = frag->nb_units - 1; i >= 0; i--) { - if (frag->units[i].type == AV1_OBU_PADDING) { - err = ff_cbs_delete_unit(ctx->cbc, frag, i); - if (err < 0) { - av_log(bsf, AV_LOG_ERROR, "Failed to delete Padding OBU.\n"); - goto fail; - } - } + if (frag->units[i].type == AV1_OBU_PADDING) + ff_cbs_delete_unit(ctx->cbc, frag, i); } } diff --git a/libavcodec/cbs.c b/libavcodec/cbs.c index 47679eca1b..2350416501 100644 --- a/libavcodec/cbs.c +++ b/libavcodec/cbs.c @@ -737,12 +737,12 @@ int ff_cbs_insert_unit_data(CodedBitstreamContext *ctx, return 0; } -int ff_cbs_delete_unit(CodedBitstreamContext *ctx, - CodedBitstreamFragment *frag, - int position) +void ff_cbs_delete_unit(CodedBitstreamContext *ctx, + CodedBitstreamFragment *frag, + int position) { - if (position < 0 || position >= frag->nb_units) - return AVERROR(EINVAL); + av_assert0(0 <= position && position < frag->nb_units + && "Unit to be deleted not in fragment."); cbs_unit_uninit(ctx, &frag->units[position]); @@ -752,6 +752,4 @@ int ff_cbs_delete_unit(CodedBitstreamContext *ctx, memmove(frag->units + position, frag->units + position + 1, (frag->nb_units - position) * sizeof(*frag->units)); - - return 0; } diff --git a/libavcodec/cbs.h b/libavcodec/cbs.h index 5260a39c63..fe57e7b2a5 100644 --- a/libavcodec/cbs.h +++ b/libavcodec/cbs.h @@ -380,10 +380,12 @@ int ff_cbs_insert_unit_data(CodedBitstreamContext *ctx, /** * Delete a unit from a fragment and free all memory it uses. + * + * Requires position to be >= 0 and < frag->nb_units. */ -int ff_cbs_delete_unit(CodedBitstreamContext *ctx, - CodedBitstreamFragment *frag, - int position); +void ff_cbs_delete_unit(CodedBitstreamContext *ctx, + CodedBitstreamFragment *frag, + int position); #endif /* AVCODEC_CBS_H */ diff --git a/libavcodec/cbs_h2645.c b/libavcodec/cbs_h2645.c index 0456937710..484b145852 100644 --- a/libavcodec/cbs_h2645.c +++ b/libavcodec/cbs_h2645.c @@ -1664,7 +1664,7 @@ int ff_cbs_h264_delete_sei_message(CodedBitstreamContext *ctx, } av_assert0(i < au->nb_units && "NAL unit not in access unit."); - return ff_cbs_delete_unit(ctx, au, i); + ff_cbs_delete_unit(ctx, au, i); } else { cbs_h264_free_sei_payload(&sei->payload[position]); @@ -1672,7 +1672,7 @@ int ff_cbs_h264_delete_sei_message(CodedBitstreamContext *ctx, memmove(sei->payload + position, sei->payload + position + 1, (sei->payload_count - position) * sizeof(*sei->payload)); - - return 0; } + + return 0; } diff --git a/libavcodec/h264_metadata_bsf.c b/libavcodec/h264_metadata_bsf.c index f7ca1f0f09..e40baa3371 100644 --- a/libavcodec/h264_metadata_bsf.c +++ b/libavcodec/h264_metadata_bsf.c @@ -427,13 +427,7 @@ static int h264_metadata_filter(AVBSFContext *bsf, AVPacket *pkt) if (ctx->delete_filler) { for (i = au->nb_units - 1; i >= 0; i--) { if (au->units[i].type == H264_NAL_FILLER_DATA) { - // Filler NAL units. - err = ff_cbs_delete_unit(ctx->cbc, au, i); - if (err < 0) { - av_log(bsf, AV_LOG_ERROR, "Failed to delete " - "filler NAL.\n"); - goto fail; - } + ff_cbs_delete_unit(ctx->cbc, au, i); continue; } diff --git a/libavcodec/h264_redundant_pps_bsf.c b/libavcodec/h264_redundant_pps_bsf.c index 907e95b9c8..8405738c4b 100644 --- a/libavcodec/h264_redundant_pps_bsf.c +++ b/libavcodec/h264_redundant_pps_bsf.c @@ -94,9 +94,7 @@ static int h264_redundant_pps_filter(AVBSFContext *bsf, AVPacket *pkt) if (!au_has_sps) { av_log(bsf, AV_LOG_VERBOSE, "Deleting redundant PPS " "at %"PRId64".\n", pkt->pts); - err = ff_cbs_delete_unit(ctx->input, au, i); - if (err < 0) - goto fail; + ff_cbs_delete_unit(ctx->input, au, i); i--; continue; }