From patchwork Wed Nov 18 16:52:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 23719 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 54BEB448EF5 for ; Wed, 18 Nov 2020 19:23:41 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4E96368B647; Wed, 18 Nov 2020 19:23:40 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E3821689D14 for ; Wed, 18 Nov 2020 19:23:32 +0200 (EET) Received: by mail-io1-f68.google.com with SMTP id o11so2822006ioo.11 for ; Wed, 18 Nov 2020 09:23:32 -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=QRUIEhhCvf6YTxjyWsGO4/+mjBKvoqSNqnK1ngP9Ae8=; b=dR1KSdRTsBTay0F0DUlpT4Cay18DzKLgWhvs4BBK0a1Rrrn/BbY8295yRKSBmxDb8c tYNvUWTFOXV/eS/2HDDizjss8UYMjzRYOxuz1mD5LdwEg9MUY9O26uz4mm+Gjlhtpr/2 zk5cVpKKXc205vd7oBke0vlT+zR+NW2ioPolzo2Ihk+h+qyTowWnwpyBwp7jm9EvyNS5 aHbD2uuK2dl+bfNHSicxbO6pcbq55Z+JOFClDAIlA8isgfzrb6227cdR3v/YNXrXH1iH 9duMqboSW4Em4oKwGQ56cY5LOYcsJ2kGVlWBvacxEG2+FY3Nz+1piWKRA2cSU6Ka6DK5 kipQ== 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=QRUIEhhCvf6YTxjyWsGO4/+mjBKvoqSNqnK1ngP9Ae8=; b=LRQtFVjnH0Q5WGkj37g/hQ/8KrqhgFoinUeZpMCwypLnyBybuW9INNrcNs49c+5Kfe HWjTx3SWuMsa+Nwwv4OB5fW4x/puJh7YkEJAEpYXgliZIa2y/BLFhbL3lO72VXvQ9VnB HpyXhxWUX3KxrV6J0PEl7exoaaBTNDKY+DTB6E1QsznNNPa9sftqJhyHRT2Faz5F/LPv GaUb8W4E276UjEwH9xhYdJIYkMgpLMPFgWnu9bGvLHrFGnu6ERnX95bI8V8nXb2Z+tPZ 0hNilmlZDvqmPgjncZlxfiPU098W/FHa4sneBwfwTMXLGMCNXt3otLLX7Zk1NyAFu5Mz gqpg== X-Gm-Message-State: AOAM531HS8e9eHy6aofh431vINPtsMsk1pfvOyFd40/KouTXdCp1zzBj 2xYm8Wmsb7s+AQMs87tbqJz6LFndFzaOyQ== X-Google-Smtp-Source: ABdhPJy2MxhshhqjE96HCMcHDfqjTAVXbfbAEsRL+iwMHDz5ckun6DiZDmgnuUdtBuYjFFHHHBTdbQ== X-Received: by 2002:ac8:7395:: with SMTP id t21mr5054504qtp.358.1605718390355; Wed, 18 Nov 2020 08:53:10 -0800 (PST) Received: from localhost.localdomain ([181.23.91.217]) by smtp.gmail.com with ESMTPSA id f14sm4863788qkk.89.2020.11.18.08.53.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Nov 2020 08:53:09 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 18 Nov 2020 13:52:31 -0300 Message-Id: <20201118165247.4130-3-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 02/18] avformat/internal: make last_in_packet_buffer of type PacketListEntry 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/mux.c | 11 ++++++----- libavformat/mxfenc.c | 6 +++--- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/libavformat/internal.h b/libavformat/internal.h index 49e82bfbca..c29c7deec7 100644 --- a/libavformat/internal.h +++ b/libavformat/internal.h @@ -26,6 +26,7 @@ #include "libavutil/bprint.h" #include "avformat.h" #include "os_support.h" +#include "libavcodec/packet_internal.h" #define MAX_URL_SIZE 4096 @@ -342,7 +343,7 @@ struct AVStreamInternal { /** * last packet in packet_buffer for this stream when muxing. */ - struct AVPacketList *last_in_packet_buffer; + struct PacketListEntry *last_in_packet_buffer; }; #ifdef __GNUC__ diff --git a/libavformat/mux.c b/libavformat/mux.c index d2a56d216b..d60bf2218b 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -832,7 +832,7 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, pkt = &this_pktl->pkt; if (st->internal->last_in_packet_buffer) { - next_point = &(st->internal->last_in_packet_buffer->next); + next_point = (AVPacketList **)&(st->internal->last_in_packet_buffer->next); } else { next_point = &s->internal->packet_buffer; } @@ -876,7 +876,8 @@ next_non_null: this_pktl->next = *next_point; - st->internal->last_in_packet_buffer = *next_point = this_pktl; + *next_point = this_pktl; + st->internal->last_in_packet_buffer = (PacketListEntry *)this_pktl; return 0; } @@ -951,7 +952,7 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, for (i = 0; i < s->nb_streams; i++) { int64_t last_dts; - const AVPacketList *last = s->streams[i]->internal->last_in_packet_buffer; + const PacketListEntry *last = s->streams[i]->internal->last_in_packet_buffer; if (!last) continue; @@ -1000,7 +1001,7 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, if (!s->internal->packet_buffer) s->internal->packet_buffer_end = NULL; - if (st->internal->last_in_packet_buffer == pktl) + if (st->internal->last_in_packet_buffer == (PacketListEntry *)pktl) st->internal->last_in_packet_buffer = NULL; av_packet_unref(&pktl->pkt); @@ -1019,7 +1020,7 @@ int ff_interleave_packet_per_dts(AVFormatContext *s, AVPacket *out, if (!s->internal->packet_buffer) s->internal->packet_buffer_end = NULL; - if (st->internal->last_in_packet_buffer == pktl) + if (st->internal->last_in_packet_buffer == (PacketListEntry *)pktl) st->internal->last_in_packet_buffer = NULL; av_freep(&pktl); diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index d8678c9d25..c7f98ac257 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -3061,8 +3061,8 @@ static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket if (!stream_count || pktl->pkt.stream_index == 0) break; // update last packet in packet buffer - if (s->streams[pktl->pkt.stream_index]->internal->last_in_packet_buffer != pktl) - s->streams[pktl->pkt.stream_index]->internal->last_in_packet_buffer = pktl; + if (s->streams[pktl->pkt.stream_index]->internal->last_in_packet_buffer != (PacketListEntry *)pktl) + s->streams[pktl->pkt.stream_index]->internal->last_in_packet_buffer = (PacketListEntry *)pktl; last = pktl; pktl = pktl->next; stream_count--; @@ -3087,7 +3087,7 @@ static int mxf_interleave_get_packet(AVFormatContext *s, AVPacket *out, AVPacket *out = pktl->pkt; av_log(s, AV_LOG_TRACE, "out st:%d dts:%"PRId64"\n", (*out).stream_index, (*out).dts); s->internal->packet_buffer = pktl->next; - if(s->streams[pktl->pkt.stream_index]->internal->last_in_packet_buffer == pktl) + if(s->streams[pktl->pkt.stream_index]->internal->last_in_packet_buffer == (PacketListEntry *)pktl) s->streams[pktl->pkt.stream_index]->internal->last_in_packet_buffer= NULL; if(!s->internal->packet_buffer) s->internal->packet_buffer_end= NULL;