From patchwork Tue Oct 8 05:41:16 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 15556 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 E41A844A75D for ; Tue, 8 Oct 2019 08:43:04 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CD1B9688092; Tue, 8 Oct 2019 08:43:04 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C8580687FC8 for ; Tue, 8 Oct 2019 08:42:56 +0300 (EEST) Received: by mail-wr1-f67.google.com with SMTP id y19so17790134wrd.3 for ; Mon, 07 Oct 2019 22:42:56 -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=XIL0+lh+TpVAsGG+6gahqnFfN0ZxzaR11VdiQmr0t7c=; b=Ue60+ri6+bIaClt7AHzlj56LxAl09ID5H1KLfB4UuAQsMV7FKhm7K9B7LtDQQrnJ8M P9GkMRo1OGgLtYBMj0GiBHyGH3rst9Qg43wPwCHBSDJHSqsXFQ+omAgWDBcf2aGxQVvv wGIcPbx7+tjneRDxiLBQ+vAwOJLs9B8kgpQobYf3abbMopoCjDrp79xG3wvK8zwVMDiW YLLRF/0e84KsYRTOexxpTpQy8YsKSxM+779GlNiKxS7kRqvQpLShFXmRElitB0D5uW45 kyHgm4k1fdx4pgfQTQvbwoL+ZL64VGfnq1GoJB11OWgCErrwgltDKcXb++xrjd0M4E7H 800w== 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=XIL0+lh+TpVAsGG+6gahqnFfN0ZxzaR11VdiQmr0t7c=; b=m59f6gV6HtRrfDWGeKuPcJ6lcCPI8XlHaPGcoytyk6Nw+mQMWHzp1n118fz37Hoy70 xVQSnoiiu06MTYFpkTKn/QrGXKWNsIGE97LVk3WD2Lj1pGTXxzllTPQTzc6R2jGpy8QD juZbYz3Yo91is6inii3by4NJO1kjNo81wIuXUbq2ikao7VwQY0voP+hSSEzeouKTbYE+ LR0sxs2Np+Plws4n4qVJ2lXI+O/1iY+EbT+CNBXszqOiwjw+w03W6QtvC2WaDbxnGS3o MSNzS0eED6IEsYGaCLUGFQ3TJByZ0J2++/KZdnaxGYiCNliLpR3K0kyc7CI+89Cn3LVb ygxw== X-Gm-Message-State: APjAAAWCHetR2pN0LLxbVaGOY6ZfnYeVFvVSTm533sioasOKWkdPqGRs /5AEZqZZkO+ZmWYqEmixVeKDFz7Y X-Google-Smtp-Source: APXvYqy8+9mUVmuk3X7zDMALX7TXJt6qnpHQSWedtHLhFL4t10eWHRZBziRyM9TTUf2hEOTgifU5uw== X-Received: by 2002:a5d:4f0b:: with SMTP id c11mr25272654wru.63.1570513376146; Mon, 07 Oct 2019 22:42:56 -0700 (PDT) Received: from localhost.localdomain (ipbcc08937.dynamic.kabel-deutschland.de. [188.192.137.55]) by smtp.gmail.com with ESMTPSA id n1sm30572113wrg.67.2019.10.07.22.42.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 07 Oct 2019 22:42:55 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Oct 2019 07:41:16 +0200 Message-Id: <20191008054116.60992-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20191008054116.60992-1-andreas.rheinhardt@gmail.com> References: <20191008054116.60992-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avformat/flacdec: Remove useless packet 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" flac_read_timestamp() applied av_init_packet() to a packet (which initializes all fields of the packet except for data and size) and then went on to use only the data and size fields. In other words: Said packet can be removed and replaced by an uint8_t * and an int. Signed-off-by: Andreas Rheinhardt --- libavformat/flacdec.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 8394e47483..cb516fb1f3 100644 --- a/libavformat/flacdec.c +++ b/libavformat/flacdec.c @@ -259,7 +259,7 @@ static int flac_probe(const AVProbeData *p) static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_index, int64_t *ppos, int64_t pos_limit) { - AVPacket pkt, out_pkt; + AVPacket pkt; AVStream *st = s->streams[stream_index]; AVCodecParserContext *parser; int ret; @@ -276,6 +276,9 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde parser->flags |= PARSER_FLAG_USE_CODEC_TS; for (;;){ + uint8_t *data; + int size; + ret = ff_raw_read_partial_packet(s, &pkt); if (ret < 0){ if (ret == AVERROR(EAGAIN)) @@ -285,14 +288,12 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde av_assert1(!pkt.size); } } - av_init_packet(&out_pkt); av_parser_parse2(parser, st->internal->avctx, - &out_pkt.data, &out_pkt.size, pkt.data, pkt.size, + &data, &size, pkt.data, pkt.size, pkt.pts, pkt.dts, *ppos); av_packet_unref(&pkt); - if (out_pkt.size){ - int size = out_pkt.size; + if (size) { if (parser->pts != AV_NOPTS_VALUE){ // seeking may not have started from beginning of a frame // calculate frame start position from next frame backwards