From patchwork Mon Sep 12 16:05:27 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 37877 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:3b1c:b0:96:9ee8:5cfd with SMTP id c28csp171163pzh; Mon, 12 Sep 2022 09:05:43 -0700 (PDT) X-Google-Smtp-Source: AA6agR6ZrQhAkpoirtuRGN4HrxM6iP5dJOwGNI1A9oGkeUUkhxnGbFag8Du10aBckO0XAQOFCkMt X-Received: by 2002:a17:907:6d03:b0:741:9b9d:ad8b with SMTP id sa3-20020a1709076d0300b007419b9dad8bmr19090614ejc.197.1662998743500; Mon, 12 Sep 2022 09:05:43 -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 e10-20020a056402190a00b00451bf268c67si3185919edz.315.2022.09.12.09.05.43; Mon, 12 Sep 2022 09:05:43 -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=lldIsPMb; 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 0905268BB5B; Mon, 12 Sep 2022 19:05:40 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM5-obe.outbound.protection.outlook.com (mail-oln040092067067.outbound.protection.outlook.com [40.92.67.67]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 38A0C68BAA3 for ; Mon, 12 Sep 2022 19:05:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LUbgyB9V27djSBzn6tcM9dyX4Ru0fVU1TFse/burE7pmTuEtU+gpZWoeWbLqvmgOnSAWS+D7SsEZfbRIiQM4xQ5PSFYLuk/Y3e7T7aw9XJpK6/sVJu1Jqkyx3xzV35jncbTC9r+3xyEllNnehioZYkQoFczJ22BWPYgfj5DHHBq5MrVEPwibU6ahLFChJ07cBaDeDeroa07irlDYHV90vgPOLLyww8uIR1+2Me5BLqWg8rboHvIKaHEPuYMImdg/PR7GOmmG55Cv2xf8epEPSE7qcRflfvqgKDY6Czafj3Gp54NxdthwIJSb1s8KO56eOr2nwX2f8yZmBEYViXBP7g== 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=xvVczQzJvAU2bXzNhNCsuFKCHud75B5/HuSBjxnrYRE=; b=Kccz6UoNf/PKhl9kKcY/3brSO1I4bPPmIQfQrf3lR9RxkJqo9Utz1mEHM4A4C72Za6zgJJ90Iobjn61nwlhtyn4eoO/1qmDudmUZn8odYFdHKbAj8ksOgwDFOUakPzYlsjS2JpRQ8aAHl0c8L4pDB/0KSQOylAmRTKer82llY8ruViVecF2cZ5m9xiq9Z6ilFaETWM1DLLXyrvO8hDULr6DJWHJ18meFjWociet3j1iHiWzUu9FhA+9U1fjQY118ZnMKzZ7d/Dua4DllfbhNtms+5NA7OUwnUUz8cj1QpNY8eGHCaK+4oJzitDiyReuzPWynQTZvlf2z4h42yhzFow== 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=xvVczQzJvAU2bXzNhNCsuFKCHud75B5/HuSBjxnrYRE=; b=lldIsPMbZiHprQgIfPngs+1GVxI9aZ8RdzJj34P77jwgoCHHWeYNxk2jsrxyLU4ALLvK/8XBFoXHOwKs8dPIfN4YCKOruOkQpc7hyTYbdOOt7D7ih1Z0TueBXJLJnuDMkltBrk6TG4JQkzNFqWxhbpXSSmWFP93X8O/jMgt6YRK9pVecIWpwGG3MLfuN8qozPY6BMCc9aKVGUFyURpnuIRBRePlxvG7Uz982WX59Kx3Hub9fibFvvOFxH7BJctcyD0spq0ejR+DU34A8ZPWDbJK/Li0Qeww050TaIoLrzFIq7ytDvt19YNi7ayKT+M3I6tXoxsk+3rt0nMAq5PNqxg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0241.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5612.22; Mon, 12 Sep 2022 16:05:31 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::611e:1608:45cb:b58a%4]) with mapi id 15.20.5612.019; Mon, 12 Sep 2022 16:05:31 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 12 Sep 2022 18:05:27 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [bh+B0SCFAbsXut/N2vG909SRr5xSY8KD0MmcHm7bTbk=] X-ClientProxiedBy: ZR0P278CA0014.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:16::24) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20220912160529.253932-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0241:EE_ X-MS-Office365-Filtering-Correlation-Id: 48972b65-306c-42d4-fc98-08da94d89e23 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmqxq1ifAc9vdz6WdZcBqznYpY9yK5q5Wts56qZE7rSZbVFwDca5rZ5IG3JOJ16zi/RFsIvpyB/Olh5scpMtarfZMN8SdMfiAs/zGeVxFATK4KSrbAencISAaQmKccBe9n3dt9NkHwRagZWKhZcPbnyuNREDucP4RaJkVuhjfIo25qNo7wBf8E7OM7G2jF8ICjFvPypGGVt+lo4VvXXFjzuwVLzMtgtEUj9QMsf7eN7Cjg1rWSGtNnC/iuGhpkP9ZZR0AjqREidZ2uVPSdfi3RHOwpABSWMwPVISKfXtzVRoirGUZA26sEgVQZVU8gvJTc/E56S2DBRxPPkhzYtFXKmxjIFzeqIRX3E4yuTm3xu9nC8OdogF7bjonu801cuVOtL4hiUjaAbn+1PqQbsXg1O7HlG1Zal0Zp7sDIfXZlEimtQSiaD4wF6guV+0Lyc2Eq7jMiCFGF7LIiiAGk8zz8wWby7hyDpZ82Y8xdopNzTLX7Ir93EP4JFC+632DHHSOhKXPrK7U0S9lrz/t4ryi2FDEhUpJQdgPMYJTrqh0oY0FfVtOOd3+qF0jXNqosT3bZ91H1qRrxgNX/R2VhjHV2L53y/IM1yIRKtIgOzkCsE8ZJb7BDsAQ0lhTUYW6WRtV3yxDTrRj3TQI8XOd/GU9OmnSlJDyA4RQi9blARLYBo5hxWNFvE+cX1drEUc94qvF4SVa8ywrpHXuF0MynQrI6kISNe69gDz3DZNNZDBrvz3vJfujuC7qkALxriyQjLxRX0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: hCar92Nj/QGtJhUZt6JMOwyUpJvxF+5B1Qw4YnVBlwHetlrdx1XSHla88dQzk+zvnpGaC657TNPC0euRG9tSrwYtpcH7NdRLcWENSxP0nm4i58tuCsNZijn/ELP59syN+iGWh08Wk5mJr+8qL7MZYf9o4zjnz/XlcDYAupLo88aAFnaA/dcGUQEkdG/u4B0HBuCe9IQBMNxdWmsP+8a/ejNcoGH3Mm54RXhzjY2nA1b7GkrGmbGoOUslsFlbeOtIrYo8gJXPk3EJo2K2v94hsbz6+S+TTRUUhqz406qgG/41aF7id6Kz9TiDiVi2PDMVgSuA3iJjhsiNDFcNJvYnP+JNc4/5tWOPbk8L0skLiQW4C046qCqXKASqRWiNl49Ea5eobWEjw+7rRnpkxLpMZcrKl3zG3I+VbLj6a7N1n7Es8apc60ddsn7e6qdunXuE/5Z4oO/YSiV+Vztdxq7+BS1KSlAvsL33rXzgU7Y3H2otIgm75AP7oE9iFvGQGAtj2+3txw0S1o9kZlaltaLeXayB7K7ZxpTyuS6mNAewn6/wAzYaQmn27h3UIINPxe+swZ0sEBiK/H8SJTStBkkVVsJSUVTnhYENo2LJkYJ/lZ7FNuhXrSLL7lgZeWGRgIkmaV6ITbeQwBfconfVs1DA0g== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 0zm5uBbIXXgpPJhRM0da7m+F9OtVqYtTL4Th/ZcUQcpEyraWbEHWjxlPdCzWQSfYqlBBiqesZoNMt5bYPFKq0lf1ix19bL0stL6C0j6Fo8OjblphYZkP02fV8ua5ne/jdT603+WoYRu8sZn0ExYiB/yFTBp8LEF27kpk9VbF0QOWuxCo4A7Ll7p2DCn334SF7wlA+Zc4QhIOcku8Y+ritoJtJ7iiikyuS37umf+PDZR5B8VIOZbcPKE7UhXrtZWwpyG1V62EafGMnChcxaA4j8mKuE82dZyK6WKvgY4jem/2UFEoXmB9/i3H0OeXZznxXdc0bGck5vXjIUaCFYFN6LgDUAvKr2H9igCqSvjeWnRqOzpPVkYNZpiZMPRxdf0/CdsmuaaSLH1a4InkjYLaDvsWYhE+YirJc75jvzjIi10ue8+nV9VOW1hUwOUDI++qwDxCv6uHu1cMiMlFYcZCUC3Lh+7Dv69J3nHVgiZhHi1jquSP8UsO9JeYStQZ+eKPz3DH/xDhxky1A70ByGItCOvDPzJk7dRot++zXGbPfap+7pO1YiKcwrD6EMSJCoKl7jUwKJIJFJsCLrSpbyKWPKm/A1okCh1nstQjFQKYIM1ITOcBIU9QA9Y3YJQFTA6yg/P6W9LBHyWa7KFYkyiLtknCVSoum30jJ0EEW0J1VdhhKQ6q0IPd1FjyTmQq6x1vl8dXDSLiujQQtSoajxKkoY4nFO00h5UG/xkTzfiZ3LRDRjNCcJkZg5+/BLsp/zhEKUA6UGuJZKeng6qKjbZB8wWb/OgZ9dQOJ/xqr9QxOnKOc62Jaye01S20Fmsr9lwlIjdwykNmWXSXLqN1RrpuolhyhTAYb2bTLgpPZG+8N79dgDyuuqVTa2PtBN5ZVJRFg7OCqYLnT2NjP/tNZ3xj5YGxlvbdQHSNcKzxuCZdqaGQlEKBUj14OCzxm0XxMJbBRXiFuSqIKDsLscea4Enm+LUEAVbWrrJ49mRbcIOfPl+AlckU8Sil6FQm8fctTWRqPatw5uCI6we6Cz1Y4jVjPI035JnVJZIu5SGQAyvkT23EoTZzwU8YoYazMJCXvHuJgDGzcAoxGjDkUubIDYJFLI6KIUmm6wgT3Vm051TEk/Wi2jF3+4BNm/kQydVY7i8maUW9SE+T4gsN+vP4CWjIg0IRHWk0TeHSyCHZNRMolNjzGqZ/VRauIe5CRh+L79nLtLCkH5INJrnpBK6kFf5XwNzdDuadzFq8UmfuC5MCYBe8D6tczaTtR45GUVBh9MKTZgsRxX8PA5WlFFmhjNajDo5pHr6CcpCjvwblBBtm/hjgMMbMYguiUYPD7EBv/9sb X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 48972b65-306c-42d4-fc98-08da94d89e23 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2022 16:05:31.5070 (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: PR3P250MB0241 Subject: [FFmpeg-devel] [PATCH v2 1/3] avfilter/avfilter: Don't use AVFrame.channel_layout 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: GzOM9+kNxYtw Signed-off-by: Andreas Rheinhardt --- libavfilter/avfilter.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/libavfilter/avfilter.c b/libavfilter/avfilter.c index 965f5d0f63..bde41637dd 100644 --- a/libavfilter/avfilter.c +++ b/libavfilter/avfilter.c @@ -21,6 +21,7 @@ #include "libavutil/avassert.h" #include "libavutil/avstring.h" +#include "libavutil/bprint.h" #include "libavutil/buffer.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" @@ -45,6 +46,7 @@ static void tlog_ref(void *ctx, AVFrame *ref, int end) { +#ifdef TRACE ff_tlog(ctx, "ref[%p buf:%p data:%p linesize[%d, %d, %d, %d] pts:%"PRId64" pos:%"PRId64, ref, ref->buf, ref->data[0], @@ -61,13 +63,19 @@ static void tlog_ref(void *ctx, AVFrame *ref, int end) av_get_picture_type_char(ref->pict_type)); } if (ref->nb_samples) { - ff_tlog(ctx, " cl:%"PRId64"d n:%d r:%d", - ref->channel_layout, + AVBPrint bprint; + + av_bprint_init(&bprint, 1, AV_BPRINT_SIZE_UNLIMITED); + av_channel_layout_describe_bprint(&ref->ch_layout, &bprint); + ff_tlog(ctx, " cl:%s n:%d r:%d", + bprint.str, ref->nb_samples, ref->sample_rate); + av_bprint_finalize(&bprint, NULL); } ff_tlog(ctx, "]%s", end ? "\n" : ""); +#endif } void ff_command_queue_pop(AVFilterContext *filter)