From patchwork Sun Apr 21 14:14:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 12859 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 1EBA5446E89 for ; Sun, 21 Apr 2019 17:22:43 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0588768A7AC; Sun, 21 Apr 2019 17:22:43 +0300 (EEST) 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 C28DE68034C for ; Sun, 21 Apr 2019 17:22:36 +0300 (EEST) Received: by mail-qk1-f193.google.com with SMTP id n81so1320660qke.2 for ; Sun, 21 Apr 2019 07:22:36 -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=imbNFyHJurXAc2qTAJ2enF+jx5moZLyy7jXxxTny0bA=; b=YT3ywfppBGkAPRrGYnlKyLq3ZuH9iZ5cSDhd61r+aTf3bClQobxwBNyYZCsBgFDdUL fbRrMLJ3bxR2lQSpACDdLPMNFqgEPZMcMNHeIWnJrP9sxV18FIY9jyxbSSykw+o69jUn QeBgLi668zfVYpu9IXZ8Act61YoV4Tf2nzJwCg/GcnkS19B/0q9VzYEtWq8+ZAA+lhqe cD1oBWllIzUSuedNFGNdbBtYO0mjVW0BaMcPm45hygSKMEVeG1PGliTvK0tv5N4jxkVb xuwUhbU7atogm5YqRYlH4UksPs6zPnkfWaet9Zhiy0YLRdZwES6vDyJ19pQAtjktVyhr VCdA== 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=imbNFyHJurXAc2qTAJ2enF+jx5moZLyy7jXxxTny0bA=; b=NBULLfDu/yurikV09KBppFps3qex/sIo7jjf1OdQNC9QqARaazk14LdjiQaqqjW6Uj TUzzXZDPecSfCf7HOKmb9S642DhEw8j6RlMLgDWKs522gjqwkemwia46NJcGAUVeUyci 3fxkjoBatiAcYK8DVO3/s15qcmW/vgr9NAfi1XvySQuyw7LPchq0xeYxP1lhQ7Ix2qnj 3aXCAvcK6ifS62TydAG4rTPkwiC0lDFEHcOVTpQHkQmKwBA7cu4mgrbeObRlZcP01dXt DklgdZOA1FdofrU4unGdaiijZJzXXgq1FwHFDeq91Fp/T2LV5AWRG0NJPWiXocGRF3ES qkeQ== X-Gm-Message-State: APjAAAXBjphdilboI5xdXXSoJcPETJyP0rjswvwW2P7FNCkMnkQipSdG 82hl48D/NdCYuyTzZNczA6o1y5yC X-Google-Smtp-Source: APXvYqyJBvq4Pd0eJHJCTPEFvVN+RDkRQNaYFm5FSZ7zxOBtfH0ZOLgyhCrgBAqM1OrvqNKuVbCH0g== X-Received: by 2002:a37:dd8:: with SMTP id 207mr10426817qkn.278.1555856077077; Sun, 21 Apr 2019 07:14:37 -0700 (PDT) Received: from localhost.localdomain (c-24-60-253-205.hsd1.ma.comcast.net. [24.60.253.205]) by smtp.gmail.com with ESMTPSA id j93sm6321021qtd.82.2019.04.21.07.14.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 21 Apr 2019 07:14:36 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Sun, 21 Apr 2019 10:14:14 -0400 Message-Id: <20190421141414.3940-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190421100451.GQ3501@michaelspb> References: <20190421100451.GQ3501@michaelspb> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v3] 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 During AVPacket assignment, it is currently not clear when the lhs takes ownership of the packet. This commit replaces assignment with an explicit av_packet_move_ref call when there is an ownership transfer to clear the distinction. --- 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))