From patchwork Thu Apr 4 14:55:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andriy Gelman X-Patchwork-Id: 12613 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 DD8824496BC for ; Thu, 4 Apr 2019 17:55:22 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id BF4E268AA96; Thu, 4 Apr 2019 17:55:22 +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 A322768A9D9 for ; Thu, 4 Apr 2019 17:55:16 +0300 (EEST) Received: by mail-qt1-f196.google.com with SMTP id d13so3563550qth.5 for ; Thu, 04 Apr 2019 07:55:16 -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:mime-version :content-transfer-encoding; bh=eOB5TwsjAmJKg+xD5wGdoeRDBRHH859ofSVkKoXo3XY=; b=GSVCr6M5eQGNmMhxVxZc/RAZcSzOIhWVyMYEnRscOrzKmzyCLUs0zceUh91g2nDr6Q 8VTqRZ4yO0Bp8Px8VJ7SqxQEJJQ26JTSqQYf7laD1IZKgFKXqqO8naRmQGDVU4yjL34H fASyIe/B/Lgv2qyY87L6ucfA2WIYeMOfCn9ZZ3PKRO1yyBY+WqW31JeQxlUokUm5JxLg xOVYIwIug2Jr2n4lNdL3H1NI59iRh2LePw0UoqkAXW8EY47uy7k0nYLmFCOWvwvQhXa0 p0lrnrp5WvfuSLxlAtUkFY6Au9kF5qcQ7gGk/XhQg+YcAtx1PKitjVjrxOL+P6nJE8YP k4NQ== 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:mime-version :content-transfer-encoding; bh=eOB5TwsjAmJKg+xD5wGdoeRDBRHH859ofSVkKoXo3XY=; b=sly1QOAQcdMSbY/gXVjchZChA5LqJ/V1eO2XjNOlepZlThp3YtlNTI/wEOgu/ijNT1 MrLU6suKZJ799MQ+3P9qV1X1zOt6+g1Zyq51MZV3ZZKABMEsejp+W3UYqwE8vjDohcFJ RSXx/BjGlOaJ8+wFGRoBsHX0SAJqzxwKFZCqd88OOgmZbUWPkv6OSJuDlV+AxBUcMGtA FCiMjHag6PZxLU4yBbUks4CQrGn47VkhN3OFTng1mHIe0NZ51883A9GPspSioBsoWk+M ikPK69duXkUVt1dxdP5ho/4KC1EYpahBVC5AV9VoR7jV/ZkGB+B9n9sjf8bL7G482Pz+ VMzQ== X-Gm-Message-State: APjAAAUwhNM+RxVAgb62VJ4tqNAQDcA+rsqXfMNUk4BAv/7MBxQuO3MV W4MOoeTQJU/bdM1PKlTS4tSgQsSI X-Google-Smtp-Source: APXvYqxv1pwCMM5aDNi01gTsNGEI0lZ5qFSsPP/VszoCjB2HixUQ3YpiTTSZFv83OpXxXpF54gRD0g== X-Received: by 2002:aed:3b31:: with SMTP id p46mr6069290qte.207.1554389715030; Thu, 04 Apr 2019 07:55:15 -0700 (PDT) Received: from localhost.localdomain (ip-184-209-200-194.spfdma.spcsdns.net. [184.209.200.194]) by smtp.gmail.com with ESMTPSA id n6sm4548140qte.11.2019.04.04.07.55.14 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 04 Apr 2019 07:55:14 -0700 (PDT) From: Andriy Gelman X-Google-Original-From: Andriy Gelman To: ffmpeg-devel@ffmpeg.org Date: Thu, 4 Apr 2019 10:55:03 -0400 Message-Id: <20190404145503.20761-1-andriy.gelman@gmail.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] 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. --- Aims to address a TODO in libavformat/utils.c about using av_packet_mov_ref instead of assignment operator. libavformat/utils.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index 9b3f0d28e6..f757b02d49 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; + 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))