From patchwork Wed Nov 18 16:52:42 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23704 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 E96BD44B913 for ; Wed, 18 Nov 2020 18:53:32 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id DA4A168B638; Wed, 18 Nov 2020 18:53:32 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f194.google.com (mail-qt1-f194.google.com [209.85.160.194]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A255468B60C for ; Wed, 18 Nov 2020 18:53:31 +0200 (EET) Received: by mail-qt1-f194.google.com with SMTP id m65so2062107qte.11 for ; Wed, 18 Nov 2020 08:53: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=aslzv6SNw7FmmtcWgHztT2Z/wEd/9ROYy1XUB/J/Yy0=; b=uMVlGdL2KQgVfT8e1XNt1XvS0V9ZaTn2wqUOp8P/FxtWnUNI0yVOULjIuPvK8Ns0Nj ojhRQK+UXUPFO9Vl8pTfPcH/ObcUGRhgNGj3P1W+qburnmkqgiwawuIfHpd/kFC11JV+ 4BXHMsjU4L/KRXfqLs8xaPI/Sggz5h2eqB3TZk+x2SpM+dqYNA13HzUN2KZMaqPnxxmz 8MGV+IFsfHzEYWIFoZ/AOLWuP2p8E1DgTeUietA9kLaKDPO8DhU2BA2Eo/pclyS+EzBz mpDL0z2vrX1Yo7FqXc0J7nYFka8ZrMOCrXdge6xq8BbWTEWPK/howi3s4n+TkOL1xDx0 pumg== 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=aslzv6SNw7FmmtcWgHztT2Z/wEd/9ROYy1XUB/J/Yy0=; b=MzObxxwwtBF8kkdSuwoGB0uOC4S1L3HbF1i6xa/8dM7bxjAhoMu+1UEAn3SF3AqdoW EuHK+C+V9GIapcT+16TImPDWIIUmd5uzDGrQsHi1vDrwMK7rjBlJrRFPqecGRPtmWEA5 HH8Fc1BwppxZf4mOFo/aslfugRUNu016/xY9v8paQcsjfutiUYMdCU3waT0xNTywknt0 wUJTA3L+gNr18Gq7p3UNhozAoGeuXu9vTJYqjFshpv78aIoQqhdQMg3gxU9TwG3LKw3w TznFSqc4d9JxlHqKWqkBfGhcUXYayuoABEK73ytpWZ+b+VxtVT7eOjIqHG7Lcebjmfdy ENuQ== X-Gm-Message-State: AOAM531/7tugFUD/SjNBW8Wl1hFxr1JORtnbL6n4W6eu686oaPChjMBD L2MTuGFkJCLSpYaMOXi0fg1enTKSKNlNQg== X-Google-Smtp-Source: ABdhPJycrmkmEXrKocFdKwt44WsI/TFtp8O0aOq3RYz40NWNv6LqNq2oo8oeFBQHhsXoFh8QkMleJg== X-Received: by 2002:ac8:43d3:: with SMTP id w19mr4892805qtn.331.1605718410062; Wed, 18 Nov 2020 08:53:30 -0800 (PST) Received: from localhost.localdomain ([181.23.91.217]) by smtp.gmail.com with ESMTPSA id f14sm4863788qkk.89.2020.11.18.08.53.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 08:53:29 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Nov 2020 13:52:42 -0300 Message-Id: <20201118165247.4130-14-jamrial@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201118165247.4130-1-jamrial@gmail.com> References: <20201118165247.4130-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 13/18] avformat/mp3enc: port to the new packet list API 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 --- libavformat/mp3enc.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/libavformat/mp3enc.c b/libavformat/mp3enc.c index fddde33400..ed585c3976 100644 --- a/libavformat/mp3enc.c +++ b/libavformat/mp3enc.c @@ -132,7 +132,7 @@ typedef struct MP3Context { int pics_to_write; /* audio packets are queued here until we get all the attached pictures */ - PacketListEntry *queue, *queue_end; + AVPacketList *queue; } MP3Context; static const uint8_t xing_offtbl[2][2] = {{32, 17}, {17, 9}}; @@ -387,8 +387,7 @@ static int mp3_queue_flush(AVFormatContext *s) ff_id3v2_finish(&mp3->id3, s->pb, s->metadata_header_padding); mp3_write_xing(s); - while (mp3->queue) { - avpriv_packet_list_get(&mp3->queue, &mp3->queue_end, &pkt); + while (!av_packet_list_get(mp3->queue, &pkt, 0)) { if (write && (ret = mp3_write_audio_packet(s, &pkt)) < 0) write = 0; av_packet_unref(&pkt); @@ -523,7 +522,7 @@ static int mp3_write_packet(AVFormatContext *s, AVPacket *pkt) if (pkt->stream_index == mp3->audio_stream_idx) { if (mp3->pics_to_write) { /* buffer audio packets until we get all the pictures */ - int ret = avpriv_packet_list_put(&mp3->queue, &mp3->queue_end, pkt, av_packet_ref, 0); + int ret = av_packet_list_put(mp3->queue, pkt, av_packet_ref, 0); if (ret < 0) { av_log(s, AV_LOG_WARNING, "Not enough memory to buffer audio. Skipping picture streams\n"); @@ -603,6 +602,10 @@ static int mp3_init(struct AVFormatContext *s) return AVERROR(EINVAL); } + mp3->queue = av_packet_list_alloc(); + if (!mp3->queue) + return AVERROR(ENOMEM); + return 0; } @@ -631,7 +634,7 @@ static void mp3_deinit(struct AVFormatContext *s) { MP3Context *mp3 = s->priv_data; - avpriv_packet_list_free(&mp3->queue, &mp3->queue_end); + av_packet_list_free(&mp3->queue); av_freep(&mp3->xing_frame); }