From patchwork Tue Aug 13 02:47:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 14461 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 E383A447E79 for ; Tue, 13 Aug 2019 05:48:54 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD4A968ABD5; Tue, 13 Aug 2019 05:48:54 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9E1C668A980 for ; Tue, 13 Aug 2019 05:48:46 +0300 (EEST) Received: by mail-wr1-f65.google.com with SMTP id b16so9617318wrq.9 for ; Mon, 12 Aug 2019 19:48:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=mdb0YufAYdsj2lPQFmGBRYzFizXLEam7qwcbGN2L6rk=; b=r5fATLEKz173RK0m4t/wrllWwy7Ilr5EHqYGBzz7Pe0QnlXjDoQ+xTw2jS5GzMR4vS gcGym1SeURbe1KzT+EWx10VOn0Wm7IfpdvuG/CubFw1SbDx3XTbHVtKikjLs/n6soay8 7lllUHLxi6HG8nfDCXctdYQGoq0EaF9zQ8ARMgSRTU7bOrlNKI0Fx8EY9oxcxBM5vC0+ uyChtKAN05bQWFCqstrsk3E5skAf774QRGYPUXafp/asgHM8fyWQxdtQ5diWHaHDxmS7 9khSYbUPQ/q5PumkFanmvc9PK3VaduNUnuqbQS2tDkdY8yVPgHMSIt4Z4k1O7yd99S0v m05g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=mdb0YufAYdsj2lPQFmGBRYzFizXLEam7qwcbGN2L6rk=; b=HuZ4XbhfGiPW9oweZ5/nzJqPKPomLsDL9tLKHtmYWaEBIKv1l+eeem0jMZCDT7KRo1 8vzqfpx2T7KE8ynDyfkTrSIpPWZvDxNWZg8QaC/vs3AnR4qnSnpJAb5zhTt3938j1Ijk yvGLUUfGiwZRnqeX448tdTsXraIm1EMRutnOyWmpNmpEMKm5EFdD0VGhZUn0OKax9TGC IYhYT1yruE57ZfTiSUoHMMzHKchn8h/IFfK3nT76SIufM2LzqwEbr99V/XtsqxiiPV1E q3yBMAVe8OVOFMFLJqZxYFk5QDIeohrj74JtPTGP9F/XLt5FiTpAz/pR9VhSENMZAvMx LKJQ== X-Gm-Message-State: APjAAAWNjtt2fVS+oN1bpUvXTVgEDny+LPPUPP02kGHcH1ilHXtAgh84 qVe0YOWWzm4Dk9LHad7b6PMR9xPK X-Google-Smtp-Source: APXvYqyqmeRE9/H5AsbaSJObvkpWLdZ+SJBDXYNhxo1syUmA1odSkbVx7n7vA2PpS2dSsqa57vCEkw== X-Received: by 2002:adf:fe10:: with SMTP id n16mr43980347wrr.92.1565664526014; Mon, 12 Aug 2019 19:48:46 -0700 (PDT) Received: from localhost.localdomain (ipbcc06ceb.dynamic.kabel-deutschland.de. [188.192.108.235]) by smtp.gmail.com with ESMTPSA id k13sm25020613wro.97.2019.08.12.19.48.45 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Mon, 12 Aug 2019 19:48:45 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 13 Aug 2019 04:47:17 +0200 Message-Id: <20190813024726.6596-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190813024726.6596-1-andreas.rheinhardt@gmail.com> References: <20190813024726.6596-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 04/13] avformat/mux: Cosmetics 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 Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavformat/mux.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/libavformat/mux.c b/libavformat/mux.c index 2728c62de5..4089382ffd 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -921,13 +921,13 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, { int ret; AVPacketList **next_point, *this_pktl; - AVStream *st = s->streams[pkt->stream_index]; - int chunked = s->max_chunk_size || s->max_chunk_duration; + AVStream *st = s->streams[pkt->stream_index]; + int chunked = s->max_chunk_size || s->max_chunk_duration; - this_pktl = av_malloc(sizeof(AVPacketList)); + this_pktl = av_malloc(sizeof(AVPacketList)); if (!this_pktl) return AVERROR(ENOMEM); - if ((pkt->flags & AV_PKT_FLAG_UNCODED_FRAME)) { + if (pkt->flags & AV_PKT_FLAG_UNCODED_FRAME) { av_assert0(pkt->size == UNCODED_FRAME_PACKET_SIZE); av_assert0(((AVFrame *)pkt->data)->buf); } else { @@ -940,7 +940,7 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, av_packet_move_ref(&this_pktl->pkt, pkt); pkt = &this_pktl->pkt; - if (s->streams[pkt->stream_index]->last_in_packet_buffer) { + if (st->last_in_packet_buffer) { next_point = &(st->last_in_packet_buffer->next); } else { next_point = &s->internal->packet_buffer; @@ -952,8 +952,8 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, st->interleaver_chunk_duration += pkt->duration; if ( (s->max_chunk_size && st->interleaver_chunk_size > s->max_chunk_size) || (max && st->interleaver_chunk_duration > max)) { - st->interleaver_chunk_size = 0; - this_pktl->pkt.flags |= CHUNK_START; + st->interleaver_chunk_size = 0; + pkt->flags |= CHUNK_START; if (max && st->interleaver_chunk_duration > max) { int64_t syncoffset = (st->codecpar->codec_type == AVMEDIA_TYPE_VIDEO)*max/2; int64_t syncto = av_rescale(pkt->dts + syncoffset, 1, max)*max - syncoffset; @@ -964,7 +964,7 @@ int ff_interleave_add_packet(AVFormatContext *s, AVPacket *pkt, } } if (*next_point) { - if (chunked && !(this_pktl->pkt.flags & CHUNK_START)) + if (chunked && !(pkt->flags & CHUNK_START)) goto next_non_null; if (compare(s, &s->internal->packet_buffer_end->pkt, pkt)) { @@ -985,8 +985,7 @@ next_non_null: this_pktl->next = *next_point; - s->streams[pkt->stream_index]->last_in_packet_buffer = - *next_point = this_pktl; + st->last_in_packet_buffer = *next_point = this_pktl; return 0; }