From patchwork Wed Nov 18 16:52:41 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23703 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 DB82444B913 for ; Wed, 18 Nov 2020 18:53:31 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C4FAE68B606; Wed, 18 Nov 2020 18:53:31 +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 5279468B615 for ; Wed, 18 Nov 2020 18:53:30 +0200 (EET) Received: by mail-qt1-f194.google.com with SMTP id b16so2104473qtb.6 for ; Wed, 18 Nov 2020 08:53:30 -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=QRzQDTGHsUDcFB8a3oQ9mBn5fV4MT7Z3HXTz6kcsHn4=; b=WDaEZUBWkDN/+ChHi/Le/1t4xfT4zisHzQ9byAU9iL+HBNZRFrtQ6ZMFaN71I4Bucb HkvKJdNv8jeQkrpKxTVre2zZGPnSTKlAqtNnLTMfNEoFPEhkeYMwj+oaOZZZAqkZvFcP 2nCWEkZL68rpv/8LFnmiraK2l2H4hiV9R1U0a12Z0heJBD9qQ3rA1WHy/zFtuz8/bAHo ZrGV8BMGMMvZLi/Ek/rDVCNBzDG2gprA/V2EFzkI7aCc4mbfib7tkCxBc18r4TurGrpZ 0tx7obKMnyKaHvjDN+esQ+bJl6Rp0fbEjSroHXNAu6z3FwewsTTcaaPj+EHg27Kjx+Q5 U+Lw== 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=QRzQDTGHsUDcFB8a3oQ9mBn5fV4MT7Z3HXTz6kcsHn4=; b=TyV7M9JCO7m7WIMHHTtO1D96KOpVaijtdV6rTJDTsUO9U1uNrg+kXxcskQkfkwsiHd h9bn7ySP0110Z5UwwURNt4kjBU5Uc2+dWbSnkZUC0t0yMkw1xWELXAySg6uET6g6G0rd arILznXur+FdTR2dEHTOxmDlOQSpGsHNNXR0VbJOIi6PGzHJuPn8NEfXLVkRoqKt7byy S5BOMDAtIU9GSW0HvZzidmiJ9kZsoS8fCtPqVnFtkAl2U9AyWGxy/B52z/iqh3knvklG KoVwlX9Oh7yhJFrtPrMmZXQdwVCSm9SJqofLjoDa7tw2eW3u8sGGxt+EATMpDJ1NsNiD iMhw== X-Gm-Message-State: AOAM5306GFdEwbA/xNTxVTH1vigak53uUALXiUNZyHv4G0pG50/YnRPv SVfWY79sLEt8G3IEaLYJQfTdsKk8v86r2Q== X-Google-Smtp-Source: ABdhPJxg51LjBCLmhAZ/NkS0FOzQiB1u711NwvULuNF1+Zi53tTSs0DLRPgGOxdMFuOT/N+GXZbPzg== X-Received: by 2002:ac8:6619:: with SMTP id c25mr5139569qtp.343.1605718408460; Wed, 18 Nov 2020 08:53:28 -0800 (PST) Received: from localhost.localdomain ([181.23.91.217]) by smtp.gmail.com with ESMTPSA id f14sm4863788qkk.89.2020.11.18.08.53.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 08:53:27 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Nov 2020 13:52:41 -0300 Message-Id: <20201118165247.4130-13-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 12/18] avformat/ttaenc: 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/ttaenc.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libavformat/ttaenc.c b/libavformat/ttaenc.c index 39d9034f68..8abba11aed 100644 --- a/libavformat/ttaenc.c +++ b/libavformat/ttaenc.c @@ -30,7 +30,7 @@ typedef struct TTAMuxContext { AVIOContext *seek_table; - PacketListEntry *queue, *queue_end; + AVPacketList *queue; uint32_t nb_samples; int frame_size; int last_frame; @@ -64,6 +64,10 @@ static int tta_init(AVFormatContext *s) tta->frame_size = par->sample_rate * 256 / 245; avpriv_set_pts_info(s->streams[0], 64, 1, par->sample_rate); + tta->queue = av_packet_list_alloc(); + if (!tta->queue) + return AVERROR(ENOMEM); + return 0; } @@ -94,8 +98,7 @@ static int tta_write_packet(AVFormatContext *s, AVPacket *pkt) TTAMuxContext *tta = s->priv_data; int ret; - ret = avpriv_packet_list_put(&tta->queue, &tta->queue_end, pkt, - av_packet_ref, 0); + ret = av_packet_list_put(tta->queue, pkt, av_packet_ref, 0); if (ret < 0) { return ret; } @@ -125,8 +128,7 @@ static void tta_queue_flush(AVFormatContext *s) TTAMuxContext *tta = s->priv_data; AVPacket pkt; - while (tta->queue) { - avpriv_packet_list_get(&tta->queue, &tta->queue_end, &pkt); + while (!av_packet_list_get(tta->queue, &pkt, 0)) { avio_write(s->pb, pkt.data, pkt.size); av_packet_unref(&pkt); } @@ -162,7 +164,7 @@ static void tta_deinit(AVFormatContext *s) TTAMuxContext *tta = s->priv_data; ffio_free_dyn_buf(&tta->seek_table); - avpriv_packet_list_free(&tta->queue, &tta->queue_end); + av_packet_list_free(&tta->queue); } AVOutputFormat ff_tta_muxer = {