From patchwork Thu Mar 11 15:50:10 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26343 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 F00FA44B6B6 for ; Thu, 11 Mar 2021 17:50:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D75C668AB79; Thu, 11 Mar 2021 17:50:38 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f181.google.com (mail-qt1-f181.google.com [209.85.160.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9910768AAD5 for ; Thu, 11 Mar 2021 17:50:31 +0200 (EET) Received: by mail-qt1-f181.google.com with SMTP id f12so1455055qtq.4 for ; Thu, 11 Mar 2021 07:50:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=Zj2a5i/w85VPuVfaeXEQo+vNJp7VdzB/SwtwAWrH2N4=; b=iREleVO+70vlp+Ag92qGVkuPqA/S+NzShQjvYq4V9YBrgAd4oIAIc0jK0P5Fex9KVY hOeM0HpJPuQCH7ifgMy0mLMxE/uH5n7hW4IDorTeCWB9g2GwzlEdIhD58nLBCYZm91hU t2Nonip3Cv0rGKawXyMA4gwzWfT1igb938I1kpiTrJiwNbA3vwb/VnZ1MpSymz3TPqo+ FW4FqMlghKANoVPIcVss/TBmcHzQ0g3araAtsmr/FNK8qQRlFQC3/56ZmDGA2hMKBOBn Ez/CM4bO7+lyEyI1+vQfc5C8Cr9KrmQyQgQx/l61D/8IxYWxs+V8znkgZ8g62KppQ+7F EC+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Zj2a5i/w85VPuVfaeXEQo+vNJp7VdzB/SwtwAWrH2N4=; b=sD2tEoEGedjXduziqLxQqj1lZRL7CiaM31/3ZbXfU3xbOU9MRgsn5E6sz31P5kLWS4 Pi/MKmB6hVKmhAPfZdMBO9B1cTqBise7CP1jdIXbJSGZtxkidTBIHlrtIgHj2gpJcpvg KPu4N19M85s5QIw3wgTAo0uDYyYMmQipgygk/1HrBptAvPruIyUGTJdm2fgmgv+/mg4L +AqSIM6OqhC9RBa5bpOGV/3BuOnIjPTCH9QKyyVMoi2iwBBQlNZ6PsQCamPrLJ0+lYuS GLzZiZpIl7tMJ9HHxsVQGQr26sZvKQ2AJsOGov8n5Zjh3em8V7L5Rj4BGpxrhYxwv8CW q5HA== X-Gm-Message-State: AOAM532TsTp7i4kSDWTKG9/iQ6cz8VSpDM1up+yPQqR2FudU8OeyS8kl E0Pt+oJFypnOtbemljncxyhh+k5126o= X-Google-Smtp-Source: ABdhPJzEE4Vy+fe2gtjChGtANQWLbj5EnPz603XAKl8JnxUSEDij6bo+mDdQB3qHoLBjIziUNiBW2A== X-Received: by 2002:ac8:5ac6:: with SMTP id d6mr7849400qtd.193.1615477830100; Thu, 11 Mar 2021 07:50:30 -0800 (PST) Received: from localhost.localdomain ([181.23.75.214]) by smtp.gmail.com with ESMTPSA id 85sm2307127qkf.58.2021.03.11.07.50.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 07:50:29 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 11 Mar 2021 12:50:10 -0300 Message-Id: <20210311155011.52961-2-jamrial@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210311155011.52961-1-jamrial@gmail.com> References: <20210311155011.52961-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avcodec: replace all uses of av_shrink_packet() with av_packet_resize() 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavcodec/aliaspixenc.c | 2 +- libavcodec/cfhdenc.c | 2 +- libavcodec/exrenc.c | 2 +- libavcodec/hapenc.c | 2 +- libavcodec/libopenjpegenc.c | 2 +- libavcodec/libopusenc.c | 2 +- libavcodec/libtwolame.c | 2 +- libavcodec/rpzaenc.c | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libavcodec/aliaspixenc.c b/libavcodec/aliaspixenc.c index a9ba00cd29..57dea147bd 100644 --- a/libavcodec/aliaspixenc.c +++ b/libavcodec/aliaspixenc.c @@ -103,7 +103,7 @@ FF_ENABLE_DEPRECATION_WARNINGS } /* Total length */ - av_shrink_packet(pkt, buf - pkt->data); + av_packet_resize(pkt, buf - pkt->data); pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; diff --git a/libavcodec/cfhdenc.c b/libavcodec/cfhdenc.c index 42bbf99c96..109b42009a 100644 --- a/libavcodec/cfhdenc.c +++ b/libavcodec/cfhdenc.c @@ -785,7 +785,7 @@ static int cfhd_encode_frame(AVCodecContext *avctx, AVPacket *pkt, bytestream2_put_be16(pby, GroupTrailer); bytestream2_put_be16(pby, 0); - av_shrink_packet(pkt, bytestream2_tell_p(pby)); + av_packet_resize(pkt, bytestream2_tell_p(pby)); pkt->flags |= AV_PKT_FLAG_KEY; diff --git a/libavcodec/exrenc.c b/libavcodec/exrenc.c index db9000a85c..60680ccdac 100644 --- a/libavcodec/exrenc.c +++ b/libavcodec/exrenc.c @@ -504,7 +504,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, av_assert0(0); } - av_shrink_packet(pkt, bytestream2_tell_p(pb)); + av_packet_resize(pkt, bytestream2_tell_p(pb)); pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; diff --git a/libavcodec/hapenc.c b/libavcodec/hapenc.c index 3a1bc870b1..544836e4e6 100644 --- a/libavcodec/hapenc.c +++ b/libavcodec/hapenc.c @@ -227,7 +227,7 @@ static int hap_encode(AVCodecContext *avctx, AVPacket *pkt, /* Write header at the start. */ hap_write_frame_header(ctx, pkt->data, final_data_size + header_length); - av_shrink_packet(pkt, final_data_size + header_length); + av_packet_resize(pkt, final_data_size + header_length); pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; return 0; diff --git a/libavcodec/libopenjpegenc.c b/libavcodec/libopenjpegenc.c index e4641235f5..8791cc72a6 100644 --- a/libavcodec/libopenjpegenc.c +++ b/libavcodec/libopenjpegenc.c @@ -707,7 +707,7 @@ static int libopenjpeg_encode_frame(AVCodecContext *avctx, AVPacket *pkt, goto done; } - av_shrink_packet(pkt, writer.pos); + av_packet_resize(pkt, writer.pos); pkt->flags |= AV_PKT_FLAG_KEY; *got_packet = 1; diff --git a/libavcodec/libopusenc.c b/libavcodec/libopusenc.c index 70d17f802b..879b8a57e3 100644 --- a/libavcodec/libopusenc.c +++ b/libavcodec/libopusenc.c @@ -502,7 +502,7 @@ static int libopus_encode(AVCodecContext *avctx, AVPacket *avpkt, return ff_opus_error_to_averror(ret); } - av_shrink_packet(avpkt, ret); + av_packet_resize(avpkt, ret); ff_af_queue_remove(&opus->afq, opus->opts.packet_size, &avpkt->pts, &avpkt->duration); diff --git a/libavcodec/libtwolame.c b/libavcodec/libtwolame.c index 5ceb3d9f3f..da7a250507 100644 --- a/libavcodec/libtwolame.c +++ b/libavcodec/libtwolame.c @@ -167,7 +167,7 @@ static int twolame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt, if (avpkt->pts != AV_NOPTS_VALUE) s->next_pts = avpkt->pts + avpkt->duration; - av_shrink_packet(avpkt, ret); + av_packet_resize(avpkt, ret); *got_packet_ptr = 1; return 0; } diff --git a/libavcodec/rpzaenc.c b/libavcodec/rpzaenc.c index baf067c205..c87fe59985 100644 --- a/libavcodec/rpzaenc.c +++ b/libavcodec/rpzaenc.c @@ -802,7 +802,7 @@ static int rpza_encode_frame(AVCodecContext *avctx, AVPacket *pkt, flush_put_bits(&s->pb); - av_shrink_packet(pkt, put_bits_count(&s->pb) >> 3); + av_packet_resize(pkt, put_bits_count(&s->pb) >> 3); buf = pkt->data; // write header opcode