From patchwork Fri Mar 5 16:33:11 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 26142 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 4112344BC27 for ; Fri, 5 Mar 2021 18:39:34 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7FC5D68AC1A; Fri, 5 Mar 2021 18:35:59 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f180.google.com (mail-qt1-f180.google.com [209.85.160.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C375868ABE7 for ; Fri, 5 Mar 2021 18:35:52 +0200 (EET) Received: by mail-qt1-f180.google.com with SMTP id w1so2182759qto.2 for ; Fri, 05 Mar 2021 08:35:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=LF6MHAPVonmICuZKnuz8T4CIlsPCDxtATsSLIY/GrUg=; b=ZvYZVTu0ygmvQIZN0gu/02KCUYEaPWgOldF0Baf80vMsg8UE1XjysDWw0h3WJolN8b ilD9f7blc8idAxzobHrW3ydfO+JKm0vmPNCnjxnsuA/CcJrGJNIpY5UISDbaxq3eWzz0 JGtJUoVPRvTwej0I8hAnieqAbF1sIArqgFI75EXCHA2nZeubNdjMSIexTwYs7OwSlC5Q HEE/o2cTw6b0P1RQ1MPnpxvynvcBKnQhe7/JKKjZyWlYQ8Gz18439au6tQRBbuk1fHtt WTINYwdaf4oB/Ivkv7V6/WVMedz9tf7xCWCyHH1Jkb2orEKd7KVtqrJs0H3lobi9xKW2 TE1g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LF6MHAPVonmICuZKnuz8T4CIlsPCDxtATsSLIY/GrUg=; b=Z/V//7DV5SylR6QA00O6NqLv47XF68j9Q5kY9wGWNarp5/T0N+WNwj9YooGx2mdNcA 4wM46Uilj8MBziYEeFbxerEEdjlOesi6Wwuxosq+/lz6XpDD46jbtzBMoUmJZz7lbVJ8 tbnHL66r3k+/9/ZgeCJDp65Hn0f929fPFmnFsDcs6kdBIxp50fdN3cueZz/Wy7FNq3Fj 8R99AdMmerPWz2RP+ooZCWFKXpl/a93HK4r10X4mCMOOA/iTJHvJXkxk5WvFSbDT0xEK 7XVnYckF6Rj3J9+AGkq3rCBZNwGdNBLtQsoHE5VS5cvPy2lwg5o4QDkRkyikO5PA1rbe oDjw== X-Gm-Message-State: AOAM530rh1+QSdrdQb7XQ9fHdE0nUZtk1ZlyQsqVo1BmM/1cYTaxWa8e tgdKx+sJT1HHgEi7YCzU7Yxvz6qvveA4Zg== X-Google-Smtp-Source: ABdhPJykLzszSnl0pFZmxrwr6Sx55kKq7dodkcx1ynojvzZhYTww5cR5SQDFYAeLIbNOG+OI7mM1AA== X-Received: by 2002:a05:622a:44d:: with SMTP id o13mr9483582qtx.378.1614962151232; Fri, 05 Mar 2021 08:35:51 -0800 (PST) Received: from localhost.localdomain ([181.23.89.132]) by smtp.gmail.com with ESMTPSA id b10sm2168494qtt.23.2021.03.05.08.35.50 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 08:35:50 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Fri, 5 Mar 2021 13:33:11 -0300 Message-Id: <20210305163339.63164-21-jamrial@gmail.com> X-Mailer: git-send-email 2.30.1 In-Reply-To: <20210305163339.63164-1-jamrial@gmail.com> References: <20210305163339.63164-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 20/48] avformat/flacdec: use av_packet_alloc() to allocate packets 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: James Almer --- libavformat/flacdec.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c index 6aca4755a1..f7b21986dc 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; + AVPacket *pkt = s->internal->parse_pkt; AVStream *st = s->streams[stream_index]; AVCodecParserContext *parser; int ret; @@ -268,7 +268,6 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde if (avio_seek(s->pb, *ppos, SEEK_SET) < 0) return AV_NOPTS_VALUE; - av_init_packet(&pkt); parser = av_parser_init(st->codecpar->codec_id); if (!parser){ return AV_NOPTS_VALUE; @@ -279,20 +278,20 @@ static av_unused int64_t flac_read_timestamp(AVFormatContext *s, int stream_inde uint8_t *data; int size; - ret = ff_raw_read_partial_packet(s, &pkt); + ret = ff_raw_read_partial_packet(s, pkt); if (ret < 0){ if (ret == AVERROR(EAGAIN)) continue; else { - av_packet_unref(&pkt); - av_assert1(!pkt.size); + av_packet_unref(pkt); + av_assert1(!pkt->size); } } av_parser_parse2(parser, st->internal->avctx, - &data, &size, pkt.data, pkt.size, - pkt.pts, pkt.dts, *ppos); + &data, &size, pkt->data, pkt->size, + pkt->pts, pkt->dts, *ppos); - av_packet_unref(&pkt); + av_packet_unref(pkt); if (size) { if (parser->pts != AV_NOPTS_VALUE){ // seeking may not have started from beginning of a frame