From patchwork Thu Dec 2 20:24:33 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 31894 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp565352iog; Thu, 2 Dec 2021 12:24:59 -0800 (PST) X-Google-Smtp-Source: ABdhPJzh6hNorPF+LVQTR5kYpRS2cbiP5xSWG5xHtx28uV29FOVqBtq1QQ87ZCHfTdQFWDCMAYtH X-Received: by 2002:a17:907:7b98:: with SMTP id ne24mr19317972ejc.14.1638476699220; Thu, 02 Dec 2021 12:24:59 -0800 (PST) Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id r9si1442193edd.429.2021.12.02.12.24.58; Thu, 02 Dec 2021 12:24:59 -0800 (PST) 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=gVFR9EzX; 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 A7B3368996A; Thu, 2 Dec 2021 22:24:55 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-DB8-obe.outbound.protection.outlook.com (unknown [40.92.89.72]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DB473680C85 for ; Thu, 2 Dec 2021 22:24:49 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fpBH5/K0PMoaePdPP5Sc4ZoJ8GUKQfTiX5r/0m2Y2oyrnwOoQuN0ifjqCjEx7Zp4T4Nio8cFdie5DkwsbaOkGXzy1cA3UC1WuqfRZQM2isXT/MSo+vtrVFqi+n6Fs1V+0wNDGM2s8as1QG8S2LOyavXV3wmNypPBAc7fZanwi/Dv95mwTUrgr5cSMWKGZZ8CgCmbjsNFCg0zObGLcDB4ahqzT5FENEucBi5xVuvBqHoWNz/KOnSeQvF0cmLvhL5G7MiwTcs2AWpk0l8vCoU3IJZ6Slw41UKik8vA88Nh07MjfMVI7gVzBo5N25FdZNGiV4gR6xuDatbdKzLisNK8vg== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=jJTCXi4dVF8bkNJFMQN80y1MBYmq0gnbKMurvhD0d9Q=; b=aUzhgHIR9yBcYI61TARMh0ps0Umv633KHuG6/YQjwpv2S9HKVAwzfS7usn9Lhvp32aYixZOXM94h0iuN85PJJp8S04hLhTMLof8Ds+F+acW6PbeGc2vSgCdEwmI/lLhHtRiO24A0aGX8vkkKeVgezaig4qtyEuDmHyj3RnwIv3WrOuPsAj6qLTD6CuEwkyts+llaymQoBDXrQai6VLR0e51lEZG4TfcoX+Ee78jyfcwtJpyZWH5LteuwSH+X9Z4Q8U+TLcvrgwAXSffBH1X70shAZkm9IiPAaH3Ns25ehTuOMgXwEX60mJtjLRL37WTnVTcEd+O30GDIrHNG9VViAg== 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=jJTCXi4dVF8bkNJFMQN80y1MBYmq0gnbKMurvhD0d9Q=; b=gVFR9EzXznn8shmukFmHF9HrLW3y+nrd83ccdrek2RbHmvfZnV43gyd3aoxliLk/r0FmD4dojDGoLKVjm3Zynbyn4ovL+oAAJd1Z3Z4KWd9GnPgZDNf5oWmJJ13LDy5U8FdZu+YWp+q7ADavlziCIR+xnhPbIherreay3KTvL+GPhvoqf9EPyKYQ6EWAS4k5kknjR/xknR5NyVCb1Juy0DQ9faHRYxR0wmNtDSKgXM2gTb+IZgREsm3hLAYn1l56EHCKAcNJccc6SS4dWD3yzIlCsPs8jsRKKAIOCD7mYK1EDphFpdTEKea5oqdNyhNlEy6i6eDtm9F7cbsSUsgmug== Received: from AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) by AM6PR03MB4101.eurprd03.prod.outlook.com (2603:10a6:20b:21::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.23; Thu, 2 Dec 2021 20:24:47 +0000 Received: from AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca]) by AM7PR03MB6660.eurprd03.prod.outlook.com ([fe80::f0dc:92f5:6bc2:45ca%4]) with mapi id 15.20.4755.016; Thu, 2 Dec 2021 20:24:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Thu, 2 Dec 2021 21:24:33 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [QAqkUhyOnDqQCqy7Y6wZrNkqXWGkV7Gh] X-ClientProxiedBy: AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) To AM7PR03MB6660.eurprd03.prod.outlook.com (2603:10a6:20b:1c1::22) X-Microsoft-Original-Message-ID: <20211202202438.1114860-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from sblaptop.fritz.box (188.192.248.74) by AM7PR03CA0025.eurprd03.prod.outlook.com (2603:10a6:20b:130::35) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4734.22 via Frontend Transport; Thu, 2 Dec 2021 20:24:47 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 48546fb8-568f-4063-4098-08d9b5d1c906 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiTPBnr/PBTQGLNrfAOwIli/aNxG1BBgdMbzrb6luDsVmfFuul1uZsSxa2MZBewmajhjoF5W0TFQJXFHyAu6PeMfWwqCsJT5UthLMzdozHmpz/b+54F2niFnbvyIVmnS9k1A8KIauzyTzRR62HoJg8/hUu6F0NQxzfWeue9KFpLDOMCrRLWKly52KhDgzRf5RXFfAuQtonEraKizVn0A+i81hy5ZMmz1MwFm9QLSCt1XIu5BUYElk693nVG6sx+WMjwesGkh7574yj7NTI5YODFWJKtcAZ9d0PUWGKUxQivbJFiNyrml5fa/h2oa3uhJy0Q3wOJR/YphyLdAPxXjMakWlHCaD26/3OKp1h7wz3VqW2w2cTioIEHqIVI2BYt0UYkuylTpRE/sybqHyXPCnj9fgjPUW2gBb7BX5eFlauSoopkYyLvyzEJjJs0ZB6CXbWEaMYsXcrc0jZz+560UZHoWARizwaWLKjRvnIrewXUuBy2/EarC7ouUIEqjg8gL833KFhON+xgNdvkwU1Ze8mwSfLNoHFS1t1ooHgN/3OJfkIFuzhTlvkHPRt10i0Ul7CrRjYKhSSH2H6sSM51cUAx2ChcRhX82yFAHtiSB7B9wuifVOPh9gBJPdfIc9zUj886vSGcoqfclF1i30QOxB3tJWJbYoY4ThGPDcgWQPAe/GfjamcIabl0IC2hEGOCAcRrungeom0y6FM8Cov7CBMMEGjyzogl1wHfrqPqGeF8fQDreBdkhd7pIZf5CvQ52azc= X-MS-TrafficTypeDiagnostic: AM6PR03MB4101: X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: aB1w9bu9ma6la/FHJtud2At7mgHZF/g2PJe7bjL4UTUe6WR2qCPzTfLTzVPnUdY6G0/KEay+wa+BxsXE1XQz9TvP/ZQV+dVoDdVxT5i5LMl7YvK2eNNtIVXdnLC+Bn092Pcyv4jp8bgRdDazH4g7ououM3RRXt0uKSoErELbs74SiA0b5cAXD6pbKQ6jqGlvRRrp1mlo29jptFwo6544bMZWl8yaKT6HCq/NoRxdgaZQzze04OIe3CTPBaxrR3/SRtWjlsYhKwR4SWa4e5nDWsVi6CeoEObLMlcjpkU8JA9hH2b/ulmAURUEsDWa1Y8q2ybNyihPOEmhA2/nsf99EuRyM0Lg85IFFuW5JMrAtmyDMklwMl3pe4DFnoe4iz5VeCLnJFICEUr5lsqvBnw+D6pLhusup+By8z9lf01GxvlZAoY5FizBR7yOJQVnfMF9UWA2OsQVNHswUeXF/gM3XHq2B98O9aOi/m1aQ0ygeVPa2F9DXc7tG9g47FYWu9LfNTPrWzRYHcIGvjUmys0S4fY9gjDxUpgfgPSIFlw0/jxBlzIvAEpjpi4TBU7pN95Q2RTEBo0tba7u5DHGypsIyA== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rReOWQfC+MkSn44poyJCN5N61duDid6CbmIZHA/BviMZ6et86kd2jG6CeBTCEasEJP8Zv8T2EP2IeB5TzV+DtC19g4Nmy9CCN+4/y6rYdvLiu6InZvYwbX6qeD4Kvxbcnzvn5Ti0n712IdcRsGuqGcKlONq7HyBk67oPEk00aBoeuNeOTg4YpllTCv3bDvmoDjFlvFrTA1DHwoJsTOVzVkV9dfSsIzpIagLcfamYYo0PU3rYJTzYZcQh+BMONE8bMKWadnMMwfW1r7gdnG2geIC9msWy0ZuyslbIEG0uo/hbB2ICvRkPAGnZiv0pAG4c44mNLc4Y5LBCe61nYPNWp5oaQefBz1N4Qlrz5aHbkkvj/aaTyfWkOJgYUFinJjLgH0wQ9P1RAXheLu5+lUSAZPArhG/vqFnQl29uzIhAqhoPD+PSQSDec5WtEVIcS0mvyYSEBoBovabeJEGrhfYQybNWhzRRVaud0p6duSgwd5oRTsexIZ/cxGzf+W5wsC2BhawzO4ic2Qgben6L9w0JduJ6DvaoGo2EtO33m2XhkS1Fz3HgHskIV1YPKKGERa/r9l3nu1m+xiB0KvLhUlUO1gsRwFN3Nskgr0N5wWU7crwsMwjxdDlaJAiFSa0WCbUyE+IkI01qHqjVfvG1E7EIzyIjM9Ocs5/KmKaOee4qFbD7u7K0YeDiyl/LQqJFQjTMVZbc/6557JT0rbVOBuUksJ2RQ0zbz9ua5GzoeUnkWinOjp+JD575GlCabKKIFEnGBgzAGweQ8qTXJXXXX+rmVo6iQspEXqlJrhTgct+ud6M1Y+rb8rs1xetTCOwrizbNuaVnRG7yDl6OuDts97hIGtQUFXgrl1v79Zz5rkK6dEEBtsMb7JamsY09bouDjl5BuLbcxYfCqcwYyjBiWzFj8P2znrxC2Atv/odMHB4N5VJnF+Zz7qN0bJns09SBxdFYdH7HleYPmhjMtQQ7IqIwww== X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48546fb8-568f-4063-4098-08d9b5d1c906 X-MS-Exchange-CrossTenant-AuthSource: AM7PR03MB6660.eurprd03.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Dec 2021 20:24:47.8026 (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: AM6PR03MB4101 Subject: [FFmpeg-devel] [PATCH 3/8] avdevice/lavfi: Use dedicated pointer to access st->codecpar 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: 7jFEFD0Vz6xM Signed-off-by: Andreas Rheinhardt --- libavdevice/lavfi.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/libavdevice/lavfi.c b/libavdevice/lavfi.c index 2659c8508a..209ebed5fd 100644 --- a/libavdevice/lavfi.c +++ b/libavdevice/lavfi.c @@ -317,26 +317,27 @@ av_cold static int lavfi_read_header(AVFormatContext *avctx) AVFilterContext *sink = lavfi->sinks[lavfi->stream_sink_map[i]]; AVRational time_base = av_buffersink_get_time_base(sink); AVStream *st = avctx->streams[i]; - st->codecpar->codec_type = av_buffersink_get_type(sink); + AVCodecParameters *const par = st->codecpar; avpriv_set_pts_info(st, 64, time_base.num, time_base.den); + par->codec_type = av_buffersink_get_type(sink); if (av_buffersink_get_type(sink) == AVMEDIA_TYPE_VIDEO) { - st->codecpar->codec_id = AV_CODEC_ID_RAWVIDEO; - st->codecpar->format = av_buffersink_get_format(sink); - st->codecpar->width = av_buffersink_get_w(sink); - st->codecpar->height = av_buffersink_get_h(sink); + par->codec_id = AV_CODEC_ID_RAWVIDEO; + par->format = av_buffersink_get_format(sink); + par->width = av_buffersink_get_w(sink); + par->height = av_buffersink_get_h(sink); st ->sample_aspect_ratio = - st->codecpar->sample_aspect_ratio = av_buffersink_get_sample_aspect_ratio(sink); + par->sample_aspect_ratio = av_buffersink_get_sample_aspect_ratio(sink); avctx->probesize = FFMAX(avctx->probesize, av_buffersink_get_w(sink) * av_buffersink_get_h(sink) * av_get_padded_bits_per_pixel(av_pix_fmt_desc_get(av_buffersink_get_format(sink))) * 30); } else if (av_buffersink_get_type(sink) == AVMEDIA_TYPE_AUDIO) { - st->codecpar->codec_id = av_get_pcm_codec(av_buffersink_get_format(sink), -1); - st->codecpar->channels = av_buffersink_get_channels(sink); - st->codecpar->format = av_buffersink_get_format(sink); - st->codecpar->sample_rate = av_buffersink_get_sample_rate(sink); - st->codecpar->channel_layout = av_buffersink_get_channel_layout(sink); - if (st->codecpar->codec_id == AV_CODEC_ID_NONE) + par->channels = av_buffersink_get_channels(sink); + par->sample_rate = av_buffersink_get_sample_rate(sink); + par->channel_layout = av_buffersink_get_channel_layout(sink); + par->format = av_buffersink_get_format(sink); + par->codec_id = av_get_pcm_codec(av_buffersink_get_format(sink), -1); + if (par->codec_id == AV_CODEC_ID_NONE) av_log(avctx, AV_LOG_ERROR, "Could not find PCM codec for sample format %s.\n", av_get_sample_fmt_name(av_buffersink_get_format(sink)));