From patchwork Mon Apr 8 18:03:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 12647 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 4C268448B0A for ; Mon, 8 Apr 2019 21:09:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C2A5E68AA8F; Mon, 8 Apr 2019 21:09:21 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f196.google.com (mail-qt1-f196.google.com [209.85.160.196]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7621C68A451 for ; Mon, 8 Apr 2019 21:09:14 +0300 (EEST) Received: by mail-qt1-f196.google.com with SMTP id k2so16628071qtm.1 for ; Mon, 08 Apr 2019 11:09:14 -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=PSe52x8TA45BcHDbg99kHw4bfA4WaAwbqq5PuLzlPOE=; b=CXq9AKeNOSC0whmefK2MvpnIsZKqdPR4OR8XHnaRQEVehU7tCWjJzNx3nX6MVpV5N3 bthsKI+afSpY4YYypl2Q5u2qC9DXrT2s2cr+TWMb0x/UHCKkWlqKYyIQbMHW/BMe4Ijz MzdhaKqqrPo6jrW0wiep1KMg62n2atqH9QDR8JG2gIovE7ZQr031AfzBQZiMsnHzRyLg EleodU7DOsaLpHBpblvooheAFyjcJYYzJDJAOayrGiNcPYW3j36izV8Aah4Wp/nClUtt mo7i+c26MksUWirr+nGZkSvun3bzjSPjF4UDhAvOpVmjOObBNPKdM1kKCYaNw6FDq9wz Zu2g== 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=PSe52x8TA45BcHDbg99kHw4bfA4WaAwbqq5PuLzlPOE=; b=rOUwGsL80ro+FnHbTs+2IRD8ejEqTrThFlgAK+CgL0tcaOr7RX0i5EF48+PVJ3gxB/ SfhZ+Bk7fqnGmxXFrPvj50mluoouswxPqQ8P/Cx8qNlX/FiDZ/RWEo6QDev/0WtUq5J1 LqRAh9Wy1RoXzR1OA52OLM4KtXng1tRvNWp/YAaaW4UbEpDDBPm92OhGdKAtE9/Dcn0w YGca3Cz9BPmJZtLui6Kc74OwpYZWLuzaspK8BQQfJe7kU4YBKXZqiprXLlJViwslULtP 4LSJlaMA5giEFik86NTfdDwkuyatywP+7Gbh2mvFdTERRiIVpjHznwt9UKPqfXmG8FMR AjWw== X-Gm-Message-State: APjAAAXWgM396iQgC16VhZfDurqbtmc+Cxav1yGMPmEBcfeFOsZHe66A RmzyCLJDMpUasRLGuAAHJ3lh2Ufk X-Google-Smtp-Source: APXvYqyw249FB53ntikiMf0x0ubqSbUKyJ/JGMNIwWdCzH46KtbhTMPcQa8V3rDTJlz7CzZruqiSBw== X-Received: by 2002:ac8:37c7:: with SMTP id e7mr25780218qtc.46.1554746623878; Mon, 08 Apr 2019 11:03:43 -0700 (PDT) Received: from localhost.localdomain (ip-184-209-203-203.spfdma.spcsdns.net. [184.209.203.203]) by smtp.gmail.com with ESMTPSA id f22sm14600900qkm.22.2019.04.08.11.03.41 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 08 Apr 2019 11:03:43 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Mon, 8 Apr 2019 14:03:31 -0400 Message-Id: <20190408180331.22805-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190404182934.GL3501@michaelspb> References: <20190404182934.GL3501@michaelspb> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/utils: Use av_packet_move_ref for packet ownership transfer 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: Andriy Gelman Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" From: Andriy Gelman This commit replaces packet assignment operator with av_packet_move_ref when there is a packet ownership transfer. --- Michael, the update patch now has correct behavior for ticket 4221. libavformat/utils.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 9b3f0d28e6..9653ebb4f4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -460,10 +460,7 @@ int ff_packet_list_put(AVPacketList **packet_buffer, return ret; } } else { - // TODO: Adapt callers in this file so the line below can use - // av_packet_move_ref() to effectively move the reference - // to the list. - pktl->pkt = *pkt; + av_packet_move_ref(&pktl->pkt, pkt); } if (*packet_buffer) @@ -832,19 +829,21 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) { int ret, i, err; AVStream *st; + AVPacket *buffer_pkt; /*view packet contents only. does not take ownership*/ for (;;) { AVPacketList *pktl = s->internal->raw_packet_buffer; if (pktl) { - *pkt = pktl->pkt; - st = s->streams[pkt->stream_index]; + buffer_pkt = &pktl->pkt; + st = s->streams[buffer_pkt->stream_index]; if (s->internal->raw_packet_buffer_remaining_size <= 0) if ((err = probe_codec(s, st, NULL)) < 0) return err; if (st->request_probe <= 0) { s->internal->raw_packet_buffer = pktl->next; - s->internal->raw_packet_buffer_remaining_size += pkt->size; + s->internal->raw_packet_buffer_remaining_size += buffer_pkt->size; + av_packet_move_ref(pkt, &pktl->pkt); av_free(pktl); return 0; } @@ -914,14 +913,17 @@ int ff_read_packet(AVFormatContext *s, AVPacket *pkt) if (!pktl && st->request_probe <= 0) return ret; + /*transfer pkt ownership to list*/ err = ff_packet_list_put(&s->internal->raw_packet_buffer, &s->internal->raw_packet_buffer_end, pkt, 0); if (err) return err; - s->internal->raw_packet_buffer_remaining_size -= pkt->size; - if ((err = probe_codec(s, st, pkt)) < 0) + buffer_pkt = &s->internal->raw_packet_buffer_end->pkt; + s->internal->raw_packet_buffer_remaining_size -= buffer_pkt->size; + + if ((err = probe_codec(s, st, buffer_pkt)) < 0) return err; } } @@ -1662,7 +1664,7 @@ FF_ENABLE_DEPRECATION_WARNINGS if (!st->need_parsing || !st->parser) { /* no parsing needed: we just output the packet as is */ - *pkt = cur_pkt; + av_packet_move_ref(pkt, &cur_pkt); compute_pkt_fields(s, st, NULL, pkt, AV_NOPTS_VALUE, AV_NOPTS_VALUE); if ((s->iformat->flags & AVFMT_GENERIC_INDEX) && (pkt->flags & AV_PKT_FLAG_KEY) && pkt->dts != AV_NOPTS_VALUE) { @@ -3779,15 +3781,15 @@ FF_ENABLE_DEPRECATION_WARNINGS break; } - pkt = &pkt1; - if (!(ic->flags & AVFMT_FLAG_NOBUFFER)) { ret = ff_packet_list_put(&ic->internal->packet_buffer, &ic->internal->packet_buffer_end, - pkt, 0); + &pkt1, 0); if (ret < 0) goto find_stream_info_err; - } + pkt = &ic->internal->packet_buffer_end->pkt; + } else + pkt = &pkt1; st = ic->streams[pkt->stream_index]; if (!(st->disposition & AV_DISPOSITION_ATTACHED_PIC))