From patchwork Thu Feb 4 19:09:21 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 25441 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 EFEB144B07D for ; Thu, 4 Feb 2021 21:19:12 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D571B68ABB4; Thu, 4 Feb 2021 21:19:12 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CAAC168AB98 for ; Thu, 4 Feb 2021 21:19:10 +0200 (EET) Received: by mail-qt1-f177.google.com with SMTP id d15so3214411qtw.12 for ; Thu, 04 Feb 2021 11:19:10 -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=2+VIjd8Git9Ew6bzjgrAq32vfu6gcCL0J4mAIDsyRmk=; b=csUj2q/Mh6X3VTpPmDsFZitWnJ2k50QIigG5HN5GKzBi8TH436v3ke6DGvihaGOEwS jNbL3gEwXLm94US4ZH2SpEv6rZJEoAA42TandJHtDT9ouMi40QW30Ft1YTsfSkzy0YXq kNear5qT92Vvcd0mtbkQxCN9dMBiD5fzCNHi2Pi1cOTzjliwPOr8rBm3N1TDts7ZGR+i FKib23ZtGMN2HUZ74tQlr++FyzjuL0dnOHDFAHRov+9TkdO9U4P1N6BT27VusKygjakx iUQ1KvHMBwE1FH14ojkKmzm/1pz5F2n1SfxdfL3ouSUFEBPuqqrjpd9BggLGAb+ftXnw 9IQQ== 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=2+VIjd8Git9Ew6bzjgrAq32vfu6gcCL0J4mAIDsyRmk=; b=RFUqxOV7BC+cp6mZ1rHZmjC6PGnw1azFpFwUt0yGbV9IsRnynOR/tFDhdJUu8+fw4N pxYKoWrXRL9uPW6JZEx+fmU1OTw/ExkgxrEKidW9Cq80UUz5RyMp8xs9PneZjzzRcYg4 GRI9Yvfu0Kv1Z3c2c8fl3jG9lcSc/ld1LUL5x1t8LvKvNSe6zoE1dFN65SO3eqaL+XPQ JEyHghwIDXpE4ILGV2aOUK27hJkru/6OTF9YRgrjck96TGvlyBg0UsGYIPQeYFRUtbO1 n6T1wPwePAjbYdTKNKejL4x31mh3+ngE2hjj16cso/x28IAZP8i5s4i+F7ZsaBv9fzaD fhGw== X-Gm-Message-State: AOAM5310LuMCycHZLArQYAAT2OCJKV7OAydPCknODp+wN1pFK/6TQT8P UUuog/BF8LHRKlRm8zsb/pKZVYo7GtI= X-Google-Smtp-Source: ABdhPJzbHic8WqXM+LUmXwOomWLaV/T1rnOGwB7RnJC57LipLyXKypd9WcMJRfKWE+/1BS2UEYoXGQ== X-Received: by 2002:ac8:738c:: with SMTP id t12mr1037634qtp.141.1612465843474; Thu, 04 Feb 2021 11:10:43 -0800 (PST) Received: from localhost.localdomain ([181.23.64.183]) by smtp.gmail.com with ESMTPSA id t14sm5889291qkt.50.2021.02.04.11.10.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 04 Feb 2021 11:10:42 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Feb 2021 16:09:21 -0300 Message-Id: <20210204191005.48190-7-jamrial@gmail.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20210204191005.48190-1-jamrial@gmail.com> References: <20210204191005.48190-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 06/50] avcodec/mpegvideo_enc: use av_packet_alloc() to allocate packets 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/mpegvideo_enc.c | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 34dcf8c313..411cadeae7 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -1366,23 +1366,20 @@ static int skip_check(MpegEncContext *s, Picture *p, Picture *ref) return 0; } -static int encode_frame(AVCodecContext *c, AVFrame *frame) +static int encode_frame(AVCodecContext *c, AVFrame *frame, AVPacket *pkt) { - AVPacket pkt = { 0 }; int ret; int size = 0; - av_init_packet(&pkt); - ret = avcodec_send_frame(c, frame); if (ret < 0) return ret; do { - ret = avcodec_receive_packet(c, &pkt); + ret = avcodec_receive_packet(c, pkt); if (ret >= 0) { - size += pkt.size; - av_packet_unref(&pkt); + size += pkt->size; + av_packet_unref(pkt); } else if (ret < 0 && ret != AVERROR(EAGAIN) && ret != AVERROR_EOF) return ret; } while (ret >= 0); @@ -1448,6 +1445,7 @@ static int estimate_best_b_count(MpegEncContext *s) for (j = 0; j < s->max_b_frames + 1; j++) { AVCodecContext *c; + AVPacket *pkt; int64_t rd = 0; if (!s->input_picture[j]) @@ -1473,10 +1471,14 @@ static int estimate_best_b_count(MpegEncContext *s) if (ret < 0) goto fail; + pkt = av_packet_alloc(); + if (!pkt) + goto fail; + s->tmp_frames[0]->pict_type = AV_PICTURE_TYPE_I; s->tmp_frames[0]->quality = 1 * FF_QP2LAMBDA; - out_size = encode_frame(c, s->tmp_frames[0]); + out_size = encode_frame(c, s->tmp_frames[0], pkt); if (out_size < 0) { ret = out_size; goto fail; @@ -1491,7 +1493,7 @@ static int estimate_best_b_count(MpegEncContext *s) AV_PICTURE_TYPE_P : AV_PICTURE_TYPE_B; s->tmp_frames[i + 1]->quality = is_p ? p_lambda : b_lambda; - out_size = encode_frame(c, s->tmp_frames[i + 1]); + out_size = encode_frame(c, s->tmp_frames[i + 1], pkt); if (out_size < 0) { ret = out_size; goto fail; @@ -1501,7 +1503,7 @@ static int estimate_best_b_count(MpegEncContext *s) } /* get the delayed frames */ - out_size = encode_frame(c, NULL); + out_size = encode_frame(c, NULL, pkt); if (out_size < 0) { ret = out_size; goto fail; @@ -1517,6 +1519,7 @@ static int estimate_best_b_count(MpegEncContext *s) fail: avcodec_free_context(&c); + av_packet_free(&pkt); if (ret < 0) return ret; }