From patchwork Mon Sep 6 02:27:57 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 30031 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6602:2a4a:0:0:0:0 with SMTP id k10csp3374917iov; Sun, 5 Sep 2021 19:31:53 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz6vYgZZA8ylSmR6CaMnNreUd8HozCVKUi0yKAsn5yXcgQztSzhS3R3inl52tl4RG+O0mDR X-Received: by 2002:a17:907:96a2:: with SMTP id hd34mr11332094ejc.113.1630895513416; Sun, 05 Sep 2021 19:31:53 -0700 (PDT) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id bo1si5745654ejb.535.2021.09.05.19.31.53; Sun, 05 Sep 2021 19:31:53 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@outlook.com header.s=selector1 header.b=abFrwOLK; arc=fail (body hash mismatch); spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=outlook.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 83CDD68A8F3; Mon, 6 Sep 2021 05:28:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05olkn2016.outbound.protection.outlook.com [40.92.89.16]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9DD8A68A7C9 for ; Mon, 6 Sep 2021 05:28:35 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PU/8c+siIpVzV+rZgEuVP0fQQMQesXQ9Y+bxhid0fGTqCAf8DWdc380ae99scGsKsNANbM6BVwltsF2jPsz6Vs0hJZ21RNfi+L8zDltqM7JowotXST6o/zINnfsfyhTHbrl/2tmCCRW9QoRxciI598ENj9aTjyttGtDp8UNG7oZ8SEdSiwf+8/OSRcwkGx4Ay1kksgOfsTebUd7cgH3knLq5M8+Q7Fd+A0iGQ2sCelqaI1ZUekqXWofKfkoooUZOlXfm8kDmc1n3mLHLhpZe1ZGYZTvfkbXP6PhHQLztOZeVl7R3MzBVROFVIT6WrqlqkcHKNT/9tC/1CGPxWlAWmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=KVaMLHqtAOul3ajTsFwvbQyopfn6EUDZ0ffUhXBwCWM=; b=FOIThP1egWcuePqjt/NHLGRbyph3NiP8uLGKAcyvXv6eWOwW3JBHJzj1GkBNpFM7b017veTEdPJHov8azOMMRlqx+lpacAc5G/8BXvVXYTQaXDzQhdRiPhrlXAU9JYz77QGaGDoQYznGWXTQL8fVN6mQT5zlSjIxyqn7zpEdyzaquvtTfj2gIcUzhS2hPq84QKbj4PvgxSHffF63AnHv4tlT48lmcIf0F50NyuyRTNhUxm0rgnPuC1ieBN1skX8c24dYppsXnBDMrbqEJYh0YYCDPAwq9UDUAnoZTbon2zqh5EsdpfcD4mXjl3Ei40Eh+pNCAK1JdC+Zf3sOrFJb/w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KVaMLHqtAOul3ajTsFwvbQyopfn6EUDZ0ffUhXBwCWM=; b=abFrwOLKiDucC53zcxDX3sDeJtcNXwFShXPH02yG9ENj7v54H+pIOK4tyCc9GV6BsRpHb+thH7nHTrzQUM+AQDwJlxRzl+J5HeIiKTPoGGRatzcPp9PLBJDO31WJdsJRsQ5in85woYZXVERLoCcRgfD97IOAHcxTdZoJqDOqlCI/7GcbDnYrZVp1YfGlS/nibD9gxz0DK7V7CTteJ2VNAI7ux9Np4qehmCY9rGwyHPWKsBCW3CHND2gk+1G9sZHN2t1Rq/sSODzPscA36JCoU7e0rdtfM9ab2l4hvcxiO1K34erplV2ECUGkArZXvsdqxnO+NQBa9Zyysl+Zw0iysw== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB5380.eurprd03.prod.outlook.com (2603:10a6:20b:c9::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19; Mon, 6 Sep 2021 02:28:30 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::787b:2156:ca99:fe00%3]) with mapi id 15.20.4478.025; Mon, 6 Sep 2021 02:28:30 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 6 Sep 2021 04:27:57 +0200 Message-ID: X-Mailer: git-send-email 2.30.2 In-Reply-To: References: X-TMN: [FxUPsjefILDIGyuo17FVKHG8VWXCs+Kq] X-ClientProxiedBy: PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20210906022802.4072793-18-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.142.38) by PR1PR01CA0033.eurprd01.prod.exchangelabs.com (2603:10a6:102::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Mon, 6 Sep 2021 02:28:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2aef37c4-f33e-4195-d892-08d970de041d X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQPQD6tvsiQeosiZzDpp5hD3o28O6wkTWE11NzSuhcUpQiYSWmVYhternF3AW0bPtHcCo4PN+d+kl9bWwEM9JEysDUyZX+lOw9cxp5mRGBmULZiEOn18DEOYzpTAJ/G3Zwp7+c4SK6W8Mf7XfGk/4bwiXE4n1mcqECrBdWWxoG14Q4ZAdrrkuXo/SIaoigRIW+8v1l5gZjKS459WUCgeYkHasmAH3wS9gOVgzZlDdesbRM4wTeGPut8Qcu50NhxJJ4EHHU0LYVIo8S+uYnv/RkQkmduWucX+z9Cf9W5XDnLBMlYBMvMSUQ1KwadUU40T7PIt2G9wEzQmgrFPa2jjL8KC8VaCz7hXGaf2FT6Lvkq2wkvSCDrARUFQh0H9iqJjFOC/JLsB7QQ/I8+fdeA3YEMWCvxC8DDixTLkiNuFESfF/6Tyd9EIpPujGUTxTyGdk6rARz6yktyiaKAjDad6+rSJ6zz0Hd/qGjUgBBjh6wu5YHE3OJ375zt9LHr7mg7pd+FiaJixKbR+XO87RzkWmeGUxcd8ODeqkY5k7P/MEizR9pa7s27I0ovBLrmEvpwhxIxHbuazU4BsaBGd4uee4DqPU2dGIERIsKTorrbVc8K3mAVVi9JegPWT27oe9NOJ7CaZlkSMTjaD0uQX8zQpOdFAwLu8Y37rK7L84KIJPUDYVynRWmK31zxLPTfj/GQOX0TniPwWHlOi73pwSa47g2fplCOx/d3i1bg98FZbgNjzo92DBbHmPVXe31YoKWjf84= X-MS-TrafficTypeDiagnostic: AM6PR03MB5380: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 8wR74FPBi8w0NYMOQg+NwfuKiRT0j6RT8OZOrhOsdu+qEPJd9Z0QxVOrxKP4S56HSyxRM/+VS+o1Mvaugl/8Pgzc3WIz3KCCWnhy8EjlQVGdcgb2r+h/1MrwNdoG3+VFFPKNppKQFgWFbM4Dq60+R7S045E5LDhk8hx10MYlV8anHd/7qyxnd1fl79ShibTRzncysCnnPt4HFYM36xIjDxccf6BMWQB2n9/Q1U6vDOhiOz+Nv/JDncEKSGc4d4h3ZgqVkWdFZuFJzKUlIlZzLT+kP3e1kJdxQJcynfYOQrJcQa9nlta5AvyEho3oSUOK3TpOEpAtrxjnIKAIkshF+MPkQJLBzZa64LAU83xHH8xUe9/V+tCwggn8J0Cte89L6gQzItsVNd2Y37JGAb4eoLjtXzMntjRUt3DWaQHBrDGhIPASGKYEIkOCT5APimpb X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: Z0cMB0gDZh+Fm0Hh5AhSO/bwpE9Tj81z++gOb44MsKAFPB5Tq15dTG3dsdYfN0UyRGgFS6OS/OALhIdWjMjVrTvjFbqNMYdyRoOOhJ1vvYjMziBLzgbmVl5UHco6TWOcvFDY/G0XPgqY3u+3KlfLYQ== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 2aef37c4-f33e-4195-d892-08d970de041d X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2021 02:28:30.5662 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR03MB5380 Subject: [FFmpeg-devel] [PATCH 29/34] avformat/tee: Avoid stack packet X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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" X-TUID: 7ev1IRfscS/u Signed-off-by: Andreas Rheinhardt --- libavformat/tee.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/libavformat/tee.c b/libavformat/tee.c index 505873ce1e..f359218a08 100644 --- a/libavformat/tee.c +++ b/libavformat/tee.c @@ -540,7 +540,7 @@ static int tee_write_packet(AVFormatContext *avf, AVPacket *pkt) TeeContext *tee = avf->priv_data; AVFormatContext *avf2; AVBSFContext *bsfs; - AVPacket pkt2; + AVPacket *const pkt2 = avf->internal->pkt; int ret_all = 0, ret; unsigned i, s; int s2; @@ -565,17 +565,17 @@ static int tee_write_packet(AVFormatContext *avf, AVPacket *pkt) if (s2 < 0) continue; - if ((ret = av_packet_ref(&pkt2, pkt)) < 0) { + if ((ret = av_packet_ref(pkt2, pkt)) < 0) { if (!ret_all) ret_all = ret; continue; } bsfs = tee->slaves[i].bsfs[s2]; - pkt2.stream_index = s2; + pkt2->stream_index = s2; - ret = av_bsf_send_packet(bsfs, &pkt2); + ret = av_bsf_send_packet(bsfs, pkt2); if (ret < 0) { - av_packet_unref(&pkt2); + av_packet_unref(pkt2); av_log(avf, AV_LOG_ERROR, "Error while sending packet to bitstream filter: %s\n", av_err2str(ret)); ret = tee_process_slave_failure(avf, i, ret); @@ -584,7 +584,7 @@ static int tee_write_packet(AVFormatContext *avf, AVPacket *pkt) } while(1) { - ret = av_bsf_receive_packet(bsfs, &pkt2); + ret = av_bsf_receive_packet(bsfs, pkt2); if (ret == AVERROR(EAGAIN)) { ret = 0; break; @@ -592,9 +592,9 @@ static int tee_write_packet(AVFormatContext *avf, AVPacket *pkt) break; } - av_packet_rescale_ts(&pkt2, bsfs->time_base_out, + av_packet_rescale_ts(pkt2, bsfs->time_base_out, avf2->streams[s2]->time_base); - ret = av_interleaved_write_frame(avf2, &pkt2); + ret = av_interleaved_write_frame(avf2, pkt2); if (ret < 0) break; };