From patchwork Wed Nov 18 16:52:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23713 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 5F7C344A205 for ; Wed, 18 Nov 2020 18:59:29 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4C64268B65F; Wed, 18 Nov 2020 18:59:29 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qk1-f193.google.com (mail-qk1-f193.google.com [209.85.222.193]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7923168B664 for ; Wed, 18 Nov 2020 18:59:27 +0200 (EET) Received: by mail-qk1-f193.google.com with SMTP id 199so2437691qkg.9 for ; Wed, 18 Nov 2020 08:59:27 -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=34ax9eFbfLPz+WB15z89Us2pjyTNO1OC7kH5ugsNg3Y=; b=ZHpODfhEPhVMZs41rOVCCpRMVIoCHPPReLFIyXXXiWV4Y+v/JWIfgQYsO+/rZtRxhB kFMMGAuTFri6p3qBPi1FjP5IQ5/kzzRTo7qVfd5TwVgKpWp916EJshRXZ8fpba31pzh0 kUnfSi5uRAFgoTyvakUphTp3NPcF2jsm66tcFUfNh2qIftz7WLt+/ZhJPXANdtvyrEDV fKLujIxrle+I1Zo/dhYOmieY+V7o6cBi319/QyCVCTV617jXgw95qdIW4Z6rYFMkBDfL 4r2eJSLBH8aIik983apz0oU6wE25YM4uDPTHZCZl6qpwVoSRu7op7uVgELvuFUM3xfus CX1g== 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=34ax9eFbfLPz+WB15z89Us2pjyTNO1OC7kH5ugsNg3Y=; b=c3w4GbJVzDYBJlQ09nb0JCACAtfIrHZtsHLbStlIYqpZ2rLQE0/WIa9X6Q3EpUSIwf JXurM356kFZ7Izwrki5vrWrsjHe9goGQBwKFXDZ1faW79bOcRxUvpHgNfsRrjTzGxGb/ ydTs2/3/cunx7y8LCknvEVBLy+LpkvFUMsS/nglIcR+HRUYjy5k1U1Zh00GeFUypXmUE 65w55NK3p6KgvSk8NHDxKvzzjFffex71T+Gpp8dLZ/b+dCk9VHkDVJHAlnuasgPEXKgy GzeIoYusbOaH1jTlE31V++sN1WjoPm9wpwQQNt9J8miCROtgqJlqqpAqRfUchTfox0MD EVcQ== X-Gm-Message-State: AOAM531TZgEWomZWivc9AIk6Lh0tKQAttPyRJ/81AmzW3daAiHhdRkcN 5luMkg38pw0jIZx1n6374mLUOikwhgeo2g== X-Google-Smtp-Source: ABdhPJwJbyUfBoqN5yEq584Nfe7lN5Oul+3ElfVjyfOfx970bxPtq9g4cMPlwYUnxiCdsMLZIokDWQ== X-Received: by 2002:a37:415:: with SMTP id 21mr5786150qke.42.1605718399399; Wed, 18 Nov 2020 08:53:19 -0800 (PST) Received: from localhost.localdomain ([181.23.91.217]) by smtp.gmail.com with ESMTPSA id f14sm4863788qkk.89.2020.11.18.08.53.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 08:53:18 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Nov 2020 13:52:36 -0300 Message-Id: <20201118165247.4130-8-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 07/18] avformat: port AVFormatInternal->raw_packet_buffer 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/internal.h | 3 +-- libavformat/options.c | 6 +++++- libavformat/utils.c | 21 ++++++++++++--------- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index 3182409dfb..a0649956e8 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -85,8 +85,7 @@ struct AVFormatInternal { * be identified, as parsing cannot be done without knowing the * codec. */ - struct PacketListEntry *raw_packet_buffer; - struct PacketListEntry *raw_packet_buffer_end; + struct AVPacketList *raw_packet_buffer; /** * Packets split by the parser get queued here. */ diff --git a/libavformat/options.c b/libavformat/options.c index 9fe1500cee..ee7a533aa0 100644 --- a/libavformat/options.c +++ b/libavformat/options.c @@ -221,7 +221,11 @@ AVFormatContext *avformat_alloc_context(void) return NULL; } internal->packet_buffer = av_packet_list_alloc(); - if (!internal->packet_buffer) { + internal->raw_packet_buffer = av_packet_list_alloc(); + if (!internal->packet_buffer || + !internal->raw_packet_buffer) { + av_packet_list_free(&internal->packet_buffer); + av_packet_list_free(&internal->raw_packet_buffer); av_free(internal); av_free(ic); return NULL; diff --git a/libavformat/utils.c b/libavformat/utils.c index 88ce64496d..02c0ead44b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -452,8 +452,7 @@ int avformat_queue_attached_pictures(AVFormatContext *s) continue; } - ret = avpriv_packet_list_put(&s->internal->raw_packet_buffer, - &s->internal->raw_packet_buffer_end, + ret = av_packet_list_put(s->internal->raw_packet_buffer, &s->streams[i]->attached_pic, av_packet_ref, 0); if (ret < 0) @@ -793,13 +792,18 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) { int ret, i, err; AVStream *st; +#if FF_API_PACKET_LIST + struct PacketList *raw_packet_buffer = (struct PacketList *)s->internal->raw_packet_buffer; +#else + AVPacketList *raw_packet_buffer = s->internal->raw_packet_buffer; +#endif pkt->data = NULL; pkt->size = 0; av_init_packet(pkt); for (;;) { - PacketListEntry *pktl = s->internal->raw_packet_buffer; + PacketListEntry *pktl = raw_packet_buffer->head; const AVPacket *pkt1; if (pktl) { @@ -808,8 +812,7 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) if ((err = probe_codec(s, st, NULL)) < 0) return err; if (st->internal->request_probe <= 0) { - avpriv_packet_list_get(&s->internal->raw_packet_buffer, - &s->internal->raw_packet_buffer_end, pkt); + av_packet_list_get(s->internal->raw_packet_buffer, pkt, 0); s->internal->raw_packet_buffer_remaining_size += pkt->size; return 0; } @@ -881,14 +884,13 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) if (!pktl && st->internal->request_probe <= 0) return ret; - err = avpriv_packet_list_put(&s->internal->raw_packet_buffer, - &s->internal->raw_packet_buffer_end, + err = av_packet_list_put(s->internal->raw_packet_buffer, pkt, NULL, 0); if (err < 0) { av_packet_unref(pkt); return err; } - pkt1 = &s->internal->raw_packet_buffer_end->pkt; + pkt1 = &raw_packet_buffer->tail->pkt; s->internal->raw_packet_buffer_remaining_size -= pkt1->size; if ((err = probe_codec(s, st, pkt1)) < 0) @@ -1843,7 +1845,7 @@ static void flush_packet_queue(AVFormatContext *s) return; avpriv_packet_list_free(&s->internal->parse_queue, &s->internal->parse_queue_end); av_packet_list_flush(s->internal->packet_buffer); - avpriv_packet_list_free(&s->internal->raw_packet_buffer, &s->internal->raw_packet_buffer_end); + av_packet_list_flush(s->internal->raw_packet_buffer); s->internal->raw_packet_buffer_remaining_size = RAW_PACKET_BUFFER_SIZE; } @@ -4471,6 +4473,7 @@ void avformat_free_context(AVFormatContext *s) av_freep(&s->streams); flush_packet_queue(s); av_packet_list_free(&s->internal->packet_buffer); + av_packet_list_free(&s->internal->raw_packet_buffer); av_freep(&s->internal); av_freep(&s->url); av_free(s);