From patchwork Sun Aug 6 23:04:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43145 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp1270263pzh; Sun, 6 Aug 2023 16:03:27 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH+9qwDz8YXzR4yyATyYH3lWAH8n7AKHFwkEpyNYGK+gf4Hg2T4dpYv8yM4ugO9Tqg/lZxS X-Received: by 2002:a17:906:51cf:b0:99b:ed8d:de4 with SMTP id v15-20020a17090651cf00b0099bed8d0de4mr7501833ejk.20.1691363007198; Sun, 06 Aug 2023 16:03:27 -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 fx12-20020a170906b74c00b00988a4a7abc8si4850155ejb.75.2023.08.06.16.03.26; Sun, 06 Aug 2023 16:03:27 -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=ogP5mtDr; 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 3E00468C569; Mon, 7 Aug 2023 02:03:22 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2063.outbound.protection.outlook.com [40.92.90.63]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DBCD168C507 for ; Mon, 7 Aug 2023 02:03:15 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RRUtswjhGD/QLl3plczS5WCBKy15aMMdvgPH3P0+VzX6o/LuTKJ7LTJjtjqlGdTnDQ6PvLzXQIUL9fuTp9GjPy846KpU8G1JpxOOC4ED9PdE6Ts8jtg2PMuVeW0kr7eaX8DFBGgcWMdqrcrS2MDzcezqZIUB2Ycc1Xc8BC3FL03uv49BK2eRgSuELymSPqGuOgB5rTvM1Jky/iujNKGyNpeb/xBjAbdCySu6Y7l3x0u8guq64FAyT6vxFuVZhxtjbP7coxkzXvaE5rk6lvLq3QvO2nB9TsdoGD0m6FwVn8yVOaI3UfUhIL13tZyMj2iiAB+Yd6P1yXhujCEcDHD13g== 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=oqqCE5ZwY3qjRTNticbFyZKMTW1RGQy52vMLJyCZGGk=; b=F2SeHm3IQkNsK2TNeq8QFAssQvUOsp/oEgJXjLFN6zGu1s4bB6LzL+BQuFu0MzOGcXoRZ2/MUhUEjlsjyDIlVT+N0+P6HD5BqdqcXFVVPWgA/zrIYkvK5e1zE+SICXUQKDbPHPNKMgaO1QMazzs6owVTxpRPyRGhj8svwl+Yu9Fx6uUizAZOaYPG4c2JT1Vzaydj/eqlR39s873PzXp1K6Q7gmsvtfrA8bSU/RDE5v/7Mgp8wLFYoi8uHCGECMZ6wFMoS7//F/wtPFSQgYS3O6m1pTyEgDjpSJ4vibwC52poF9VszY8MDFQH8cREcRJw2rzPShUlL6KqOky5BsNJrQ== 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=oqqCE5ZwY3qjRTNticbFyZKMTW1RGQy52vMLJyCZGGk=; b=ogP5mtDrFUw3LEUwOa3tyczYMte4t08HbjDdlnFTNHeWwPIhUGcvNs8m5+HSs41svZ6oSfkVoR6Yr1sjPRwhg9GgJT5j9XTPeeYGZhGLbENYWDUbNJuN73WFdPJdbkLbqxXgsl1n8iHyanse5lGoFrPLiXIuZn/WkP2YaHAiMYQiUrjcC1rOm7HC+mHmJk8m6ozy+aMXYuRwQkxrzFwGFNYQUzcokJ/MXxfHPjfaS53Fyda0Xk6dw+8rR9Fx59+4T5z8nZQgNIN7pxmRhcyohYcZszw/t6NsbA4XbL6nQxMUHW9k8RcosVR2+MyRz8RXYDV5P64L3+bUl1uA87+3xw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0011.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:3da::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.47; Sun, 6 Aug 2023 23:03:13 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 23:03:13 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Aug 2023 01:04:16 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 X-TMN: [EiGgRDwk5IvjctuyU32RhvcnMhx0au0C7hqw8KkZ9vU=] X-ClientProxiedBy: ZR0P278CA0172.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:45::6) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806230420.3186110-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0011:EE_ X-MS-Office365-Filtering-Correlation-Id: bd21eebb-4751-4671-7713-08db96d14fca X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmre2cOvxteVHck60FqChmDU7zLmutdaFrca5ZTR7XeOBzFxjYYl6f0iTgLkvJgMFx/t3NS0NdqrVoiUY2PNBTFqDhVggiKna3Kn3uNao8fwplQ7HpgF50AKrOqlVnkFkjxTAi3TY5tqsuJX2TFsb/ALUZDEfJPaRgWhECwjuFxQPcMWgE0KlyyAyVJCbETjzg+77FEid8FYBUSnelCgMQA7Od2tTWevbt9zvjJdoPQ3Ly9b+Yg3cr0qC57TbOgGDpuJSpS2QNln2OGebiDcEaXE9DnNeK+cksHHfOC7z296rFKMQxYZjYZd8G/jctHcMePBPxilqwI3BlmFZq4Pam2UuUJQGic11JZMrTp+ygVsq6mWN4vlMy548IXTjLe/E5z6oOKJWtuCpH5vsx4tK/DuU7v9+u4UFoXKsRJj7ik71mnIrwP8v/S5mI+LNHaOrqLcH3BcgPnA/84s8EWyQdFS4mn3NLkNjbP6ocIKAQFjo/+SmARt8RmUfD+hFWRHo3su30ZJ9RLyWwBJKbSut1Exb4btLwqog60ILEpkvid2fYx1y21HkplRA0718bC9WAJdmEjPnjKCEuTUT6L6eOh4FvowFshWbiwR2dUszKAD6Rrvcq41EnCRJUwNQVH0P8eZr3HXqnSYbgPjvwsFK7nSC2uoq5z8PhWlOL9IUBpszfM9X5PrcuKi9reinwISHT90gSZm9YDiWZDJ/eDYTBMkyvv2pAX85vrNF+uXeaxpkCvFJqAiF/VTtGL1NBI4axU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 6v/0H+wUVRKFpyTphaz5f+CAFqzPOyMUTj1q4pkJcH0fxi3EUhajISIRdFmayFk3pBhXap/3kqhf6eYByDG+N2a0J+G7oTwI+UPTE0224yOrGEMaKi1MFmY0s2aIo0OJ5wSM/6c5e2e9XAkHiO0pOx24TOKTe1g6aqxZMqyx+C705P3x+gC92DH7lxRsjeKYssgYBesNLLZvSDwBRXojJn26HIN2uLZKnu/woBTFlxCVBYGrYNifbkhQ/FsmOZB9/ALF4Ghn3DwjpL+1bygy9lep3IFM3v90auGO+MwQa/ek65JrNQ0BBoWocH7prTYg+FtnJ7dKw6fNYth2ukXOeajWblTom+BMbx2XQsZsrzZJ5IOv3b6sbLaGHKqor3FwNVbRUvIi/T6csfYgOztY04YvBmBIEIfvaH0ZAnnn8NT3gBDmjP3Ql1Wks9hoQumENB+7CZASF4JVqc22ZPDu9ZqAc9hbUW58FjcmWNZWTfcisdaLLoWaxLX+SokzQy0A41VDMzNuc27iJ8cVu/b1wjeDsg3vGokk6MTv/JIqvXfAVTFU/eX8ZksRyxQ6xICMbEEb5RI/0vaDCnXfho/174Bn3eniUstqWixo4LoSIJVJXF/G7KjOM9snJOhH+MvH X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: UJEEFMzH/eIWWKRpqfjIKAq2RrEktsRh+E2haF6sSOGbjzDCHjjzykBuPkT6KybqoorDmK9vGhFbbS2XRykPrAix7Y4ccbWBrL/yTgHO4RO9l4Zh8eIomyRsVUEDBj7j0Igho1rFS3FDPOiyu1Wf4TZE2gsI8Oz8eVq/8jQahu7mPPljvVaLU0sqYjgKmO1ZjHNzdYY/OGmOlQjoFlkF1cffubYGGMHMf08PF7IQczpnB6gBED+aVJIxHwqMqNPbjJRFTg1KiBdF7ca6WbJmwlOop+AjpGJLEsT495gQi79SlDGJQ+gdbvVs9vc2msoALNKKB0u9hcghYOsXHojGhmsKOVwBNxvBapYsqRcAv05w8bVsw4J9CStNunNGdPKqrgb1xJYeYV5oaZPrIJz7P/jo6jv2fDbEHYqoOcujxcB7jeMWKEyJdMZTfF2AU8sQOiIZTpe7inCDZFShXV/4IOPcpXxgt90xdBabYtpiNk21YcH9w0Ig8vzzcR4yZscrudGOA/F3ZpJDaKWOSp3J4oDPp5XH6Wojw8Q2Py5GnfYjXZC7XNiCgq8hHOCcKXz3563XYMSBY51epNVTWfMcQREUqL1yJ550pWT2Na9FnaCTkp7YFDpaQZBWUf4o88P1ueul2Bb/w0ONDf9QL1lggNvRcOvpgbJKGllkp8ySzM72actDdRq0B0/hNKmigXfE0W3MtVsx6E5IUCdk4WJx/JyM6R1v2q9EyQ3a7oOFS/0vAVw6HbmXDXB4f7c4gQo7uKX5zW6RN1KoLv1881qPihDYpPfPdpcKG7CwB5lqdgFBVqZ075zbaXPP3pWlXh77bwrfcJEOYf+lWRz13fhi9Cr5tGfZRptrMxRLsSdmFxOn+qbbZNnfMrpXbhCKeMzpEfuygXp/heHpzzpmg1nJS9r7kKAsQGf6haIsSZFeLD+1tH+b7AvMMa6q3+1HilyUccZhDs8HBX4Zt8iy5P/L3B5MIfqcR7rKzcF9cMG5Tf3AoEwZekYUBof0OlVHu15FgAfMc3thk76T+ufC6qzJEGX28VDiZGWnOcxioigrKKJsZ9eaNH8pEK5N3hYqiaOxabTqSKy5at3GE0dRHL9OKMB5gu/3iycThfG1gtRl+ytcc8DJ1+W9SnZGVmSptnFRCiBvxr2NqemqHirBTYPXE8jFR8l/jegU98RvmGzO5jCnRDIIaJWsnf/2+RQy+oI3oivMwGQUvennr/ev30Nbpy4sXmAJTIT+9N2pn6n2yijbF3f6zgWwMvVYpWOrKAxw X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: bd21eebb-4751-4671-7713-08db96d14fca X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 23:03:13.6912 (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: AM8P250MB0011 Subject: [FFmpeg-devel] [PATCH 1/5] avformat/matroskaenc: Support rotations 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: oU2oWN9OUkiB Matroska supports orthogonal transformations (both pure rotations as well as reflections) via its 3D-projection elements, namely ProjectionPoseYaw (for a horizontal reflection) as well as ProjectionPoseRoll (for rotations). This commit adds support for this. Support for this in the demuxer has been added in 937bb6bbc1e8654633737e69e403e95a37113058 and the sample used in the matroska-dovi-write-config8 FATE-test includes a displaymatrix indicating a rotation which is now properly written and read, thereby providing coverage for the relevant code in the muxer as well as the demuxer. Signed-off-by: Andreas Rheinhardt --- Honestly, I am not really sure how to handle the floating-point inaccuracies here (in atan2). libavformat/matroskaenc.c | 100 +++++++++++++++++---- tests/ref/fate/matroska-dovi-write-config8 | 13 ++- 2 files changed, 94 insertions(+), 19 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 41e13b273d..c1f40b26e6 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1403,25 +1403,75 @@ static void mkv_write_video_color(EbmlWriter *writer, const AVStream *st, } #define MAX_VIDEO_PROJECTION_ELEMS 6 -static void mkv_write_video_projection(AVFormatContext *s, EbmlWriter *writer, - const AVStream *st, uint8_t private[]) +static void mkv_handle_rotation(void *logctx, const AVStream *st, + double *yaw, double *roll) +{ + const int32_t *matrix = + (const int32_t*)av_stream_get_side_data(st, AV_PKT_DATA_DISPLAYMATRIX, NULL); + + if (!matrix) + return; + + /* Check whether this is an affine transformation */ + if (matrix[2] || matrix[5]) + goto ignore; + + /* This together with the checks below test whether + * the upper-left 2x2 matrix is nonsingular. */ + if (!matrix[0] && !matrix[1]) + goto ignore; + + /* We ignore the translation part of the matrix (matrix[6] and matrix[7]) + * as well as any scaling, i.e. we only look at the upper left 2x2 matrix. + * We only accept matrices that are an exact multiple of an orthogonal one. + * Apart from the multiple, every such matrix can be obtained by + * potentially flipping in the x-direction (corresponding to yaw = 180) + * followed by a rotation of (say) an angle phi in the counterclockwise + * direction. The upper-left 2x2 matrix then looks like this: + * | (+/-)cos(phi) (-/+)sin(phi) | + * scale * | | + * | sin(phi) cos(phi) | + * The first set of signs in the first row apply in case of no flipping, + * the second set applies in case of flipping. */ + + /* The casts to int64_t are needed because -INT32_MIN doesn't fit + * in an int32_t. */ + if (matrix[0] == matrix[4] && -(int64_t)matrix[1] == matrix[3]) { + /* No flipping case */ + *yaw = 0; + } else if (-(int64_t)matrix[0] == matrix[4] && matrix[1] == matrix[3]) { + /* Horizontal flip */ + *yaw = 180; + } else { +ignore: + av_log(logctx, AV_LOG_INFO, "Ignoring display matrix indicating " + "non-orthogonal transformation.\n"); + return; + } + *roll = 180 / M_PI * atan2(matrix[3], matrix[4]); + + /* We do not write a ProjectionType element indicating "rectangular", + * because this is the default value. */ +} + +static int mkv_handle_spherical(void *logctx, EbmlWriter *writer, + const AVStream *st, uint8_t private[], + double *yaw, double *pitch, double *roll) { const AVSphericalMapping *spherical = (const AVSphericalMapping *)av_stream_get_side_data(st, AV_PKT_DATA_SPHERICAL, NULL); if (!spherical) - return; + return 0; if (spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR && spherical->projection != AV_SPHERICAL_EQUIRECTANGULAR_TILE && spherical->projection != AV_SPHERICAL_CUBEMAP) { - av_log(s, AV_LOG_WARNING, "Unknown projection type\n"); - return; + av_log(logctx, AV_LOG_WARNING, "Unknown projection type\n"); + return 0; } - ebml_writer_open_master(writer, MATROSKA_ID_VIDEOPROJECTION); - switch (spherical->projection) { case AV_SPHERICAL_EQUIRECTANGULAR: case AV_SPHERICAL_EQUIRECTANGULAR_TILE: @@ -1455,17 +1505,33 @@ static void mkv_write_video_projection(AVFormatContext *s, EbmlWriter *writer, av_assert0(0); } - if (spherical->yaw) - ebml_writer_add_float(writer, MATROSKA_ID_VIDEOPROJECTIONPOSEYAW, - (double) spherical->yaw / (1 << 16)); - if (spherical->pitch) - ebml_writer_add_float(writer, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH, - (double) spherical->pitch / (1 << 16)); - if (spherical->roll) - ebml_writer_add_float(writer, MATROSKA_ID_VIDEOPROJECTIONPOSEROLL, - (double) spherical->roll / (1 << 16)); + *yaw = (double) spherical->yaw / (1 << 16); + *pitch = (double) spherical->pitch / (1 << 16); + *roll = (double) spherical->roll / (1 << 16); - ebml_writer_close_master(writer); + return 1; /* Projection included */ +} + +static void mkv_write_video_projection(void *logctx, EbmlWriter *wr, + const AVStream *st, uint8_t private[]) +{ + double yaw = 0, pitch = 0, roll = 0; + int ret; + + ebml_writer_open_master(wr, MATROSKA_ID_VIDEOPROJECTION); + + ret = mkv_handle_spherical(logctx, wr, st, private, &yaw, &pitch, &roll); + if (!ret) + mkv_handle_rotation(logctx, st, &yaw, &roll); + + if (yaw) + ebml_writer_add_float(wr, MATROSKA_ID_VIDEOPROJECTIONPOSEYAW, yaw); + if (pitch) + ebml_writer_add_float(wr, MATROSKA_ID_VIDEOPROJECTIONPOSEPITCH, pitch); + if (roll) + ebml_writer_add_float(wr, MATROSKA_ID_VIDEOPROJECTIONPOSEROLL, roll); + + ebml_writer_close_or_discard_master(wr); } #define MAX_FIELD_ORDER_ELEMS 2 diff --git a/tests/ref/fate/matroska-dovi-write-config8 b/tests/ref/fate/matroska-dovi-write-config8 index bb22563eee..58eb454865 100644 --- a/tests/ref/fate/matroska-dovi-write-config8 +++ b/tests/ref/fate/matroska-dovi-write-config8 @@ -1,5 +1,5 @@ -09ff3c0a038eec0cdf4773929b24f41a *tests/data/fate/matroska-dovi-write-config8.matroska -3600606 tests/data/fate/matroska-dovi-write-config8.matroska +80d2b23a6f27ab28b02a907b37b9649c *tests/data/fate/matroska-dovi-write-config8.matroska +3600620 tests/data/fate/matroska-dovi-write-config8.matroska #extradata 0: 551, 0xa18acf66 #extradata 1: 2, 0x00340022 #tb 0: 1/1000 @@ -46,6 +46,15 @@ 1, 395, 395, 23, 439, 0x7d85e4c9 [STREAM] [SIDE_DATA] +side_data_type=Display Matrix +displaymatrix= +00000000: 0 65536 0 +00000001: -65536 0 0 +00000002: 0 0 1073741824 + +rotation=-90 +[/SIDE_DATA] +[SIDE_DATA] side_data_type=DOVI configuration record dv_version_major=1 dv_version_minor=0 From patchwork Sun Aug 6 23:06:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43146 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp1271220pzh; Sun, 6 Aug 2023 16:05:30 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGUFpwXsFaEmL6OsVpDsmw2e3aiSxGjioo+3Yr1xFWY9+7LzYxpKS39YXNZbviao5Gu0/LZ X-Received: by 2002:a17:907:78d9:b0:974:183a:54b6 with SMTP id kv25-20020a17090778d900b00974183a54b6mr6792286ejc.33.1691363130375; Sun, 06 Aug 2023 16:05:30 -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 y13-20020a170906448d00b0099bd7b268easi5205602ejo.121.2023.08.06.16.05.29; Sun, 06 Aug 2023 16:05:30 -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=thP4LW0R; 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 7940968C6E9; Mon, 7 Aug 2023 02:05:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2056.outbound.protection.outlook.com [40.92.49.56]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 30AA268C593 for ; Mon, 7 Aug 2023 02:05:21 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=oHsyuoWbPrHOtydRh2c/a3EtOKqW2W3ATtLBmBNX8PbTmc9CeqUDODlW89nmITtZBVzWkMoHhaL1m4eBsXJ+CA7AxHHxk5eUSLkeh5UEwHsr1R1aX4xWuRx8RYXW9FELmBCANFYJYJ0NLiMx62XfvmyEjzti/ip3E2D6Smb1vXwsH2Q1uDfQ9ZXx9bOmo2ejz5XcH5dCJCQ/szzBGo0iXRLXefV1DMCfHpvujbTRlE/+Mbm8VM2PzaWPMBoSIahqVZqbpRP2ai+f7NRDISUJGfTqhBy4WClDg915WkKXqlL7Z1PSMZWgqFnCW/bQdG9nTaW5xVTsjZifghQW9r5AGQ== 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=JxbxZEVOlHqymGxoQ+FvqBR22xVT8LPFJvMftugJgMg=; b=oT5ueYo/RiI0Gh2Ktl9P21/Tdtb9NODDTPgzqMxqCXnn7ACo/n+GnFvOvSH67o9Qs3pZSfgAb8IrZloZR8UiE17eeAK2K6cmNUO9MLn7Sf/gqbJ8apk6wPYIforkx1jsp4n53Uu/5Zd8sL4pjREWnCB8YkZEb0hwekQzWd4OhbUgu2uIA9PhwU35waZGCoRt67Nd1YvU7NMWc3ZOevbepqlUcwYOrUcTUVJFzfbXnoWG79ANnmhHxKjKltmIikIn8MJX8j+EpjM1lCBvNQkJwzI7pZBpT+/c1PLHxgiYw1u94PAdA+iKVY8YhTFtQXlu9Ej3NqyiIb4ADDECFgJ/5w== 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=JxbxZEVOlHqymGxoQ+FvqBR22xVT8LPFJvMftugJgMg=; b=thP4LW0ReZ4As6Zs87fBP+LrcAunQx8Y/5VdYuKAPXybKYpx32tKSMrqaVPslUqgB67i7lDcsYpIzzigUlNEIAxyhcGs6pFo+1LaRMOtzgvzQtSK0cOP4G7YI+kffBH1G8yOVY9CSTfZdV6MUHHsGFcTowein0LwUth3BuQG1CHfilbK9EBsds+bh68BY+Xnnllrqa8O6SrntlNlx9SfvWjEFR0yM8EVML3dqq6ltIURO/VwgaxuV5V8eMXoxRuHspvDx1rlRiQJ3ZckQX2hfXBhSRAgcOCstYJO4Oy1YFGA8/pH9YXdRqd1ocdZRQ/KHJPGmfZ1P6MPMMaLVrAzRA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0108.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Sun, 6 Aug 2023 23:05:19 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 23:05:19 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Aug 2023 01:06:24 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [oVWXFgWyW+W9Grc5LnJjGdWBf1KTV9QDYtPlr4lF3Do=] X-ClientProxiedBy: ZR0P278CA0190.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806230627.3186387-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0108:EE_ X-MS-Office365-Filtering-Correlation-Id: a5c92d7f-fee8-430a-ab97-08db96d19b04 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmre2cOvxteVHck60FqChmDUCUHmiWVb8uQP2X8B7q+SIhJwmNv/5/UE+Z/74HmHFdNyj7mUuwyZ/iwCY1AtJotCcbA+bC4V4NjXB7FzgVpc8r72f4QnoVHSrEAN1b+AV/7gSq1SGMxsAB/YaF6meGf7IHK3iWfiiIIENRyVXaaPCfhAxOkDlc9SGcUMeifK+FA92wAEOD7sEx8TsAVVGW/SobhZz+8MwpjhYw49hACeywvkcw5Dbjwe7XgdpZi9ikCbd50R9jvrQ+oZZMat4kKiaZBycD3Cxos3Xq5Pe1qwtBeRXxg+ppNzwdiwjlz1l+C7LXWezKt1X8u6ju7HUbuqXjh48jefcrt9AcX2xvjDvYkVJ02vgGcrGQr1YNLU9ECER1FqdcXfbhpjQ/1SHdlBAWn3wRbq439XwoituwwblVcrguJpT8BNsc2VRnpjKF+doWEc6nRGjbzhSAnKKxqLdutPJ0A5/6nVBJCj0Y/SZeUgRDS72uISs32cs9omCKVZaJwofLUbatwHtE8nKmfHhRh7VGJvYbfw1/SKXNePuKJ0XjvvPSoHMJ6d2l/ENtfg+yKzp/dKaBKZF5hFjQhqjrgGbqYZlH7mNukE1jZMwWNR0taCshpaokGLmhNNLkowObViQXlT3uuB24S5aX90gZBGKIoLDPqVTx356iYKE8YoJt50reVS5OjzWAJVo2TC6n1+Rq6IoQts1Z2gmrr9clDi9E/YWwTnnNJHle//G2wcfa9fz2McKPF72RlWuko= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: MoX4NKAbOZtQe703wZQiO7yUiv1bQPlPQOduzwC5VHn0Z4xS72hUDuOR3+vIZ1TD9aPYePS/MyRxPG2nE2u8DG5ULKj8qNMl4oTYtj4jXFGTFdlavn0iVOz/t58XhxEiV4p2bICPjXRfiOt290Qxrgctzh6XV4AmaTVipSOx7YTglrFNfYWnmr4t2n+jXPdHnXS3ZI11iqgzKRasa1cMmjdE6Pug/gCJ9wO6kNowp1zHXJkCZnWvNO48byFpEn2dRd0C+aEhPgw+YS/oYrPJXS8M0oA9bnuthdTLIVLciGtzhioIkbvgYi/B+8UOlkqJe5+2L//mAmvo7haHQcFvzDgXSlkRovxUOu0EaGpMr9w//W72JodmP1CR9lcfXo/PvDl5udJWwVuGWU5Dx4sRbRK/d3QR3zA7s9PqD74tBrToPaZXyQ0Bwq9JzZAfljv/oiSm1Yt//6YcA9C0vnMrbXdXyHELendefT0kmPNMee3fPATONUvNyU1S2vFuTLZ365KX4Bbxm/79/MQukEjGnJiNMfDOx6smtxzZ7kV4P1mw+wlLuAYzifsoo7Lj9bryrn1cOn6H3vyOu7VOM1/j//8kwGV/X7S4cXn8YiRfE3bbGnIoQBmJVz8RfOhfynAz X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: QftN9pPqCLewFKaDdm7mLVsGHaYtLkOP5g7/uQkZ80UlICbTZG3vgVbPwgGSzps19uErolQcALxqAznbF6AmMW52cdnFSFtrhMeS56XYMyx40M9uQdvFLMl/nEGDXNrtT3m9zHbW3eR/ssqBDKRC8Kv94RKIuhkexaeJa5f9SzjL4PEH8HoYaO1G9jnmYtPT1RVEJQmmV2ubdNV9AXXIaDi3DBNCdhbvUE2f5mCXOL1QwqZJ20EQLLZ10KR69DwG0aTfvHKzdCuEy8I1mCxfRkIpkQHuU4SlvssoTCLjzvAg9mALsmkb9g0NaOe9Sx4dUSY0OyYZNb+u/efJdP4hsL4k/spWYSkImaNrK0yyNn+0BQs94f1rBqKIENaIdVwO7dCs6bw5Y6fRYlVIfT54WXe2U/h5KOmtG9uTdlGrUidBq978ZTekKEsN81LHfwMRts09+M9LAfdDmBBDTSWlefgxl28CZPUQeYq9KDxuowoA61pMpQc8pl72oX7du4jkP3/pPguvi9PoBY9ELTpJpfm7pAuPBd8Le92an5nh77518JMlBVmNDYiTLOpNHl+nIeI0biyih/i+U4tPypBoSaQbVh3aVOXDfqn1LZZGOjVs1NeVi3NPYp5j++9qFWOwQ/sf3W6knUbToGgkgR31Q5mxhX7CSaAP/7ssEj0J1ZsXBVphTOSN/fhkcNj56PBgq5/EYeeeyUUELcn8hcAvIsZFJ7O6UDlZ1fMeF5AHIYfqUJpysCbhuJFCGoCaJMos8OUeyMo7WIecEt/ZiwsSO1P9ej4Ib/NBE2SQaeCbeQ9QL9bS1hwoPDoRmxoD7tvvUptpltjdXOb5b4FrTB4j0mX2D4i6s/wC4z+UGXVyZXImDSYJ0a7Z62L9nHuEmi0GCvD4cDJh0vs/xzo2d5BTMamOTZtwDVxbwmO/pAxifSNuXyn+WuCA88yE0cnmvXWJ9hHSkhAxykZ55unq3tQ4B3KBkZL3IkRqfydXAMTZHL7EFEIxB7TB5W5D54e5rSIMSqL5rp288tPNeQJ/QOjUsTpB367qoD/N9OSSWSlbOFfE5DQjqMOguYqHUirEYNOC1HTtulLFeF+r0Hks7VC6UY/jEq8yn+ePPrVwMt2ucaYzltZUAZ264vqtn5BUyj3BMQjRkkgzYwm+C/qduE+RLq7D81DyTUCpvmJKZkK48jekoZirjLzq6BL7dJhX8PN3N1Pxt6CXoZV8Txub5+CYpbDHSFNHquqAgCBDP/RBBJ/i9zmdrHks4wH5V+ZVoz36 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: a5c92d7f-fee8-430a-ab97-08db96d19b04 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 23:05:19.8776 (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: AM8P250MB0108 Subject: [FFmpeg-devel] [PATCH 2/5] avformat/matroskaenc: Don't reserve unnecessarily many EBML elements 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: 7Pw81OlKHJwd bda44f0f39e8ee646e54f15989d7845f4bf58d26 added code that potentially added another BlockMore master and BlockAdditional data as well as BlockAddID number, yet it bumped the number of EBML elements by four instead of only three. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index c1f40b26e6..7eb734f1a9 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2709,8 +2709,8 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, size_t side_data_size; uint64_t additional_id; unsigned track_number = track->track_num; + EBML_WRITER(12); int ret; - EBML_WRITER(13); mkv->cur_block.track = track; mkv->cur_block.pkt = pkt; From patchwork Sun Aug 6 23:06:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43147 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp1271566pzh; Sun, 6 Aug 2023 16:06:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHotAqmXAJKRH2IQEHCVQdJ1/wqGuTu2EfQIhSzsw6Ry+UvwT/n+38UmX5phrH+ECzD7zO4 X-Received: by 2002:a17:906:cc0f:b0:99b:d440:bf0b with SMTP id ml15-20020a170906cc0f00b0099bd440bf0bmr5508398ejb.67.1691363183118; Sun, 06 Aug 2023 16:06:23 -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 h26-20020a170906591a00b0099cd008c1a7si1486727ejq.327.2023.08.06.16.06.22; Sun, 06 Aug 2023 16:06:23 -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=HaEV9eBX; 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 A448068C722; Mon, 7 Aug 2023 02:06:20 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2050.outbound.protection.outlook.com [40.92.49.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id D476768C684 for ; Mon, 7 Aug 2023 02:06:13 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=jcXpqlNsqTQpmqUtKIuIlmgwmZW3nRHQbJyAERyyvpzfsqk+d5hglWuILCM8c6AZkOv2ipmtZUybY1l8540sXDiuKTR/82gVNrYFlWLz3xOv0eIrBoV1ruOROkkwPJQjAEEK8G14s7YV4jLoU/NLN2EUtg1a54fJ7wIIOqN9Cv57ac7gjyou5RbuVVvJnFbyrACob0B9Rovqg9GyIM9hoktyipInSNv6b++Snw/9DX9odwk2vkLABl20v9FsUXWnVZ6fVeVnlprmBaE3K9v9rdtxKBWvBjh168q4i7ERQV9C816CwJSkz3yzAa+n2Po5YZPljO+aHrXeWjXDEe/pcQ== 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=jMr5iJukpapLD/TF8so6CMvZbqBS2xU+5FxL9vE9zf0=; b=G3fv6X2oKxdF8Bgf8bUHsx5HYGqiAOuOp5rtPaJsf9YA1Quh6QcYckpl72Eu0CwGeJxDMKK+98Ia1IE8px7b0IUZAga61oB6Y3TxpqTpZyCmo35doA1fw+S4VavM+0Vqco0OsNpmf6mXRat/Dwe2+fMMCSmW/hNZPMgNG1E0jjpC8ldl74SRV/JncZ6KBkgZM2jSdmdrgw5WiCEhkE4SjvMZH3TT/4mHfTMryvPIjb8WTkiTupDnV+87REsKQMLIrH2iQ42o9/udSK8xssx2hEMB0ZCzySc6JRZSGQoe3c4HSSxptCgM6vhIQeLPsY3ev711jz4Pj15TMm774633wA== 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=jMr5iJukpapLD/TF8so6CMvZbqBS2xU+5FxL9vE9zf0=; b=HaEV9eBXiij8c0Q8D7HXm+QeV7yVWDhDXK/bLKnMrFV598E40vpYeMIFzVAqEMiSl1dNpvuJsVghqKsyApv8KkVXdW/ZUGmc6rmedKNNbOcTqvhbSr2kNSRXWJujGex0y614uQ3eEcm55OPY0P2INfw9GqFUMdBc4+DID27yvbb7lfZom3Z+rWH7pQN/zYUjYa1l1UE7cH/wcx4nW0cWhUUSwFx/QqxKMU2J+RKn9w5FLysX9ex/5TjcIuK1U5rgwGQkrW3gO+OEAbnXfNCkbyDbOWDwTL1aVwAxEuiL62drS4+4td7Q74JbmT3Dc0Mp6xAH7qJgOG5fPkZE/+D8HQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0108.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Sun, 6 Aug 2023 23:06:12 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 23:06:12 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Aug 2023 01:06:25 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [aqzRd8EmCB8ktJLjIU0DcoeqcmA95+KcL20NDFx2+gs=] X-ClientProxiedBy: ZR0P278CA0190.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806230627.3186387-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0108:EE_ X-MS-Office365-Filtering-Correlation-Id: f1c7a533-bb09-4383-766a-08db96d1baa1 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKztMW0vhCn3per/f7ZBpBPC+SpqrBLZdrVIS2YwA+cI/TyTM5QMaLSYxvZG22OU1NdV+CwGppIz1i9sUuv3wrETlEr5tIDlGpjeKlfd9VP6+BHX+KWaJ1PGRLw+fDH88v79CvkaMpPVTzJrt81GVUzvF6H3/bII1epnt9HpjEtZXx05hKJAmYyMeQTutdaJOc2g7zfTIi6o+3e7hHnO1gtD9xQ9ikO2j9arP9JcrS/yocJgawd6Reg2e4PIt1FhiWK1KR9rXn2eN6SQt7tUi+VbqBjhWa/MBiTEABTsJRVRxSrTUKBi/ueObLiFLG/E1xde6C2Ge3FjJJX9YsoZwThsUe4HyOIKZukgVIKO5PNIP1yjI6ZHa6QU7QTlUQkfZqf81jeZPBX28KbRwLYTT5frne5y1XQYUqkIsD0Qe8OZJaFAdtVU96Du2XlmNDL6mbGuhK2Cmbh0W3dVIrWOgoMjHo31yZHL9qAkElEzz2rp5wSto7WQ/eZXUcTGcXr71Jb3S/cs9r2Deiiy2KjSXf0187ytANNfhRrBE/cj72OCcBC4uQxmmCH2jS7LOHMH6DfsNspIZRKT8DzUH+LnGlwPUCGa1zDLyYdThdccjJiYDmpCCmNg3GE+DKtJFXSb4VotzVyoqP/ZZJWSvMUNmJ5lplYcnccAZEOkWYCLpzLwn/SsLLM+mcXDWWgmHwnEgAwboN8oTu5QO2YFnjTW4VPohBElRUy4r6M= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: weueEq3DQRqLuciscKyrI3X++UzsNxq/qtM4ABubl05BSTUoDk9BGdYol3xl5PZAJg+gw6teuZKfrp30Cd7R/sa0E/0NfIohXhQuKg1cQ4WCUOEIKJhQiu4vACnSb6zn0U1j7VFfpD19NL4wFcEbIJtnr8G1GYFJ9DZV8rqhJMW2VtII7HSTAM61l01wAPamzsOjdRafHavFjm8v++/eSRqMcVlfDO0RY3/vYoXXXqZJyyrRE6eKrQZI2zKyONxOC9u2LBzPynJ94Q8oSjqOazlYR7rXAfxYtNU2NI6PTXB5mNSEjVuOYUrCjRX/4HJxJcAZSkYouhkV7vQSCVeEhBB+QH3wnrGL4VzikRdwLPJlQOM2XOd7c2u2XOEF9iXsn2X5NzQmqft+Mq+mJyfCn0aaQNXUmakd/Sv6erlNwogzVpjyOum3EY2MBJcOBWXkvA/acdEXvOeiGMO9JgFn2jYszSXnNWK7zp3Ce/eaaF40jTuFkOHc4k6Z9/uqRdzmDjfeWRI+/thX10qldGbDT5QALIJV2TKx/iMsEsV+cFLvdlCgNp7WSpnFSoJpz2jvFkAAt1jkEV0I2GQUp1LaNvt0IZyiGBtlOfbvmeqCqO9w2jMWtT1vyppqRBNNESx1 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: VWkh0EwwLxIENnLhG00drrz5UQhK83VmCrQ7RTT9ZueoWPOIfMxrNK6SvvoxzaByQgUa5lMfadsqQXCYUrbsfDb9HxKlp07+6RJLGs2Oe1FKBRlRwH693uc2x/TckP0PhdFzbFHHiHedYsrieFd83fgN//ecK14Up81x6VaJ4qVmm9hI7YcEcHyJqmsxx3tVvMv4oqH3idIy4Sv0XUvu/ASDhcEX5YaLwRJber+MuGea9rZx/oDp950VAErzHs74Qss6zrEDD/UA01323sRiPJZ7NF2LNFmsJml9hPYueInx7lcXXyRFgrkZGBMQ4RNQdP3DAGrBfjhzbLuVcIBtbzkp3NXL6uvpyAPxkapzM1/5QFvOvFsYXSAxNudyeZFnTJY5OxSSimAmyLl2vOEq3jZlWL98TwlknDzOayyKrW8tDvwVab+swgHE8vcTHcQqIv13CFlKjJm//uPipnNBVqIW5UM/AF1wnJkocXVss7iLv0YeIBm2x/l7Wlz1RTzmcQab+K71ThrvK8tcHDFdnrsAtWbpYazCyEjw6EdJZ/2rfrGosB4E3NOecbjrKk5uHbU8BIMLAmAypD20Fa6IdZrjouOns+1LQqX5phdswuFi//gwOw4+wuIRG2JbCEGiV9/CNY2T1Ktn9v8/kAFEGSiu02GXtDrmFvwEJHA0UMd0tWQl+IvFosHWYJfgHdVHwYJxA0I37TRw1P0NIgmEHrg7LCYJPD12C0VODCmgDG7tJEBp7KiE2t/MiPR/gKBKV8meQG66eGipQO6bNALG0XgVINa0ky87vN5lqGqwVimS7jAWRkSAtQcnEXM5xFH25RvZC5bPXhaNvQicmZYTXEhdHt9WxHM3RPhSfz5LISUNrGN5ss6zjFtpcUS/kCO2W9chvzz6tCkL1UfbBV1rCmOjIYF7+vdaGSPQr/yCE4EPJos02wNY8/XLzeh0psuGMRsN7oCcC7TItEzIWYyo5mgA8s7ytOXCLt3/LH0PH1j7Ikd4XwDpSYm3Nzr0qaMMFeQcPQ5tUJyBt7/lGTd/hLSAnqxCmWIQdhshUu7LxZ/ejOqWWOnECcQlKDs+g92hX0veM5JwR1T05Bm5ZZc5C9RlCKyVCH968YnjSTdgjHkO/lrzcw+YY2pYcyTi2vQpQZBxTgMN+Bzrh4mp63L1FKADk3coGPhi1jI2Et449keRfzqkeTZEp4scF9sgyDmuaKHQhdFCdIeB5Vs+pb4vaPubi2ycr5568CcEp+yRjdeo5JPrNeR978xySigTs8M5 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f1c7a533-bb09-4383-766a-08db96d1baa1 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 23:06:12.8647 (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: AM8P250MB0108 Subject: [FFmpeg-devel] [PATCH 3/5] fate/matroska: Add ALAC remux test 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: rt/SFhtwDJM5 Provides coverage for the code transforming the ALAC extradata. Signed-off-by: Andreas Rheinhardt --- tests/fate/matroska.mak | 4 + tests/ref/fate/matroska-alac-remux | 136 +++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+) create mode 100644 tests/ref/fate/matroska-alac-remux diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 7c4eed358f..ffbfa7de64 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -31,6 +31,10 @@ fate-matroska-zlib-decompression: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/subtit FATE_MATROSKA-$(CONFIG_MATROSKA_DEMUXER) += fate-matroska-lzo-decompression fate-matroska-lzo-decompression: CMD = framecrc -i $(TARGET_SAMPLES)/mkv/lzo.mka -c copy +# This tests that the ALAC extradata is correctly transformed upon remuxing. +FATE_MATROSKA-$(call REMUX, MATROSKA) += fate-matroska-alac-remux +fate-matroska-alac-remux: CMD = transcode mov $(TARGET_SAMPLES)/lossless-audio/inside.m4a matroska "-map 0:a -c copy" "-c copy" + # This tests that the matroska demuxer correctly propagates # the channel layout contained in vorbis comments in the CodecPrivate # of flac tracks. It also tests header removal compression. diff --git a/tests/ref/fate/matroska-alac-remux b/tests/ref/fate/matroska-alac-remux new file mode 100644 index 0000000000..7f2698eee8 --- /dev/null +++ b/tests/ref/fate/matroska-alac-remux @@ -0,0 +1,136 @@ +d9b986b34e36e865912fd42d2c5b0cab *tests/data/fate/matroska-alac-remux.matroska +1293821 tests/data/fate/matroska-alac-remux.matroska +#extradata 0: 36, 0x562b05d8 +#tb 0: 1/1000 +#media_type 0: audio +#codec_id 0: alac +#sample_rate 0: 44100 +#channel_layout_name 0: stereo +0, 0, 0, 0, 32, 0xa0af0dfe +0, 93, 93, 0, 6701, 0xa9ddc14e +0, 186, 186, 0, 6639, 0x3ccda8d6 +0, 279, 279, 0, 5722, 0x99a8cdbb +0, 372, 372, 0, 5442, 0xe94d8bd8 +0, 464, 464, 0, 5211, 0x19d23acb +0, 557, 557, 0, 4843, 0x5c013b9c +0, 650, 650, 0, 8351, 0x0df50d26 +0, 743, 743, 0, 5981, 0x1211487e +0, 836, 836, 0, 5747, 0xec5219c6 +0, 929, 929, 0, 4956, 0x75b07b7a +0, 1022, 1022, 0, 4856, 0xbd314cc0 +0, 1115, 1115, 0, 4805, 0x8a27192d +0, 1207, 1207, 0, 7834, 0xafb5d3e8 +0, 1300, 1300, 0, 5535, 0x04f3a427 +0, 1393, 1393, 0, 5389, 0xc6cc2676 +0, 1486, 1486, 0, 6363, 0xad5a3d0f +0, 1579, 1579, 0, 4526, 0x774aa96a +0, 1672, 1672, 0, 4514, 0xbf5fc96d +0, 1765, 1765, 0, 8487, 0x8b737a66 +0, 1858, 1858, 0, 8489, 0x1e913827 +0, 1950, 1950, 0, 7711, 0x97aa8e9b +0, 2043, 2043, 0, 7686, 0x86038f56 +0, 2136, 2136, 0, 6116, 0x7fc6cd9e +0, 2229, 2229, 0, 6022, 0xfb21af45 +0, 2322, 2322, 0, 9569, 0xc9804ce4 +0, 2415, 2415, 0, 10587, 0xce263cfd +0, 2508, 2508, 0, 10659, 0x90ce6886 +0, 2601, 2601, 0, 10446, 0x07054263 +0, 2694, 2694, 0, 10031, 0x566c25a6 +0, 2786, 2786, 0, 10566, 0xfee0240c +0, 2879, 2879, 0, 11322, 0x12aab358 +0, 2972, 2972, 0, 11834, 0x34c4841a +0, 3065, 3065, 0, 11508, 0x49acb752 +0, 3158, 3158, 0, 11450, 0xddc7e5bd +0, 3251, 3251, 0, 11540, 0x80c52fd9 +0, 3344, 3344, 0, 11538, 0xf858f2b8 +0, 3437, 3437, 0, 10981, 0x6b00eed1 +0, 3529, 3529, 0, 11963, 0xe163c9a2 +0, 3622, 3622, 0, 11329, 0x5312d147 +0, 3715, 3715, 0, 10858, 0x8b00c6ee +0, 3808, 3808, 0, 11911, 0xebfca9ce +0, 3901, 3901, 0, 11470, 0xf2e40d02 +0, 3994, 3994, 0, 11770, 0x9eb8b578 +0, 4087, 4087, 0, 11920, 0xd52de5cc +0, 4180, 4180, 0, 11335, 0x1b18b87a +0, 4272, 4272, 0, 10939, 0x6116ef53 +0, 4365, 4365, 0, 12400, 0xbbcecb8b +0, 4458, 4458, 0, 11652, 0x82531ac1 +0, 4551, 4551, 0, 11033, 0x09e607c9 +0, 4644, 4644, 0, 10283, 0xfe50b7a9 +0, 4737, 4737, 0, 10104, 0x5a5933e0 +0, 4830, 4830, 0, 9500, 0x69f4256b +0, 4923, 4923, 0, 9613, 0x00175893 +0, 5016, 5016, 0, 9896, 0xf76adae7 +0, 5108, 5108, 0, 9534, 0x383e2e5b +0, 5201, 5201, 0, 12217, 0xa39f5168 +0, 5294, 5294, 0, 11105, 0xd30d3c9f +0, 5387, 5387, 0, 11015, 0x59acdbba +0, 5480, 5480, 0, 12211, 0xca5d6b4c +0, 5573, 5573, 0, 11542, 0x479a08fa +0, 5666, 5666, 0, 10163, 0x8c1c4aa9 +0, 5759, 5759, 0, 11849, 0xaa499f9d +0, 5851, 5851, 0, 11418, 0x43e0e764 +0, 5944, 5944, 0, 10142, 0x61793ad4 +0, 6037, 6037, 0, 12080, 0x076c025d +0, 6130, 6130, 0, 11550, 0xc6a9ec36 +0, 6223, 6223, 0, 10951, 0xe77cde41 +0, 6316, 6316, 0, 12367, 0xf2068f79 +0, 6409, 6409, 0, 11328, 0x894c7cd9 +0, 6502, 6502, 0, 10253, 0x7d038e2a +0, 6594, 6594, 0, 12366, 0x8c789e8c +0, 6687, 6687, 0, 11727, 0xdb10700c +0, 6780, 6780, 0, 11118, 0x803e44ab +0, 6873, 6873, 0, 10722, 0xec1b73da +0, 6966, 6966, 0, 10471, 0x9d37fd29 +0, 7059, 7059, 0, 10402, 0xa3a1d01f +0, 7152, 7152, 0, 10223, 0xeb1f72d3 +0, 7245, 7245, 0, 10302, 0x84b89df9 +0, 7338, 7338, 0, 10258, 0x1cbdac7b +0, 7430, 7430, 0, 11669, 0xdab41e2e +0, 7523, 7523, 0, 11404, 0x2c3aca64 +0, 7616, 7616, 0, 11256, 0xe08a91d9 +0, 7709, 7709, 0, 11408, 0x6b0ec296 +0, 7802, 7802, 0, 10776, 0x8dc36d7b +0, 7895, 7895, 0, 11463, 0x4251f294 +0, 7988, 7988, 0, 11510, 0x6e4afda3 +0, 8081, 8081, 0, 11895, 0x699bbbbc +0, 8173, 8173, 0, 11170, 0xabe65a6d +0, 8266, 8266, 0, 11229, 0x90096c81 +0, 8359, 8359, 0, 11224, 0x05f170d8 +0, 8452, 8452, 0, 10850, 0xd886c267 +0, 8545, 8545, 0, 11713, 0x20b93e75 +0, 8638, 8638, 0, 11407, 0x435ccc58 +0, 8731, 8731, 0, 11180, 0x70dd503b +0, 8824, 8824, 0, 11624, 0xb5df34b3 +0, 8916, 8916, 0, 12366, 0x9ddac5b3 +0, 9009, 9009, 0, 11480, 0xd75daf70 +0, 9102, 9102, 0, 11065, 0xc3b60d28 +0, 9195, 9195, 0, 10119, 0x91b7526d +0, 9288, 9288, 0, 9941, 0xfae5c951 +0, 9381, 9381, 0, 9672, 0x38c250bb +0, 9474, 9474, 0, 9240, 0x983fb45f +0, 9567, 9567, 0, 9851, 0xff73b7a3 +0, 9660, 9660, 0, 10460, 0xc4b5f639 +0, 9752, 9752, 0, 11840, 0x0369a045 +0, 9845, 9845, 0, 11213, 0x7e358a78 +0, 9938, 9938, 0, 11099, 0x177e0c20 +0, 10031, 10031, 0, 11615, 0x5f9b41db +0, 10124, 10124, 0, 11617, 0x35184b25 +0, 10217, 10217, 0, 10117, 0xb5e4857d +0, 10310, 10310, 0, 11711, 0xf7da3053 +0, 10403, 10403, 0, 11669, 0x05eb475f +0, 10495, 10495, 0, 11255, 0xe7c3587b +0, 10588, 10588, 0, 12237, 0x1576764f +0, 10681, 10681, 0, 11399, 0x9eaea010 +0, 10774, 10774, 0, 10927, 0x9128ed6a +0, 10867, 10867, 0, 11920, 0x4da7b6e1 +0, 10960, 10960, 0, 11288, 0x8bdf7955 +0, 11053, 11053, 0, 10375, 0x7fc19e5e +0, 11146, 11146, 0, 12142, 0xb64329cc +0, 11238, 11238, 0, 11282, 0xaf38984a +0, 11331, 11331, 0, 10259, 0x2984a344 +0, 11424, 11424, 0, 11569, 0x88a62c58 +0, 11517, 11517, 0, 11688, 0xfe3c4f2b +0, 11610, 11610, 0, 11428, 0xc776073b +0, 11703, 11703, 0, 10987, 0x2281046f +0, 11796, 11796, 0, 11028, 0xfe3426c4 From patchwork Sun Aug 6 23:06:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43149 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp1271696pzh; Sun, 6 Aug 2023 16:06:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH69jR4D2EOW5zIBOlSSxUh6BLXboQvfZ+TvHLD5yOTPZuAMAY5Dxj+SoiYyN6CMkuJuxUi X-Received: by 2002:a17:907:a058:b0:99b:484b:21b5 with SMTP id gz24-20020a170907a05800b0099b484b21b5mr7230532ejc.8.1691363199306; Sun, 06 Aug 2023 16:06:39 -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 i12-20020a1709063c4c00b0099cad5caa77si1635227ejg.22.2023.08.06.16.06.38; Sun, 06 Aug 2023 16:06:39 -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="AI/vC+Ge"; 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 C285668C74E; Mon, 7 Aug 2023 02:06:25 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR02-AM0-obe.outbound.protection.outlook.com (mail-am0eur02olkn2050.outbound.protection.outlook.com [40.92.49.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 0AECF68C74D for ; Mon, 7 Aug 2023 02:06:19 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=RU8M59poRQ4w3GHT6hV07izrWJ31648+YSG6WcEPbnGzg7++KuaPmLVssWLCVhRfaA+/zqhbGkN8JUbn8ry/VfTyBjrnp9X5gbMG3mah7kt5BgB0d8+za14nJSZM/klt6E3wZKrWMpqF3dYsWkiYEK4mErVolJbP2BbPCiBBY9NIYDeD0ONYfmKdkRcaXEAhPkfC/76FAm1+Q1lHhrCe4QbscY+DN2xPwNa04fL+WkoqQVVUFA3+tqHlnRi7J1kAMpQWxVvf/A9dt3QhM8J/91h+zmba8t5tkv+Hvrt/vNegH5sezvRIb/KIQOV1i8WRVSJeSDUgQzG6GNNPik17dg== 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=tkknub03QNlUxSEfJIVeWq2g+o+aA3Bb5RpAplz99dc=; b=IFGba7bSKbNFhKyhCUWMaPUPYBYZeEKOSkoqpcOTWDXRwe3nzraoN1owRrpxsdC6lc/+GjPY260BWTnnELrndGXZk9Nvq5LjkaskXUnlYKyu2mOlWiR3fWg9rhha3r1X1dk5qZU8fhFa1qhq3yPiJkXW+zV3muF34A//xBhMgPJK8KQNXTRrojfAl5CsOTdlWKQvgVVEmIh/IZCRldmvMlpce1rnWWjQOQZqYa2vp9Xx9bX1ZxQF/PuSqKkO85Sa1PwlPZ7f+oz3/hu1nXAf0Ynx0tkDxwC8Qjf3Z5uHtenMYxinUpNFclcwWHu3Wq1ixWdw2c/KvnHhhm1+0ZZJmA== 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=tkknub03QNlUxSEfJIVeWq2g+o+aA3Bb5RpAplz99dc=; b=AI/vC+Ged60vcVw8PA0NixSM7OBT14ZKCZ2X0WYbmdocxzJf/DeQoe4Ta5Sp3MiEFy/BPqY8nOSYR4GP+zXztEB29Rpx7s5OPyZfTfV540p4BZ+hUUhYn7zMa7zWQIJbMRJw6yF5esfELxlZFJ1R/xwMdXI1VTio+qHeOisZS1njvEMRq1dS1rblelyIK+wHgEngI84STCDpJzPl8obrkTnForT3olaNpvb+yaoqGjjrjVFSjOTI5Vdme3FSRIy5yDFKfD300KNtsbd7okOAh8N0MuPp9kU/vg4760YOwOMkSgtBegHpt79rAa+DOMjj8lSGYRNkR2eN6SkcqGY76g== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AM8P250MB0108.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:36f::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Sun, 6 Aug 2023 23:06:14 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 23:06:14 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Aug 2023 01:06:26 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [kupCyBc1hGol1KVyRhdlpGTjxXhIlz37SYfhr0SjH5Q=] X-ClientProxiedBy: ZR0P278CA0190.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806230627.3186387-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AM8P250MB0108:EE_ X-MS-Office365-Filtering-Correlation-Id: b46f6fa3-a386-4544-b382-08db96d1bb4a X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmre2cOvxteVHck60FqChmDU6k1OiafT5qZg1r9fDYZrn21QzVMsW1jL6+wxFfzsNcJBTeTsI2rxpEojCI9fHjQ+9iBbygsqtPE14OG0vm0IqyKF5ovQXnT0l+teV26rCGn3tseMwtrUchXynatyBNi6A3BtuRPWXdKjF0iZXOuG6xDeBlcYJC+225xmZ51icX/aSPHU5JFEBNyaphSDmoqWh2/l8Jxp9hEme0JTElvUkvSmuOgjdO1mi70bilTwd1zixHf5cCfK4MM5sZuhW1DUzEnt9IDM07nFLYndJIBQ5BzJqbpeUDHfc4+Pwtbe/fZV/h0d1s6jK+ASy0Rkxz117FazJ1nvX5Sp3YsY4vPSgSvtn4quLenlVLimXz/9MocXEPBGLzIf2gopMwHscsSLwuDLxD2ORWmaVhdm+TYWxYbbQ/dLW+pCExL6uPEh+gaHej+eGvq87ZgueKd26uLrFMDfKnbPYuTj//le/Dyzn4NFYVd8OTigfhVrOKuOT5/hiSa/7rAKfopDnCmwTZLqBGHYwPdBCJwvDwKIaGstiOWOk3g4qGGVOa1SitdegHUv4ZtxBs+bG8aEW3LqKWdtFn/CCPgWo5pUuWDwU5+q4QjTrzzr5gyAYp9NRtISHu+ZRhShjFgUOaqTq+80/1WgF1I12CmZGOnxcFP0xGlfWlrtn3udoXNWWjqOvewyQhSTTPoh7daaI7RVQv+VPgtsYjr4dr2cgunTXWzU0dG+xAzqYVfV+jctCtYJBYwIWwk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AOjshGTBTRJ2MbjX8QD3ms3Vle/3JAWDMroZ146Otmrt2Lwqyi2eY80/Bdbdn7p6XZSiq+bC/50LmKVSrvx27+om1cvHd0kKCY55xhS4Veo0OAnZNLVnVnw6NhG42y3B0Xpb8FwzDW0kjo93IBSV0DUyYoby8jHYItMzxB50e0h9ekKJtKjQ4z0SV3blaYzzd/dL4DNXXrTPdZ7DwfTqcLPDH0G4DL7oQpE52bpC+BgxL/BP7IuI/cTP/lgWNYeYeCETd084tLrTDW+SaeJKQ1i3ZBTybAicGkudqVDiSSn/uCDWhxp88bPkgeKwpku3XaeqrFF5DELMYEyg/HIXgs03QmMNU/rz7H0yeY4tJXAnvu9BO+XOc5btyb+j8RW7zuYkRfPWNny2J45DLtjhj9+bPT0NHJ+Y3P87xp0mdhizBfgK45MKcCr+e0qnZX+GyfQeWvLhmkIa47c1vYa/RTbBWrVSNmkopyavHQdUHh8xCnM+eMAOglxsgivl37ydKjfMR+YWkVx/9sx1EAZwiVwhUpwXmdWpo0y7oJS4gM6IPA+91a7mUbhfjr//CYfuO3aQL/oKHPhOoQC7sOKBRzowY0+WYZoWLqwtwfhztZf/J3/SYmwIPhXkfrCFIH+r X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: NLDvcMjSWx8XVRfwX5ziF/dXxqk2ePm0p00xUeOhZhgj6ifkJXw4YlfNc6CaV+jG5HUDw+PudqiwQGrR4TMJYfbEfbvrZkk4WXwFigBIOLUaM+cnlaUp0C5QF4TsroKdODtnlsYAhVNp/9udL8lEXJ8DmT7pHefTPwHEVJuQwZkwXn5o2GSNM6CQAtQJnRewgjQg/M1eEX0Bac8ImDAoHmqyfIixSHrDYPqymzoO1hTsZunU2pw6zcci+/Kll1suRsFEI56MDdDFrykBkkAlkjR0nLqSaOcBCr91qgHj7+E+WBzJ/IK+arpeqMlsL/dmUuZQPfehTBXdx8pWq5+Ei77rzQGqsWdg5Jy8ViSeEl6/3clVaF/AEkPAomPzFoUu7qGnnp/jAlq6u5t1MtHmzdbUqQ9C9EwXm9CBz+HlTsuVYVql5g4nn4h0G69ZBnqgKz7Q/pZMySvkhOrmxgUjXdIl2cwPSRRxHkReIJLVQ1IWT3vSK0BUPEdQ5qFIxwllkBsVZpuHK4936/YoIZgt2Q6rluKREMDRpm939nnkdx/Tv7BPHK7qt7uMQe0FcF8sHqB2j9pepsMwpLbhDKlwT2qjcx7QwHyS5RqhMbRfKGIjtFtJNuc8uQ1+ypv6KAHkbhS/+8D0szNSgfSuQWT7SHz2bzNCGIrNJdP7m8UJC6nGSJdpidF9qlj2GEGCHVmaFJN9sZnCiQE8DvaR6zrJbsDIT2cwr3h7GtQPbiJZwRlKH4/U2PEPzHgABEZoaMaf5qRZilkOaCkt9icVi1eFJA84yVYW3vscBrd0Rh1wEso7KHrDwOgMdt0UOhR8mvRJ3nepIW6faXTVBpagUcJtSfEYzjWYpZNO3y4kI7VC1lCeGt0WJKnL+1e6p9IDFAhz40BSSUhk77ACXFbqYIVSck9uEIHdoM+dymDQmqtVPPf49cMBAh+GvIPmZl6Kg4W6D9mSRtt4qYyIZ86VC7EBKQJSYdVbSEtnBwdl7E5mqrqpiEfVs2lGoNwTSrbdv4cJpfcQwnKWiem2+Ff5pU6pPgaFJCxgZM3Jra7fJ4GyLIRCeP/+KfKkAmqGbc442mkN0xaXCgpYObYwXh13uE0ZXzSg+v+X6ELGGpaO66lUKKdUdz82yS7IRN7lOqxWhIPQLLzhozKU258zKdeTJoh6v0MMhoWzYHb7qqYU8896Eys6qJi48jemWOyJZFtEOjzpyuKUa92nvNCbGnptkIELtMRrLaQmcoXgdhnkYBJoffCDw4oIZFhic0p1ubHHX7yg X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b46f6fa3-a386-4544-b382-08db96d1bb4a X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 23:06:14.0266 (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: AM8P250MB0108 Subject: [FFmpeg-devel] [PATCH 4/5] avformat/matroskaenc: Don't pretend to support unsupported codecs 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: CuBt7zgIi/O1 RV10 and RV20 are unsupported because creating the correct CodecPrivate is unsupported (the demuxer uses a codecpriv_offset of 26, so one would need to recreate the missing 26 bytes); COOK and SIPR are unsupported, because Matroska uses a packetization mode that is different from what FFmpeg uses in its packets (see matroska_parse_rm_audio() in the demuxer). Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 7eb734f1a9..a9b7f89f38 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -3426,15 +3426,11 @@ static const AVCodecTag additional_audio_tags[] = { { AV_CODEC_ID_QDMC, 0xFFFFFFFF }, { AV_CODEC_ID_QDM2, 0xFFFFFFFF }, { AV_CODEC_ID_RA_144, 0xFFFFFFFF }, - { AV_CODEC_ID_RA_288, 0xFFFFFFFF }, - { AV_CODEC_ID_COOK, 0xFFFFFFFF }, { AV_CODEC_ID_TRUEHD, 0xFFFFFFFF }, { AV_CODEC_ID_NONE, 0xFFFFFFFF } }; static const AVCodecTag additional_video_tags[] = { - { AV_CODEC_ID_RV10, 0xFFFFFFFF }, - { AV_CODEC_ID_RV20, 0xFFFFFFFF }, { AV_CODEC_ID_RV30, 0xFFFFFFFF }, { AV_CODEC_ID_NONE, 0xFFFFFFFF } }; From patchwork Sun Aug 6 23:06:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43148 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp1271633pzh; Sun, 6 Aug 2023 16:06:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFk9CB4syAESvmd5I9UBynPBE9bwZgeyxzSNoaDTj352xJSvSy65AS8zX/fk034ZbQUu2D0 X-Received: by 2002:a05:6402:3509:b0:522:ddeb:cdcb with SMTP id b9-20020a056402350900b00522ddebcdcbmr6609509edd.18.1691363191562; Sun, 06 Aug 2023 16:06:31 -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 c3-20020a056402120300b00523226c590asi3446200edw.337.2023.08.06.16.06.31; Sun, 06 Aug 2023 16:06:31 -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=VWDFej3k; 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 BC31468C73F; Mon, 7 Aug 2023 02:06:22 +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-db8eur05olkn2054.outbound.protection.outlook.com [40.92.89.54]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 869B468C6E9 for ; Mon, 7 Aug 2023 02:06:16 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ZsBdAnXQqjoXP9Dlm0Z4pyVkEQxdb1YtazT++waK4BoE1aiBMaC3qiwTzd2q2KXKA3h76YGtOeWXJ14vailroqIcYnv0MUmSBmjLTsbeC415KSjPKt6bqurc37RE7lKBxwcIGHi+T4drSHNlA9Ae2Eu0SO8lKHoLalgzLHNZSmfsYSmhq8E6qyPnMy8hGcj4vqRjciBLx6iLSR6A+91TFawU8td6PoW8/TTFWAy3hDIFOXxddMJdBCKB38hDUgCSTi43ONL7S2z7GsrjBRIqCW78TslA+M53Aw+7VO5/4CR8jqArKsuBcFXO5e15y65PLYFwOguVAntLKy6uK9AoBA== 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=2fiimG82mLESoB5XjKduLOvr3qIh5GGPdasbYf23XS0=; b=dOkuODPLtfLGkXaEzfmBp0TK50wYmD17ZhytQmP4Zz0M3vUn39fYH7F5Eeyye/dRrjMZxi07P3j5FCM/v28F3JDa3ysIxDfwxyMhMPMDdgD+iFZj/NXdG+2CgcvlLIzZdDyw8afsTm5uTf7VlWFUoQNBa+qGUOfD8oEEJ34vlPzZXfSpMj/TlubvOiAP4v9iXABmVi3c7+D2yqA2AqLna8CG6KZhMg8eqTwnWs0WIqRxw3MY0QMMlreL2Cuvfo0cWvPPW57TKN7LkzIFeLJe3GbDmL5CNpj7VWhKBF9vB37bkAI61IFZBT0Z0cwbdHuCk2E0v+dF0sodFNjsBoHv5Q== 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=2fiimG82mLESoB5XjKduLOvr3qIh5GGPdasbYf23XS0=; b=VWDFej3kgymgNQHwBzXaq11OFU8IhAz7r7Pb0UA1/Z1WphSdYGqJlS2CbtYH/MwgnzpsZqSXtWSBbaeqnummr/ra40V27Rc/i7bcV+4HdC7oVvTca2n4wfwoDkVagUQ39wh8TQ/STXhmOQEs3VaIqyOmj8yzwxyLviOpJx2wcUcWdCKvtu8edtaMKfCBitG9J5XPYzXiFpiKTyQcBXqEDvzCwWkgl6Du/tYr2jbPdOkFeiBMYFR0DbmQCtEInU0jrCIg7q6xiwz5GJJ0ZKs615At5FaVR8eVNG6AjARX0y54zc0rcPm35BW16f4J//VX2dbTrSOPVuKM1PhkvDkiMw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0022.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:14d::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6631.47; Sun, 6 Aug 2023 23:06:15 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Sun, 6 Aug 2023 23:06:15 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Mon, 7 Aug 2023 01:06:27 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [FRpCLtyZJkmRv1l91ogXv1Z4afSY+qd5RmFdZllO/2Q=] X-ClientProxiedBy: ZR0P278CA0190.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:44::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230806230627.3186387-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0022:EE_ X-MS-Office365-Filtering-Correlation-Id: f3366d2a-9ee4-4530-0446-08db96d1bc07 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9Xmre2cOvxteVHck60FqChmDUCV1zldfHkOCxTGJ6EjFYveMjJn1A0aYBCVgcJY7wOmgVNCGwWN/MLTGbBZEiDv7ox4ITdlr77110w8etrFq94TPRlAkDz9Kt6o3/vnTSIzQja1p9C9qOWNwgbY1zo1L6t3JIMdlg2u8xlhWu5lEAfF+U5v4tcl0WgL9EJm5td/oDLZ+NhImYpR+Og6whvF+Ud2MZ4cvG8ZXhBVzm2awPZQmzIYLOOeQmG8f59/+B+e1Wau3lkmPiKi7n5a+kOpkCvNe9s2NrYsvngMqFOX2qPVBkAefI9q9nvvBCc7ggQ5nRceYyoQFjgyAQFGqyaqhZl54k4zP2/sPX8o49zFGNXwrYIg32MrSSAu6CmEj6IQ2L/uyqbObqHuI2SHU5zyB1Y0kZcxlpYFxaFbB6lMClhhk8Ft2K012cpwvTbf7gWdEID1Y+DKKyvZdnWtUtPHAcolXGiZq806P24BY135/9VZq5BK8ekv8ssDmCo0rW/IMxSb1/VstMYpdAx1f1WUZbQU7m2MdrcJ8aNSjc1vv8P2MMH1M0cetL9zIs0Auqd4H+rnvpaHXKZO0vcL6ZZr2qqwFylajnAJfMUzr07PQaBSO5EFv/rlTQRDFoMkDNQ/UvS2Bg5L7YaZKRtpIl6bomGzNn1toBotpkIuXDsyTuemXdu/egd+f+nk3gZjYhdyT0VRHhD4pGcOztLKG3JG9wyG1EJuodG7ltTW4uSjNKW9W+rVwOOUKB/Kltn3v7K4w= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: BzRnFFWmQubQkAxlCyZJn1JGXZO8OoLi6Mx5sqU5GqovV/iqNNVqJDD8FX2lbgvEVmLswVRnMMxrz2sIDvsTiUWUZt7/KZEfE9Y6osq90PvQE8/qwjMd2wN8BVwneuQrb+MEH68EoBmp43OXdp9TvQ9K6Lt8nj0A8THW7RTAZd7noZOc6w1vSGGVuicYYCBcby52BhHY7t1wyjGkXdHOaCM4h8ILtzjB9FxtvF7CNvBbPipXTsxPBY3r3dDyNQYetVkPVTpnNhdg1IxHqJB+8YdzYBXx0fGLE6sHz05irUBezeOy3KMj15a1ckouTyPNY0p0S9QNaJyi/WQ/41mmEiaYI8XhnVgmhA6BPhoNEIZTO8J4A07s3METBkARjrhqh2kNUgK9k/p3onn1uRRQtub97t0pEB/RX3TNSOCZDyWozeTHQC/YNd1DDzrtv2y1TqH9tfKkAKifLB7QgAXzCi2R2D7tcJg3/ZKwmbRBY7hD0c2og+NCtbENXn/dPMyTA91iJ1Em3qV99yoKjtQqyLM1zzN4hUqJ09tV1jWAyAx/c2MLg3cUP0CL0BuzlKK/Dr0AVsVRqgGHdqkaDsg+OFV1Ec6q3/+aZOiA3JIBsbuculE8DzA6Z+ehNPc9u81a X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KLhuDew7VgaH+DSG4/27AHVMvNE8U9mXXNf8Bahw9yaFTDu2taep/bWgZCeGBh8BYQB96kIZIU4UpmVO13AgBB/JBbJdtnQ694XeGVOELpepkgVJfSfjgSSharYLr6WKKb6w/aRB6QyiytzSBIF+uve/5WEOShpRcKs6YTIO05lMiFIYyny43GwDvK2SUuYe3A3FX/ThPNn8tf1zysBA6ed7Da7nyb3U6v0EKaMwsg1HlD5dC4GHfCvYc+vifbbh0CXqlbLhoYq3YMRBAf1QQXwYFmKCA6vUm/MAmE+GX5veHJjOnxlxGuGxvDcCpABAYZF4Vt78vrwLpbsl2q1WD6keiHtgE++JkMFrjA2W3ahYAPdoDfoKswchR+79y8Vn8eDUF1sj41vZiBqJL6vf03d6sM4Q+zvYir7vq9SOwQnMPRcBeD60hkvEX7NZXt+n1m5tTvqCQnFg0RYkuOJGLBCL0PIDok5eghKacBsvcgsAqHhHWhmJpqhWORmVZWfogddeJUJxwpMIDVNzaj4dbulVC+w/fPQEwrEqash7F1F2Lb8KmJ3O6nVActvkwng18QJYyBgeP6A0KQUGNqaqkukbfSCiEKxwqw4YH3sOrE/qRssHHCg+1bTC23wvK+PzLiSfi1hWj7v2QRAw7TKMYJChbZ4upkQ7YlAds7fQje++jqbNweW6U9p1rAFyhC2JhLKVNXo1ZzRW27d+vXUL0J0/bTPWZJhcknOshLm2t3o9IY7vRY0FvcFxcIFObGFq53jLV+IwryrtnbaUQyaRELdD9OwAeeK8Ev5yqfnJy1KsGhY2rx/odWLi1Fh+Mm3CJBF1fXmzHMBiHaj4QD/NDaFzKT1lD3NyRoS/U6zUKjbL/ZY3IKMZLCuQzzGBmiqXfg0kmyBFpn8rTD1tn3Mieq/UWzvLo2D7+R70OLq+nmCYKx+N3fRya+NwKIwebRpypwh4iQr/2jBleafmTALWQWm/InEdZY3fNBDbg/cWhWFECAKzOJqAu2RWNwpCH87nAYYRVYvcMMPEDVMZz4XoVs3qNz+Bojl4ZzWAJcXil/ffMFvBPJghecwr/uXvai8jXefF6VJNMahVVLCc72RvFuNmxsmK7S3V4tCwnzTQ76bYszWNJENOGkTe4jBs3Ke/vWV4LxvB2ghVVQdhzS4himwlSmbT5LQYMApmMxJcn1+cC3aNzfkGA4uJ2k74Cug1JbAWm7KtbvnQBiNvOqIDGut1B9jk9By2OCvfS1ZD/qgOMeFuqPJSgT7+f3T+JJti X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: f3366d2a-9ee4-4530-0446-08db96d1bc07 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Aug 2023 23:06:15.2355 (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: PR3P250MB0022 Subject: [FFmpeg-devel] [PATCH 5/5] avformat/matroskaenc: Don't pretend to be able to mux RV30 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: cVKmowImZC3D The demuxer uses a extradata offset of 26, so we would need to recreate the missing 26 bytes somehow in the muxer, but we just don't. Remuxed files (like real/rv30.rm from the FATE-suite) don't work due to missing extradata. (The extradata offset also applies to RV40 and the extradata is indeed lost upon remuxing, yet remuxing real/spygames-2MB.rmvb works; our RV40 decoder does not use extradata at all.) Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index a9b7f89f38..be70e7a6f1 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -3300,7 +3300,8 @@ static int mkv_init(struct AVFormatContext *s) s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RA_288 || s->streams[i]->codecpar->codec_id == AV_CODEC_ID_SIPR || s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RV10 || - s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RV20) { + s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RV20 || + s->streams[i]->codecpar->codec_id == AV_CODEC_ID_RV30) { av_log(s, AV_LOG_ERROR, "The Matroska muxer does not yet support muxing %s\n", avcodec_get_name(s->streams[i]->codecpar->codec_id)); @@ -3430,11 +3431,6 @@ static const AVCodecTag additional_audio_tags[] = { { AV_CODEC_ID_NONE, 0xFFFFFFFF } }; -static const AVCodecTag additional_video_tags[] = { - { AV_CODEC_ID_RV30, 0xFFFFFFFF }, - { AV_CODEC_ID_NONE, 0xFFFFFFFF } -}; - static const AVCodecTag additional_subtitle_tags[] = { { AV_CODEC_ID_DVB_SUBTITLE, 0xFFFFFFFF }, { AV_CODEC_ID_DVD_SUBTITLE, 0xFFFFFFFF }, @@ -3506,7 +3502,7 @@ const FFOutputFormat ff_matroska_muxer = { AVFMT_TS_NONSTRICT | AVFMT_ALLOW_FLUSH, .p.codec_tag = (const AVCodecTag* const []){ ff_codec_bmp_tags, ff_codec_wav_tags, - additional_audio_tags, additional_video_tags, additional_subtitle_tags, 0 + additional_audio_tags, additional_subtitle_tags, 0 }, .p.subtitle_codec = AV_CODEC_ID_ASS, .query_codec = mkv_query_codec, From patchwork Tue Aug 8 16:40:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43178 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2408119pzh; Tue, 8 Aug 2023 09:39:45 -0700 (PDT) X-Google-Smtp-Source: AGHT+IE00oYWgGmeIdLPt8yG49NXTDyAphajl4/qZl0NqMu0KdUgpOA35J7kL1d2ExQ5WfVNFOHp X-Received: by 2002:a17:906:24d:b0:997:ea67:cb2f with SMTP id 13-20020a170906024d00b00997ea67cb2fmr96586ejl.48.1691512784818; Tue, 08 Aug 2023 09:39:44 -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 l7-20020a170906414700b00998a03e00f2si7523074ejk.655.2023.08.08.09.39.44; Tue, 08 Aug 2023 09:39:44 -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=mg1LgryM; 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 B805068C6A0; Tue, 8 Aug 2023 19:39:39 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2060.outbound.protection.outlook.com [40.92.91.60]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id E7F9668C186 for ; Tue, 8 Aug 2023 19:39:33 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=krbLdM8qsdzlGfVmH8BW7l/f8PgonOdBJOK2I8kp6PZLYVKX6hIxqWWBAq5PXmhT3XaK18ZBEu2f2eZHKSKSwIpIyu3dELLKhcTW19JlK7Ho4QJ808zXlWXB6qaPGBz87wm8wJCPENK96HiAAOLBsOHBx0uPQWSr8c8IbdMBBTsz4jAYLwLL+PJWSe7EUkESydRO4xY9xECTkUHr1hDGsKc0siUE3JLcTPnt3DE1aIeZDDV/57OSTfGeD8sODxsAWXi7G4LHJso8YDInW3+MwbgsgPY9VMh7fRKkZn7QNY/kP0JUeeHQxcFmn+OmxTU3Hp53udqwL+lNaJoIZCL0YA== 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=coQXxYKNvWz+3iknry1jeUdRwuo4VxoW74R3rxGXwik=; b=jed+8xgEToobbzpgx52hsxveipDGmKhWUpDoUi5AqlsYORxInsmGSPktAF0m9GuyO2U1VkdLfVUoj1X0X4L4KREtOb/19J1jW0rGLWd0e4E9JvdAEGoPM5OSLEYz+djmLdJWPzvckxUxvkcOJh6/bGrSY3F/FFLKxyWAKA5Tk4PB9KrYVdVdrxOnRzDFronw/vjTOpAy3q6DtXBz9XCmySg6rZO8aZ0ZIpenTXRP4r8o5poVnf9LWMueYNd21s6S4reawCPT++7ur5Ha+DMUyph6HPrKGuuVd9tzGQTD2Bj246YUnrYMnL/SQvVw37601/hlAFOYT7EiWDliE5yKgw== 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=coQXxYKNvWz+3iknry1jeUdRwuo4VxoW74R3rxGXwik=; b=mg1LgryMx8HMpwLygxfs5EPXkPWO35EqTeOUsjbelpghURhv+env0zbFYopnrSFYCZ+uKCJBidEBfSqqurKzLyIK6QniyUzm3OBe+Zy13AFLu25wUnjdD74tQqhBv6NMp25eu6/Nme8+WSxk1o8dovuyww+3xVu+hLdTDER/Ck7EzStaOoRiEGOl+OfujF2HIrO7npGzFC4G5khHo+rqH3oaveP7qmp5d3+cJKjpV0S6yRfoZquZQhUhi4FBAkFOQxdvCnkQXqLHp1RWQifEkNWyRr5bPZDTSLAHWdyJyoTA/CzZrkrslAgKjAF8jAF721djgGzVAiuiossnhcjdOQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 16:39:32 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Tue, 8 Aug 2023 16:39:32 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:27 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [nKgvlSsYy4xiwkMLMhBvGOWjDEez/gIByAEa2lOjCR4=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-1-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: 42d1f6e8-63d4-40fb-43cb-08db982e0ac5 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoMTHls4qxpPCYYkh36TB/2G5K2Im+ElGbxeZ8ZBglD3JGpeAvEtyEIMm8wGfRdN/GuYC9r5KlYyHtlNM0KRKh7yZvHBApuPbXhCAvrb0BcZPtBXq/I7ryxRNcLcLjZzm4K9GxJCdak8rBQzVAexUe0QcL3qFF+1t/q0sf4dPlUAQifAF9n2DyDIfMTRIrV1JVgFdSBEMd4Rt/bJl0JUih3bxwzM7K9Plr10tbHhVYOo4JTuXIo0G2D68guiV/wU3tZDPi9UMCJlfi77z/ffdcWsc+esKW24TVm1aRjM6IIHxLgdoxkiT+MT6n5PSszn6ykjRhRkvPbEPylHwvYCCkIUJXj9tZQ9asBsfbAKleo4fpCZeYa9I6jb6vfmT8sf8m4fRpU5CRnxXrPubm3Hd8AN2i0rEWVCtn+gfPDx/yNWDU9SuDpf0dWhy+SvCh7BGAUtpJuAIQQLbEgAkKI1ap+cr0i9y4aPf8kurXpB2E8SkR7TQyIOGm9dcWR2GBOqvhv3M8BO3a8+IcB0cYfHHK7rSZFLxm1/BRNQaseiqJ3YcItnH5Ti+K7dVmekdpV+eVtN7JnPVn3M6s9Yzo12RxLsRn4gbQofCuAChG4ZgQoLw11kciV05NIvb9fiH905KsTWgTobfUf2gYqrWEN2T621R9N9FoDmSDJB1hezApbow8DkiBzdF2PgFS0CfVLa/yC+Wx2nPM1tw79VGk92UY1OTLhPKwFiZmPJ894RpQNgoMkhhzYyXKnIgIZ9PbvyFY= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: EnlZI6jWS6VptZKaT8seCl8XoHXfjmXPMb3uOKXVymPLrSkGo8J25GTgbjmdpqoW1drEtQP8DSx/5nKV1B3FN2vVxSY0hzAu8zhQqmi6+RySTElc4oeLDSnQ/rPo4wnJAEq6BNW28MnfthtIeelGwqHFSon/1JCDjOiPVFPfMG8dELrLNtGaPb1z10d4ZfS4SIagWa//KAug6aBlGrnFJ/jJdrLPchGS/LoV3ozcdCWZFtMcUxjc5SnayIXaBLf0b7i4PGsX3s72zopXAYYw3btEHFqnW/USmg13GDADAgbKSeFrPnrjJCGR8UnxJNfM624O/7HrNk0Jkb2n1QjUg0C5WVPIA7E2V3I2FxOKBNKCd7JUfU7uvtqXb68BdaI5cljwVchAdcBNkYMNhzuVv/ei9w9EON3VF19ctkiO1DSgO/fWmyxzr1fm8v//vQhgoXjEVI6/0ZEWul5WywoFhQAOUHb0j/RRoGjwNsY0vUzVoytD10YUzy376gNyC3fP2MR0JUP2f7mh9G5+bpwe3iE+wGRFi2zacqBCsQeX+nGZ1ut728nU6aBER3chDZJ2xkSJNBWwYbOWbuIuwtXU5R/9qF4Fd8lNIw9A3N5VGcmKxJzXDYvOj42XhjkEFDGf X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: KfUvtDr2yTKfgBdwLFKOEiKuTIxKMr7fhkHzMPQjplZOJnuAdkFqB+E4oZRyWTGtl0OQftXn3EfHMZ5aGowklNpardtpV0qYAG+bSZCa67p7YbUpKERzj4RKfwXt6cMQaI/+kWxfoNAJKGdmywKN79UVtgZdJnpp7I5JI5EFgdpVYcXt3ML7dlDJgjnvGNv2hQk+VBauixSu9YNMYaORDo2QNEz28Q+1aSG2+LGz3Ec7qsu64zQuQHksiXfgBUzP94wWkpTQ34xJneQpvSjdebUkYrisC4n7fVBNwAIO9/leUq/J5+JPOQR/PGARp7tZLJakezgD4u4/3yBT6onTpO78o52Awd97HMYwfz3dv28XSRkN5x6y06IZ8aRVzN5EIn34PlsIstxS7+BIWMZJzs265xmWKmvJS2Peews3l14bkJZXcp/jGTXdIPQ/EcnMpNjCJRTXlu6PxHprJodfVFYw0/YAP7RUd0LpI1Wsmb06UfyMou+ChfSOAdVAlWeYhe1GTtzprpy5k0NEKrfCU9DhqDsmv6LOImbuMXrfJoSq8hiNDQKCTI32aIP6e+c2VKr+MP/HTc0FAVyOCBYQ131++k78r83XTLAc6aVe3EZEB1yutdX3Tnp45F2OLE5+eZSyrww+/WACOqOx6jmGQlmGSW8kRBSb9xzxMPyB7+mh+ZUB8on0xS0xJQ5IAjRi9uZJGMfD+ughU9TVQkh5ONE0R/x9x0HNjOj5IPdbo9nD+z1CbsdKJelMYBESkx04BbuO0asmj6XzE4v7vOCgt3roM1hvUUlHw1lc4/Olcgtyv/TbDdP5W0ssAjHjOA1g8Vvqq9FXSCQJl/MoxFdfrQ8PiwKdoRHDUA4MdWK0OmovgI0F4ksO9DKKHqPOzRc0yRseDHXuEnx6Sb+7WlNXjtHFL+oepzYY/kBfHlS7m0tlTKCFyU5mB4jGHYvecl2yP/UjagOqS7XJ3o7abZslK+n6BLUJ7DW4D9tjaQqAKDX5fYidMQyvhAsNmN3FJn4dhLZ2ePdu70Lz21/BQ0YQW47r6aNLvxmvFknof/gjDEMRNMw9Jv71VV28gza7pE+Dj+aeplvYPgqtBgrHUH0M8Fm1ayvVUXLRxGSG3RgUVD7h7oxKq5nTyo+9mJyk9LqUQk2pLPotaju8Zte9fOnQkbmiQmcakWRjBqRhWU0q2gkZWKl61wIx2hk0+u0Jq8HWaL9ZQxfDAYl9frx7Bl3XdtOdOtYmVW00PdlEzpztAXVrt90Ci48QqSlwXjQbG7U2 X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 42d1f6e8-63d4-40fb-43cb-08db982e0ac5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:32.2755 (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: AS8P250MB0268 Subject: [FFmpeg-devel] [PATCH 06/15] avformat/matroskaenc: Hoist check out of loop 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: DVlJiP9ajxAa Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index be70e7a6f1..d9bc31daee 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1877,9 +1877,13 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, // look for a codec ID string specific to mkv to use, // if none are found, use AVI codes - if (par->codec_id != AV_CODEC_ID_RAWVIDEO || par->codec_tag) { + if (par->codec_id == AV_CODEC_ID_FFV1) { + /* FFV1 is actually supported natively in Matroska, + * yet we use the VfW way to mux it for compatibility + * with old demuxers. (FIXME: Are they really important?) */ + } else if (par->codec_id != AV_CODEC_ID_RAWVIDEO || par->codec_tag) { for (j = 0; ff_mkv_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { - if (ff_mkv_codec_tags[j].id == par->codec_id && par->codec_id != AV_CODEC_ID_FFV1) { + if (ff_mkv_codec_tags[j].id == par->codec_id) { put_ebml_string(pb, MATROSKA_ID_CODECID, ff_mkv_codec_tags[j].str); native_id = 1; break; From patchwork Tue Aug 8 16:40:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43179 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2408217pzh; Tue, 8 Aug 2023 09:39:55 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEfmZk5evTOMgtrvBTcGEmXrC+2hs3opdNRnfzEHsERRYruUbKFUYXXODxpy13k/dHYlqr8 X-Received: by 2002:a17:906:1557:b0:99c:f837:bab4 with SMTP id c23-20020a170906155700b0099cf837bab4mr94006ejd.76.1691512795208; Tue, 08 Aug 2023 09:39:55 -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 n5-20020a170906378500b009888bb065eesi7599812ejc.60.2023.08.08.09.39.54; Tue, 08 Aug 2023 09:39:55 -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=tBeO9WSH; 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 3BAC568C7EC; Tue, 8 Aug 2023 19:39:50 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2103.outbound.protection.outlook.com [40.92.91.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 8C67F68C7A1 for ; Tue, 8 Aug 2023 19:39:43 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cSIaiWXVmPqddFm50a1B26Oq5IWmwiFADMSpy8YaUPVsAazU1hkeXLwL0oqlLgg8KQ1dvgAPQuwTjf2tyxMQsBaCA4tEZ9NuE3XaXH/1zYob/obXXxbJIFnxCQtgbe+9X8A11ITPgbmuDGsNbctkKthlVSFn5rkt95MbX9cr0ZRfyKdAGBUcVRHYZoP/R4UBYJHN4nvENXVj5BnHJj57jfoOBEhfOsXb7+cTcxB94F2OoBiOZYtx4eKbPs1QW5y8K52Za3AaN6O5lj0f68rS381RWPJ9+ghqHRMfknFYzgu5DxkOd5nLxrEvGE7kiqLmWvAqEa3lEHJzch0prs2H/A== 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=HI2HXuCM6t1b4LOmoTSkSanvRGLZJionRO2TMYtHpZc=; b=derZ4VHNB6BFLWHqm5vPYtFgG2Zma64M3ePiy7W1M3N7CB13jxDvpQLgCXWDj0pSYfnEpSl8qSYTYJhe7Wkw/VrGFFgMBgvhVyJApZOQ6U6SNZWisbW5LJj9zzcffRh+Rx1+Gmdvt86bIyirh1/tSaq1dX+PyvGLVP3qg6w1XTPRvKSKnXQ4FKO8D+rWLy9VMO0GfKsrNid55RLkpXAn02CWdJnjext6Gnq1re3LRYuniWVBFUpXNEHkDNm6hJBdFf+Pe/tALiYKS+ooUVi7muYEEnZBRsqWuuRtPLcjMkOn4+LQJZLv7tg/SNEjKEciokFG/pWJstmevL90hGdSsw== 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=HI2HXuCM6t1b4LOmoTSkSanvRGLZJionRO2TMYtHpZc=; b=tBeO9WSHBylYuymsbT7OKE+AiPuSWQqy9OYIy1wPmxzwJ7lCQDuSuLME3L1ZzDHkF1CyE62fVYuO8x/5M9yT1Qtb1/rBvG++nUA0v9yuwUAFBcwTLNlVUB3dXMAfTVnfwvkmTg7J2nfsw0NNSFuSwLtFupht3OZk96UHaP0Jrjq+x7qlm9M0xqDFVE0GaSbZ76F2Ek5iekxqcEBIBhPGeIFbdUfu/Cjra2h+eJtsVQNdy02E8nB/P8HINi3vOFsj4tgHhuyYtCF29nJTg0ideZ4XXIksnO5fsozKvISOcLL2OaL53eR3RNKRzR15Ivq7kGqOFJqAReSAkiHtWdIbbQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 16:39:42 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Tue, 8 Aug 2023 16:39:42 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:28 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [WrWDo7G0FRVj9reLvzVKVklZ9GJCxA8LNk1KAX9QAXE=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-2-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: 9169adef-3d47-4dcc-8869-08db982e10ea X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoMTHls4qxpPCYYkh36TB/2br8g8S3+P92pylTKoNEHDXTjm/MJmvAjA269aWp7R12kXHUHhyh9ndscR3tKvWpGxmH3dSvgx9W1pWSKDgbvtSsPDoks8j9AJXxs9BeqrFmx8rflgaiqsf6dJVoAlLNzHpwLfs45t93Laej/Ye/xN/gFi99kfcYbwhnIfVjy5W/iU1JVuNsnw1iRlk1SaeNQIv/5nbZ+Ufga60i7QNgvRw0ofxSUbisn/tfihwllO70Y/OHIvODMk2SrXAFUnXb8VOBFG9/LmtxWb+BirOFVdVI2KjzaBZCGnwPXPiCpEgGlj2/LlbHqW/FpV4+AU1nNXfgXv4t5s5ut/KUMuiW8yiVNZTW5+yIYfwZwl9AZ5riymP13o9FMAYc/w69QjbGBrk4t/2hKik7Z8J6YeNOLmgz3kMY6Q+0HTbF6EW8U9JcuO0OciW9VNGdw1SD+BK5cSCHDIv1L9fpH43S5OD5r02x920OE7RSsP9SD8xShJm+iaUB7m9Stzce2EgSx2yXjnevoI9t2jW8JB16XipXrisZjF465JdoTCx9R4DlqEnI06fz1Sr8MOidPer3g5OXTZg5BcsTXETMbF3suUI9xz/4xLkMbNQvRFX4qEq6JsyIG3lGlMeDCZ68Xd23VWdCzN8dWjDNIgC5b+Ai7ThanXTaVw+BVutUfa68svsvPdaiOFMH84trKMijpRVrd77FM0D40eanPOsHSO9/45n1lRoHWr6/YASAZWNaEMjqLFRU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2dYaumuWlOh8XvHAxgMZnyLo7fGInyQ57vho2ort0jaQeT5cbaxNnwa/84tzxtfAKyJoMF1xAjM2al4Q1dt3pq95jn1eWKdXhmCQubosSGTn0Z4jDpabY14/aFmupgWpgwgXxidSJOGRf8OjVAMJGitX5WOX2V1mldFnhDwGXN/CrYcJbnBG2nQ64iXYMQvtyBARnEbh0uw6NkbTA37l/N4cpBdzI1MJ0ugFeuz9rxy6EZM1INqe8OAfarjiQqif3NwNck+ECcOqKWihVR2PzlikHpRltXBoPAU39Ovg0yBY0glcdOp6QojKtPodazBRZBkIulzkGG83eolLIABT5IGnvYrRE/zeEk66rNRwdCyq39ZZJPMfBfeoewlo4+S+GxQbv2d/BxLV3nYpXBmNrpSKvIEZKGuOx8zehCGFX60KTltkpK2deI5OrwgEhWNY2EBj3DCdcj+sDRrzlVmMlz6dpg7ji//yyX8PMIjYJ+ENGRNFK+JlLVkAmSUFet7tafrDWfnTvnRaRAfHdOawKA6O/Y20wlynsh8HpOAuu8gcSk2K5F4cFrqTDrpMaBTN7bzCVxjAPpphjp70P2CAJBlj40aN4Z9kYbK1GsEik1lT/2+cH80WED2DHIxveMcw X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 2hyQIBfi5AAfxebwdzfgsTTkw6wAmShcjeCCq0Wr1ka0xa1yzZZ/uCaUGBDnW/qwSo7FpFRZRtajmuRJhpAMijKAvh6CwUQ/8NCAp4KirHlGjmB+WioqlINN6oBVXOqhS3Ye2AK8JG8kYbUak6Ls0aYiSGlQwPXVPUBPEFngCmirLw3yZqjzW2bxrep0YgzCDOE5w02TxjzFq0TvIsvKlyBN3yCsmPBCekJ3eLBuNggq+as1cht0CnSo3uslkWUzpPnhstohd7CtwFeOwNLuXhrSC6iFtnhIbZbb5jt7kDeAtBrkgy3TbbgQywYpLK2cIuBM0NWXaDmyOBtFo6G6BvPGY8CKj8Gls57rRoZVpTAFz/S+L96zKWCEeZ2q8bWdOxH8TUFtmcBHOwVgU7IoulHeJGeTD9pEdIWr+LsKDCqRVkAE6lTZDjIh2fk8Gnby+TXZKpUXulDnGPj6lK8z3en0fO7hVudPoKLt0n68r9GYaKIHCHXo9DCHO/+7eFkndEas3U3oznisuS7ARnm8I7R1Yjrbmh1Yt2B0GIXScIlF43X4+Q0n9eDitB4ygiHnlexQxJfpqpwD1E1re/QVMlVA/NBAS0UTJig7kitlr607CWH7hUb7p+ZYEmf5oZqyWvXdnS3a1sQuK1KOVmrN/DlOovk7Mo57qe045pPt77IEbecFBYcoR52kRY4DGaP6iLJC33g56vYo+3YtGLSrnVbY9j72iEluluRvlUu05iP4A/aAwtVGJG4GrEL7IikgyI9JkW61oFva1DGr/bx0LemaOG9OvlHx/Ib0cB1Xs/jDRoaztbHbIviB/y8M6xLY81B5ZjRB86VYeU5eY+DskV8urF0hJU8z/hXbysQf1u10y2TZqIlaLLucUMQV4fefphHWYjb9/xJuB2Hptj2LxAfmZYy2W8gZMRys3aVzDZXrcGuj1r+4WVQwUIkYchCLH87pdXVAMcKYyc9gDTMEXCxzVDGmhOpxuA6C4hqS5/dScQrw6FD4rOy2FnAoiiigKJEKEt/uk3eN7cD5Kyjo5Uaf8pt5S/yAUZBvy8tBrRiGqfgCCTj8fbLWlylTe3Ru3xcNgZOHLb0X1H8XLi/cyNIskwtVtJh0gPluURt64iR54ITYC0wHuew742579Mn6CqeKWKyUIZ8kzzgkx5kfF48GqDU8V/0izA3bdLs5JcHC9szfX1WtdDLKzc8T/bGmW3qbwO07LJ3I2gmjGcu4oy2/4oYZqzYv4ZJvk59EgwBhrUURJCkBdUwffbTix7dq X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 9169adef-3d47-4dcc-8869-08db982e10ea X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:42.5221 (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: AS8P250MB0268 Subject: [FFmpeg-devel] [PATCH 07/15] avformat/matroskaenc: Remove unnecessary check 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: zbkJ5AcyLLgL It is only WebVTT which is special in WebM; hypothetical future subtitle codecs in WebM will presumably use the ordinary code. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index d9bc31daee..9fd4cf2f6c 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1831,7 +1831,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, if (IS_WEBM(mkv)) { const char *codec_id; - if (par->codec_type != AVMEDIA_TYPE_SUBTITLE) { + if (par->codec_id != AV_CODEC_ID_WEBVTT) { for (j = 0; ff_webm_codec_tags[j].id != AV_CODEC_ID_NONE; j++) { if (ff_webm_codec_tags[j].id == par->codec_id) { codec_id = ff_webm_codec_tags[j].str; @@ -1839,7 +1839,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, break; } } - } else if (par->codec_id == AV_CODEC_ID_WEBVTT) { + } else { if (st->disposition & AV_DISPOSITION_CAPTIONS) { codec_id = "D_WEBVTT/CAPTIONS"; native_id = MATROSKA_TRACK_TYPE_SUBTITLE; From patchwork Tue Aug 8 16:40:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43182 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2408624pzh; Tue, 8 Aug 2023 09:40:37 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHCaU+xYRYIs1x8BX3Cxu7z7xlqU70V+4DK/9xaiojp3MLqoPZ+0ipStZA866d8C/0SW3U3 X-Received: by 2002:ac2:4c30:0:b0:4fd:d9dd:7a1a with SMTP id u16-20020ac24c30000000b004fdd9dd7a1amr25963lfq.31.1691512837350; Tue, 08 Aug 2023 09:40:37 -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 w8-20020aa7cb48000000b005232d42dbf0si3792552edt.584.2023.08.08.09.40.28; Tue, 08 Aug 2023 09:40:37 -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=DBTbL8Ov; 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 5092768C7FE; Tue, 8 Aug 2023 19:39:57 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2103.outbound.protection.outlook.com [40.92.91.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A2B7D68C7CE for ; Tue, 8 Aug 2023 19:39:48 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SLO9Stg+Q2uChl/ZogMAzwaz1JlMXhZVGf9DzO/AfZAxhYNIlpp7TQnVZEqtV1tn2WHujn+GMzG/Hza67si3OdwaMdPhBrNnT6Bhsx6qXgoV3/DSgT+cXOZIW9cmx7ZBxCUA/8APrt4uHkOrLx1mxxmmNL+H30EndLZTTY/KmT1aJyYhfHMaEnqMbJFBI8hl9WeRYNnqhS7RnPPnj4m0Z/oykh812CzaFIsit6n8Ovz/TBYR3Cnby885v7k9U3J8s/ZYZi7ueJ+RjnVPWyJKVlPl9qW5HTKunvMQhkyFK3lWKyrBnar5OrZC9EbFWJW0aBXIaz7bQT7EGwyQKiEqHg== 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=pFKutj+UYchSO0DbgSSNM/aWciHqDgzstbWnDtWykvU=; b=a84SnQuS9EQttgUD1B0NnN9fVTdGURPAjQOdtwGLiAMbLve8fwBty1stqpltFttubCyRJYOsqppJC3lWV/AHMXffqQJwS/WewtacvFnKHbNT3vQrn44h5SnBiCp/gjwpjgVcThFQqOsqOTlYzpNEkNO1ZmP71Bh+Cty7MzrkxW0sLDzgANVBEnjelB/LCPGM7uGrmD91ZmdE6b9xNnyoe5Pj2QSRQ/s20IWI/WH0ogc6hG+XCjxTVeZcPsf46miMmUXI31Mt75WWDzV1KAeY010u+ALCo31BPPaKsmNvg/fdaSIc+M7X0qToKlmyuu25R4gLG8HArB4PO1aqRFJiBw== 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=pFKutj+UYchSO0DbgSSNM/aWciHqDgzstbWnDtWykvU=; b=DBTbL8OvVbUY5tFftVCtjgwlI2U7VU0NGqRmpHsMVvIkLAEAOiU66pSkRKBWcNDS9J79it1esYE6fVCzWDiGDg+eHKZNEyDaa65G6/xwneZBIBfBY9O8XLTBKy+xgCPfHr+ilJiXjL/CfO90AGLnfLn7TuO54gv0nkgruaxoDJ621TQrum22r4Xq9f7ryNa0BOczKrjfJC3ou6y/TQ2tMg1g7a2NBgOHRCDrZqePvWOxcd+ViQXZQGl8FFj9RB9SLW/+jNp8JeY7Pr8Ww56gq5r/DkIc3QjcW2GgYnrhv/dQ1e22wgRbKGG4WDTsRY3rmS4ft8VgH0tFgG8sRjAiiQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 16:39:45 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Tue, 8 Aug 2023 16:39:44 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:29 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [IWtRfFwF6DNT6W2lpUdIH78pAL0yctDym9s41JVwrvU=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-3-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: fd65f8dc-cf77-4083-7a05-08db982e1252 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKy65eRJXb6jJynmsNGeDtzHVyKRQDApxHRXCmJBE9MbGcCm8s7/tbGlhByifqn3YJxqFwmgkzI6CmleEGWOTFkdDctX4gigVHY+NlhCCYyYvI6DXe3hlIlPtnjofvesS4VZo+cbTrqs5ZOElCh40WdLeVTv3Y/9Zu95+u+x4+uEAbUwJ6zAr46dG2aFjjnSBmYkMO64l7EGljZo5EJrbExrcIcy6gFtSFxhBvQ5u1+WWcXZWWJMIozUgq4YY2IPO8ePNksZ12pi2MEywDYdaCByyfbmM28B1fVKiNKRXfdM7TgRXw4LTlHZRrNUAmFx7HD+bSjc48LkKKQNM85wN3vC2PJp2qV4p7Tjum00xjmdolxsfWBwy3WRHjdx76eM1LCrPlNTLYhhsn/sz1tPq4eD9d5956sKYnPJGcQrhsZLzJiFjoGV8KjLJSR69rXd2uP6JxFLxtte0U7XtrddQ6gdWmFp4i+2JiVyj3gr9spdMkxE1U/F8ISoOz12raCsKOuweA5rgvdUWW+arMYJrdIchp+cMimWHOAsJBjkCe6vNH1yy4dVGS9OfROfqNmmjTxslUxcWdJ4j9GkCjqTeuRXM1VadQHgp3HmGkEwRXFFbiKIPYnXSBy7fvjAY0lUZfXpkulu8x6PxP2+zrz3LrdR3zxSQJlR3W0fykfikI/tMxiDrbmk+eah2dfUKY4dxFcV4eMLbUY/+DT/fK6HWjqyWMYs7IlfNRA= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: IwvSwWc4vNEJk6gE/L5GTtju6IZdImLYHat2jVPV17exXagPpC7F+bKtcfrCJ7JZzLlQiLT2XB/Az+6MWoqghNzFYNWIVX9QiTc94c5R8t7QK6XsDcMXoZmX10RkDDuTnf+Ljqc61Jb+RcksK8XqvaBZ0lcTECYyyy1yYdEaTd63IsTgjnDI+ha/s2QiEJaK3sYJf+kp+DnEDme9J64XUitEPSu2NdCdn6gKh9J3lqrzn/nvOsMnBkiAUWdJ4idNy6QCNHMfD+I4UC9hS+bvb9ECdN2ojiAVOsVSV/yzRyFZFCFmnVCpgjYZR/c4kL2VhW9A17p7toJEuscj1uaKHIdks/lMuqrJydffZt2r02tv+KqxNRV6NP2o3mp22GqW/CaFxduTH8b88qiOr9lLBLBR8tamoAlcmF6873xGQt3Y4eh5bISQXtiU8UPBIeXctjxNnAM4Cxqa7Abp4t7/bB4xkc2vySKVMabaZwoxA6eWUzFPlFnIZJhpQPjVll//y/tEoOlpoiCxHJFjMWVrduBRGNeXpPn7Dzdnng6DAxzmZvv0NyLU9f1QRrJgW2rzZ7IYC5Eie0DG/F5AHFDbWM+aBgZyWflE/g5f2CjL0c9Gz/RVfHDUU4AtXUGbHys7 X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: W7WtMpTv1VLDX9ruLGjDmL988T4ChymJ7JsEPhFsr38XjW3cUW6u5sUPZ3Focx4scPxKreelRA9iiIEZDEyBJVBkM4fP7pujK+RcTvg/dRvVF3fBXk8+XrPiWqFBEYKY198LYrspaHwm7+edgxpK01dAuROHgQ88CxoqFgUqpTghLxgvuVQ7Fjibp8N4gGR/kmclb0TpUNMRKjzYeiH9voVXL/IGAp9tD8qYx10XIsdV+PPq3AiUmgishvs/6iV8RRq/3KH/SqV1HrrhY5X4y3QEXi46ctokKG4oksihbSijJe7Rq+c8B1PK16wLNviwsRfKxEWylIA1+9Mbw1y+6/5hTf8tC7b6BsEAGqr3/4wns6amj2E5vMS3ZC+lJTmOu7r5jMlfdY75KX9/KdWJYr4+XI68ZnrnRe1oQMs4Os4OVjiwVXHH5KXG5y4abeZnJWfYKhzs+1ai7CZK1IXHoBljFo8gl9whHFcdfNIsKh66TmlEknMlRissNZz5NUqn/iaulo9BUGqbTI2xJ1FoT85P+IxymtnHZTgpgI3HwSl13r9xJvkVGKpBdB4RmCEkprfiP+wV+5bxzitmGdC06u5vI9XoCJpAHHTV9cVqEW8hXoZ/3OldDvz4lUQQwI951MZR8zj+GgxaAY7HPN357RkwtqdvTcZcnFWA0hop9EQuB8LUixEGW2JmLoCf8YifAZg2dgLdhNaVfHZPnZE1OsCiPFT3fswGwgc9331riF5d8iLkqtPZko1hcXVHTpwSoZ1xvAWPOhJFBovM95K9ol/zelYVmAqqlfGES+Ddtycb/Gtu7kOxSvfRz8rBON+onMg1JaX4tLVNT68yKTqCPTFy0evK8J1qv/PgSabucBXFwsfsJy9sa2yKTxqhegp8Z2Et4+qW8k1sFlK2ImQhCLNyvkN6yfWfmE2QShxlVsx1TvX+niUgDrQy++qma8ob3SpIZbh/1T5HCfrl1FG/jbCbdLuMJnxOZTfGzIDsG/aUcPwOd4tutegj2D3mptsYgSVPr3KWPMe1CjPSX3AUGXrzFRwn4HZmc3Pn+G1CVaSLlnKcMAjgUsWU256fcZwBDuPwco2pljXP9fUceheCvRMo61EgNJH8ecy9+zn1OnH129is7NnsGJsDd286DZooijPOi7abcTtiWhvj1tSg36f6JHkKpU6YGddwMUd7vglPhxe8kxSQS2B1PL1bhQfadKIbh3cBnn/gPR86pB52tX3kOi+elocu/bq1CA+icJ6eP1eV/UuoYuUt32aMXS1j X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fd65f8dc-cf77-4083-7a05-08db982e1252 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:44.9409 (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: AS8P250MB0268 Subject: [FFmpeg-devel] [PATCH 08/15] avformat/matroskaenc: Use proper AVIOContext 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: +edMsf2ilTQ/ These two AVIOContexts currently coincide, but this is not guaranteed to remain so (in fact, I have plans to write each TrackEntry into its own AVIOContext). Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 9fd4cf2f6c..bfe6342d9b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1679,7 +1679,7 @@ static void mkv_write_blockadditionmapping(AVFormatContext *s, MatroskaMuxContex // We can't know at this point if there will be a block with BlockAdditions, so // we either write the default value here, or a void element. Either of them will // be overwritten when finishing the track. - put_ebml_uint(mkv->track.bc, MATROSKA_ID_TRACKMAXBLKADDID, 0); + put_ebml_uint(pb, MATROSKA_ID_TRACKMAXBLKADDID, 0); // Similarly, reserve space for an eventual HDR10+ ITU T.35 metadata BlockAdditionMapping. put_ebml_void(pb, 3 /* BlockAdditionMapping */ + 4 /* BlockAddIDValue */ From patchwork Tue Aug 8 16:40:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43183 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2408643pzh; Tue, 8 Aug 2023 09:40:39 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFKlbV6OiR74Tkn5hKvf5iePuCsHCtpu0MaJnjURKKb2YXVGn6frjmBDtV2YnKTFTCo9a9P X-Received: by 2002:aa7:c695:0:b0:523:2b9e:6357 with SMTP id n21-20020aa7c695000000b005232b9e6357mr286304edq.35.1691512839708; Tue, 08 Aug 2023 09:40:39 -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 g16-20020a50ee10000000b005233795f440si3411007eds.359.2023.08.08.09.40.39; Tue, 08 Aug 2023 09:40:39 -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=q5YcesXo; 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 5671068C802; Tue, 8 Aug 2023 19:39:58 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2103.outbound.protection.outlook.com [40.92.91.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 7E79F68C780 for ; Tue, 8 Aug 2023 19:39:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Wp+UjRZmjqQLNhGpzy5CcDB2J+RPahOtfCpepWBOETL2bL/7OwCwKFluDvHw9O1GYvp5LvINqo7evAiSSzYot2GeM204x5upmq2uApDi5pw5HoNAOzovqaf74B6uYxJWHXau7zVLtzwUD3yASSQl6xZooBz+vYMoN4SYqC8b/cWICYceTrNM1/Bc6K4altg6pNKPPjpszPWBHbPvyQGcTwEsQ0JGkTFhi8ot/ookn98P4Ytc5tDAsEYYT/faNTrIRd4HquixPbHuxY3FQ7OnXCIcvcpQ3gf1PLVpnRY21aajARZ4uyEysp9rPqVGvqDaRLwbwYgC6cAG51Czcspmag== 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=XMPCQLgAP1EJEK3C4ErUe9/MsX2+WUWiEmBGP3Q7Yso=; b=Nv+xwm6FDCh/u3pJHp9Oui7duiZK0nRmndjVkoEXRmGVAS2GsbNBRZf0W5OQx5VFD1A/8fb1NdlsTNcb7VIRcuuQ2z2POulmIht/OEpEnswyqRHqioW1821fAlidoro62UWUeLZYIhxmn6mCch0YEVl6R8VTeOV2HNGuXjZmlOgG5ioBBx2k0EncmLgnv6KaxREr+v8iJHVYvyGRfColQHsipdiUYqqmYDYmuGfriLRRg6cdr8AnLFTi4hhfVuw6RnF7D2mJrh4EG6gKtoWG/8nq/0ABrkidTOGZXuR9w8sRUaR1uf2vPzxn6kL33V/N4Mx/SOZk+B1a6rbJU7geiw== 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=XMPCQLgAP1EJEK3C4ErUe9/MsX2+WUWiEmBGP3Q7Yso=; b=q5YcesXoKacZAyFqP/tMC6sth4L5MnDsatc+w3SrrD/A7iVb+cznuoCQEGSgv47dyF0fcTxC+xIUn0fWGm6PO7iv1qBuQ4ziaFrwpkp4FTjh/cOQKzntagzSRRLEkUpLN/tGIfrbMg4UvDPEJpkGvx+icu1fS5cQ6oOpS5pA7LpmqHKtXC57nd3haCejePsS6d1xqdtu0u4bVshisvzRxJnSG7eoavYEn1yhzRA5IqkklxUpzP9mlE3zw3M4tR5UkOKQ6+YNEYS2W+0QHfkhW7NnpdQskeG8WM6w9jsA7HqogUMEL6k1hi8u+3VRPHyHt52f9bjSjfG9Glz0dgD1/A== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 16:39:46 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Tue, 8 Aug 2023 16:39:46 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:30 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [19/Um4CC4aTnbL2pnv91eZlAqGMUNGHsMkQppGiYLyw=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: b5b18c1d-2f3a-4b32-436c-08db982e1305 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoMTHls4qxpPCYYkh36TB/2pp2BwPczA1nSrk4ZV9zZ0MfOZvEwU8EZ3Ufi6KLRoIepwA/hJFdBfrNVtLedROtPfegQ2wXeLbOykzbX22frQtYlf4XLJ5AUBG32Yrb5lJhl3MeWqGz+47Acr+B8ll8prZfNu8OePhsNi3vZm/8GCVRtoRfNsv+HW8pcHKI5/bZrX6hEmHieDusXXS+FQgFRbPjPSVeSttXJI5rXpMhb9iLrp2AxENO9L9UKF8dqpSelasA2OxGl1RrfZm1N8rOgNhcrIb0jn9+Yr1jBZ+fmxla4o7S4SXMiPNGq5daF3J6NJu54hJ5bg036sYPSC/+ayZi4ydydYKipoUafxS0szt6a5xNqcSs938udkvvPMg8nx393HXQpMBb4E+NnNoimYhYrnwH+S7Aj9Jp9bgxPTgRpjCfOsp+Lbas3jsO7W/gVztChn/HJdKJX0dQ1+a68BLDPok5NuzNIypachXhkfRKz+a7EmMKOPNaLo+MEp11rM1axJLl0RCMBfrdMIwzBs+xp97XsrMcUBdcDeJZDr7fwlOR5VLUllI49tna5yFA597zgY41H9imKlHcvL2+uiwoKIk5wvmQQcUdYC/3/F/Tl0ngxUdAdP0dawjBtm/V+V9OlZthsaOIDSPokWApD4ODqdVQ4qNfZXfNAk5pcyOSveL+pCuZGg7XMNpbY9NDOogPFJ2I2gxxrhD+Nj6L7mNyreeC1OZXnq4I0PSzMxUwzBh0CA5lYULBpItl/UCg= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jjnrHCwP7p7dU7oLunHr62eTcb5J1+3vpGxgB//yPZwXV8C8IOJBuvy5s+J6tPhLKNeEyMFDsLaV2xORl7EZDIkFqJLECGXqZRCvPBkFaQTeFJGm47T8Ar17/HzOyZSGfW1MuKvIhziNOhd6Q/EX5k1gQqN+MxB41bJRj9XkS2ZbQJBcuUfGA8820AfQxn5n3oiG58Xj82WTeqdLNmyjZJmeeAKs8GCm9Q+ifLWcl7Vq8H9yvX4HR7uOtmLFZ/fM8EYV3A24CMCg4GQtjYx+29m/MRYXK0L8ewL+Oe9UpKedWISa+jm6GWOjT3fu/00BVcUuGz6JCuTS/7a9xCY6wk+4pLPDypBv0gwaB2qbTs07KqGpdkcK5y2PwDHZb0vj9kSe36PpViAXWIvhsqu0rl2pONvBiBc+lsexRUcuR6cswsw5mTOC4rhmv5UZTRNAPm+w8AwuLy6gKUApHT+XrhWz8olKzMIB3X3KIWYFOlR58b1s/z4mlrbVujn2ib2bmDKDUFaVGEnNiQetz3OwW6VdFhjShrJtspBYX8PdQXqv5m1B2DwmuRl6reLbSTI3XgfX0BfwZ+vjMVOFne8txWGnf2/GWCdYDvX8XrI3phk= X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: GI+P4e/CgatOFo1Bh/jAF0+H2OcfDA517M/YlwoTIxax1SbAPfNxvHU4KoSRG4I0/CPPoShom7/6aYqpNZcwB/n2gJJbdHQqVw7OBtfKNjg20Y6tvaQVYS7RDSphnTpMyRPRZimdfrYxHfUuw2FflT7eJ0Df/q5OaXCEHLppMJXqFUX6kbzjvCWf/CpnHA22NEoBq2U798/w8JwGc0RYNY3Z+zQA+VngV+C5yJk8AXVmx61/Kjk/yP+GfxvMIdk55L2VwuslGdrDO/0QbNbqPUkxQA+9M/4ErG8MF3ok9RcF6meaUlQmWf8OQT3YO83CA7n5axqz7k2wxUqYj+PiuyvChuc/etZxggxTGeJNtJlkOFmQz1YKV4UajvVxHJjMi9aCbqATPu+A6cYYeZABUL0d8u7fpL3X8IS9KxRnBlgHbRqPPRciqIfEJjoLERGdyLJSnHbeGzKtXClxCZ+z2CD4DUEpgzxDYlqPklDZ+b13IwIem+EbT0DdIrRn9KqgOPXIbSwmDe/zEMnoaNDYkewP7Fmv2Q9XrOxuPh7HW/ZYw6Eq/ch2RzdOL84KpSvXqhBXxS4aSA3mOPD7CeISeTI3hGkKDL6PSw8AomKatmkcaUiqP3RPj5o6LKeRGqP27QcvuTBBf1Mf+UpI+yES8SrtAvQ6mGuA4N62vMdDO2Pkr5GjAwP3HkK6to/sTILAGKpsyXm2C9MgTS3v1sp0MTTpftEKpJ1oDJAFWda2RaWEnEOz3Nz5nNBb6+uaM14yWGWO79221MghHM3AkZsel38sPalPwvKnyV/8QznxTzaXBdqKXhvk7n0pH5P66jRsjNlca719qOJOHBE3IcVBMDaV7aHsVHgd/zDYGG4dW6c6TVHw4jwq4IzIWDwGb+si/owHGzfVzVAXvjdiD7hC3HcnIhGIbtwKdVufw7b31JizURR4TDX6c7GD5rltCkq4S/JNhFab5OoQ2sTnyh8rb4zlNr7UJMfRgfNicCtq15VKlfAFRdz48Kfc+VkzWCSdJgh24eSyG9FfSJPAHbUpL8QD8sMVIQ6A3rnPacnNwFt5sEVWq7A3gXBwtsAhYVxyj11sqrsGmm6hGIVZcS8+sMhnxDebxDL82r5twjrdzw/KMOlvH84WSQND/OJEDm1WzlcoY722PHpgBUeuLGDqXotVgNktDTtS7DYIfSoImHlocE5+imNyEHyL6mf4recg3uHwUJ1coq9OusjaDO+gzgC2xEqGPWE34rdZidnnT4z3+T+V3FIHCjyeUJcJX4Co X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: b5b18c1d-2f3a-4b32-436c-08db982e1305 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:46.0547 (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: AS8P250MB0268 Subject: [FFmpeg-devel] [PATCH 09/15] avformat/matroskaenc: Use dedicated pointer for accesses 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: l6YSeA3iYs/h Improves readability; also split overlong lines. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index bfe6342d9b..323379c8bc 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -3200,7 +3200,9 @@ after_cues: if (mkv->track.bc) { // write Tracks master - if (!IS_WEBM(mkv)) + if (!IS_WEBM(mkv)) { + AVIOContext *track_bc = mkv->track.bc; + for (unsigned i = 0; i < s->nb_streams; i++) { const mkv_track *track = &mkv->tracks[i]; @@ -3210,16 +3212,20 @@ after_cues: // We reserved a single byte to write this value. av_assert0(track->max_blockaddid <= 0xFF); - avio_seek(mkv->track.bc, track->blockadditionmapping_offset, SEEK_SET); + avio_seek(track_bc, track->blockadditionmapping_offset, SEEK_SET); - put_ebml_uint(mkv->track.bc, MATROSKA_ID_TRACKMAXBLKADDID, track->max_blockaddid); + put_ebml_uint(track_bc, MATROSKA_ID_TRACKMAXBLKADDID, + track->max_blockaddid); if (track->max_blockaddid == MATROSKA_BLOCK_ADD_ID_ITU_T_T35) { - ebml_master mapping_master = start_ebml_master(mkv->track.bc, MATROSKA_ID_TRACKBLKADDMAPPING, 8); - put_ebml_uint(mkv->track.bc, MATROSKA_ID_BLKADDIDTYPE, MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35); - put_ebml_uint(mkv->track.bc, MATROSKA_ID_BLKADDIDVALUE, MATROSKA_BLOCK_ADD_ID_ITU_T_T35); - end_ebml_master(mkv->track.bc, mapping_master); + ebml_master mapping_master = start_ebml_master(track_bc, MATROSKA_ID_TRACKBLKADDMAPPING, 8); + put_ebml_uint(track_bc, MATROSKA_ID_BLKADDIDTYPE, + MATROSKA_BLOCK_ADD_ID_TYPE_ITU_T_T35); + put_ebml_uint(track_bc, MATROSKA_ID_BLKADDIDVALUE, + MATROSKA_BLOCK_ADD_ID_ITU_T_T35); + end_ebml_master(track_bc, mapping_master); } } + } avio_seek(pb, mkv->track.pos, SEEK_SET); ret = end_ebml_master_crc32(pb, &mkv->track.bc, mkv, From patchwork Tue Aug 8 16:40:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43184 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2408731pzh; Tue, 8 Aug 2023 09:40:49 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHcrPSVKZvX2Ug8CBF9VwPpA/W4mEztr4Xe0FtaDHrA3vW1RFa+zQPBknVGQTy6BPfq2E+E X-Received: by 2002:a17:907:6e20:b0:98d:abd4:4000 with SMTP id sd32-20020a1709076e2000b0098dabd44000mr11623286ejc.35.1691512849221; Tue, 08 Aug 2023 09:40:49 -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 lc15-20020a170906f90f00b00992c195ac80si6456292ejb.357.2023.08.08.09.40.48; Tue, 08 Aug 2023 09:40:49 -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="SZ2/thR4"; 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 58B2668C814; Tue, 8 Aug 2023 19:39:59 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2103.outbound.protection.outlook.com [40.92.91.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9422E68C7F5 for ; Tue, 8 Aug 2023 19:39:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=UuMzp7ahLUw93YV13pZR1gqxmIyWgTJaBOjQyRe7c2XDgkqIMhgVP41O5+uJVYXJvFyrXalPjHNRwn9PvPTaGp6calstfn6cxqsQNQCUeDDA4xsO0zmYLu/Mp9++m58qkE2C2DucB5y4YKFxfgHw1/1PZjKhGKoxYLilZ/AU+ideq4TLRvaW39Dzy0iK883LXTc9f+C/7qx8viCQTvJ5/651kDBcj/CcFq2OD1myLYEKfj406z4J0s+Wuq6U6LwtEYn0OmQ+Ke7qh0xBK1fBGyeUQ03MdfH2LjCJ+xyp7JGpWwy0DJsAzKrg+bU00RyuAvWcy94D0m2LrM+dXD2YWA== 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=OJFPC0BAbz4Z5+mPbAMFSu5CL0FDKH/w7O/Ix4R/Twg=; b=SjQi1YDcJbQ0h7IQ7WdwKUHTaaxxGFyQYPEx28vlVoYjV2D6uIWbbtTXDd1B/ReJH7q0Df+RMWk7e/9YbKbprnHgokcQyrTT+HQdQfMEhr1Qu7fvR505CoeuwLb3t3KZvCeQwuXHg4tIQxX+oZeIQN2wl9rf7S2AmQwR+bGdJiIQZTT5pm9J7oZAZAu8WeLbj4UtBS2H6J5MQVudj3J2Up/7Cxo1FiuZMkwntcjqBKRSUf8y3UBIgftVSA4FeKHcyVvu2uOzugs3+DFUKeF0tva5kOXRVNGRrLJmTBa/z5KWbhMciOdXeSs1wrwy749EzFWpYgCk1ZfWOegpaGRZhw== 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=OJFPC0BAbz4Z5+mPbAMFSu5CL0FDKH/w7O/Ix4R/Twg=; b=SZ2/thR4t2mUmvmmURt4j5pygH2ItFnOgQp3o3pJd/h8vi/XXS06GSVmzHopJStxZCD+IHVF/sLfOcynwNV1PEWzQXJwsawAd1BvLAmfSLL//GsQ20WA3tHZjy+fBMZYP1ehw8Hz0WlrtfyFl3pydvJLwU0kxnsawdtpJBUgvZgOG95L5OL8uLOBrAjXMoXocEZynAeytWpiM9b65BqyCRR+sfyppnGrGY72xRVuTuyfESVnBGb9doIspL/hZLiS8dRGJfCkyhb5WPocnYiyfdWaskxkXEz2/tfvnLylOXA0XGp2q+NIAZQLV9XBSprl8iMfVlBDIU8ckM4b6jytBA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 16:39:47 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Tue, 8 Aug 2023 16:39:47 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:31 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [qi38hu9QG6/fKyimtpg5J3KWGxXAfQ5q5R+7dbSSszM=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-5-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: fc442ea5-4c42-4568-3611-08db982e13a0 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoMTHls4qxpPCYYkh36TB/2EJHcLiUnfOq+NvGEcDk/E6WA7vFSldhJrR06gvx+6tHrGfAzVxDRkBj8XNRoRlZ7b8ZqxAU5HpfEfEOlMeEcz90Mdw2g0gHkKsjyc4OfBqRUV6vDsYAqOI7zsD4uX+1LjMpDhEEvmhhKIo/EpfpiGitpsY1g/UgCuvqWM8Be7YiWTRc98EFcv2ESBhk5c60IeXTe2OX08aAL4xPZIUQ9UP9kHlfIoiheGh4kDbuu32/WS81DU/sdAqxOJhlOo0MR7jtPgRvlJQrjjeCGqJPyNAjkIrzwBu1aWQx4kxCho315PxZjjZ2t0vvl7bvAkaIpe3DWZobA3JCM0uHjyZK0KzGmP1GjiRNnjqn/Z8kh5+COi03M+sj5t118Fn9YET7RjG9AguV2icaskM8sYlsTBfugeEIWt8Np1ddQfZo6hbausM7aF20oVWZGwHHTNKDMqpjkmduj+JcBnZtBv8fA5zfesz2jsAX1jfdViQkQpsoHN2uLwsB4ggUYt6u5vjArladzLxyMqDnxY4toV/M6V9p6Db6RyY1sLA9dyu6iz/fHzLlywjGDPLIKI0hBh5kDPo5ip4GKap+AuXns93tvcnE8M90bbLjiml9PtOHY92XPfqHJsVknJaSuhso132l3y7y9V0iDjsg2UrjOVxgMIeWFweuqxFz3npfWhK9Q8waHYXuGAml4zC2Us/hjWqt8eCqCisrOo/ubG4LrExGXXNExUbb2iwsmxJ3Hwv7kWDs= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: l/hjK+uivOVlJiCE0+3lzH8Lsi2nBqvvbqWFJWkpOH9VvSZeA5mj/NZk3ffWucSPMF348hVbi/Yyd8kkf4I24uUeXFvwImDuRVPvpsb4rmGESxkZqmDu0r905zZ5YzTxuScw8BJyUyv1TcsQT/2qY1H0lRDsTTbLU9Vw/U7ea8No4gLYLzyhlRV0taaBGJlx6RNlKuHUUBmxv2GE+PpzDc/64Wi2afEEXXbBRjskVjcJEIXmnzILTySlxFv9EEaE7dfZGXHnsb22Xx//5khfy6uK7Lhx9Gpah3GSEqREztR+mZOydKt+k9DvKf7exmy4KgS4GmTu0LTLsoNYKCd4aBSP692o9e3e1ki7U58P3lWMGpQ+h1/Yg/jHN/THNvhwjGzXbpYd0QZ2Zqq8R+dg8vNgfEZpWHFvlOjfVgoczJsmYG3G75Vy/CgKAjWg0hUgFwDvHc4MLaY9kxw6eM+FU8yqifKLRsIqHD9Z355F1dKYzUpCTsZP82fhUSocpbejn4namcqOwhKKxcOxO4WSxzPBpKnoOTWUmk506jyKMAq9BtmvCshQmAKZntRifp2bxPieq7j5qEjg6kZsy7qULQMKZ9/6Q8V2+ChRzBj2XUHNdFhN9HO42I3MKkhUU9Lt X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: x1RyJ3zWCsICRmxHrHzHYIcOxINnDsaobsmyzDlIl1noCfG4IrP/ygPmTZTwu5VH3Nr4LljYqe8BGVfLQHdErrs73bte1mqXOdwx70n7eGVo5OKto06wYwTnJuc14b9SFajdFRxKLiqmrmmcQJTJ0SfTXR3DcGvpMdb5pHJuTs3zas420WzQWGVuijyjHVSa++Bmi1mnFKTXiKXIAhjLmNcPrBUkeNPmgixD8Xd5hsmq/+X9yZvFV6vv5+MgrZ1Is/sM7CytzUGvd5jqQ+djCnCF5M7QS6BdiNA7ML3DQL8F8oW2J+mKY/sSAVQ5Bj8+h3ROltWsgYxreRqkRrAktqSoQ9Qft9t+2hiBfhVC+ZzjSN/NpBxVNieMym4tMEQx+Mh7XaY5MQA1Hi+NS8QJZCVK5iyVFm1G31tk6ck4AjYlxI5lzOQTr0gD1NT+r66LF6QNV1QT1AqC3hDsl7D8/Y2cw+Lis0koy9LUvpZC4czr9K4MUU+nlovWO93jLEW8y2F6JwKJpAFcR8wky1aYzHEgg86rUYe/QKuF+/8OHJhyNMFSmfjIjzuaNi34I4fDPcazEE0hH/zO4OJb+Q9hEH/TbUcssbXuei/cBY8prbbUW5/Kr3C+FGdUziEq/6uVkuQM3InRBhANec5O7GDgEU6iCpbpKiHooRGysfAa2ZVVm5R5+/E+NhddZQQayb/dYmYoHQ+qs95GWdSrMeEV5JC3zJb/kughxdCeH4dD16JJqUxjvz6jM1/LPz1qb44xA3EIlwymRJ4xCJYlfGjZBBK9pEfrSVcvM0rIejcC1J+vxPwIxPmypJU+onlqZhAGb07zt+yjS2hhhIsCwuyUFLrduOPhLQuaJBmrIHeaWz3xFULAIQ5cAyNAzZWrtXnfQeMvta6M5/GikRp1IElZNQhFpXdWUKMRdPliyvv/LhAn/elk1qK+SiJRSibwtJELRqzZ3DHSyy+4b3alo26K/jraYGV9y75XNyjekUo0LcJfdJ9yRmLkQZuiAs6owJ0XwjCeBKhs4DzN3ZGcW3l7z2otUvkfqGUMLRGt8TUGFWCBf9UFDV+SpK1crPTV9f2KgB6eyWQQBMIH9Nc1w+gIrhbXlSLpB/nG7/oIx4B2z2SzSordBpSQvS44qzueYlBEnhvpTv/6uaSBrBWGQgWg3jDgK5fsgLO6w+2im/K+czMYnlp2ax2sEec2PjcMt6+nSc9xeEMnv5pH15Ffuzxr0q6POcIWOBua8cUOw7RyVEJBBqeKCCcGSrQSDFzgl3Mc X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: fc442ea5-4c42-4568-3611-08db982e13a0 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:47.0526 (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: AS8P250MB0268 Subject: [FFmpeg-devel] [PATCH 10/15] avformat/matroskaenc: Avoid allocations when writing Dynamic HDR10+ 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: YU8Xg0+ER1uM Possible since 61b27b15fc924d7fa35baa61cfbc91568945f5db. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 26 +++++++------------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 323379c8bc..12a28a6b5c 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -2709,7 +2709,8 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, int keyframe, int64_t ts, uint64_t duration, int force_blockgroup, int64_t relative_packet_pos) { - uint8_t *side_data, *buf = NULL; + uint8_t t35_buf[6 + AV_HDR_PLUS_MAX_PAYLOAD_SIZE]; + uint8_t *side_data; size_t side_data_size; uint64_t additional_id; unsigned track_number = track->track_num; @@ -2765,17 +2766,8 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, AV_PKT_DATA_DYNAMIC_HDR10_PLUS, &side_data_size); if (side_data && side_data_size) { - uint8_t *payload; - size_t payload_size, buf_size; - ret = av_dynamic_hdr_plus_to_t35((AVDynamicHDRPlus *)side_data, NULL, - &payload_size); - if (ret < 0) - return ret; - - buf_size = payload_size + 6; - buf = payload = av_malloc(buf_size); - if (!buf) - return AVERROR(ENOMEM); + uint8_t *payload = t35_buf; + size_t payload_size = sizeof(t35_buf) - 6; bytestream_put_byte(&payload, 0xB5); // country_code bytestream_put_be16(&payload, 0x3C); // provider_code @@ -2785,9 +2777,9 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, ret = av_dynamic_hdr_plus_to_t35((AVDynamicHDRPlus *)side_data, &payload, &payload_size); if (ret < 0) - goto fail; + return ret; - mkv_write_blockadditional(&writer, buf, buf_size, + mkv_write_blockadditional(&writer, t35_buf, payload_size + 6, MATROSKA_BLOCK_ADD_ID_ITU_T_T35); track->max_blockaddid = FFMAX(track->max_blockaddid, MATROSKA_BLOCK_ADD_ID_ITU_T_T35); @@ -2807,11 +2799,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, ebml_writer_add_sint(&writer, MATROSKA_ID_BLOCKREFERENCE, track->last_timestamp - ts); - ret = ebml_writer_write(&writer, pb); -fail: - av_free(buf); - - return ret; + return ebml_writer_write(&writer, pb); } static int mkv_end_cluster(AVFormatContext *s) From patchwork Tue Aug 8 16:40:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43185 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2408829pzh; Tue, 8 Aug 2023 09:40:58 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEwauwMdRrcAPxpYAPbvfIySY7KwLqhegqEgdFJjCLPadkWsW5kwgf7YiCoEK7ahAfuuK4L X-Received: by 2002:a05:6402:184b:b0:522:15c4:b5ba with SMTP id v11-20020a056402184b00b0052215c4b5bamr357665edy.3.1691512858155; Tue, 08 Aug 2023 09:40:58 -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 q20-20020aa7d454000000b00522b0c92f4csi7593813edr.353.2023.08.08.09.40.57; Tue, 08 Aug 2023 09:40:58 -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=hfbZomVG; 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 63E5F68C81C; Tue, 8 Aug 2023 19:40:00 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2103.outbound.protection.outlook.com [40.92.91.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id AFE1068C780 for ; Tue, 8 Aug 2023 19:39:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GXxBT1A2j0tYD0fjBE6TAbnQZn8iZkxd2khYMSV9+MlHTCTOX6G9DjCzRwPZzwPiLv51Eu0EbTIEbYs79nO6wRsqDnpIyYcN04P2d+01rE1A7Qo2eKOK6JYX5vvrN2ofNxTFSmQHbrX3PkRsES+TWmQK8H0TvvMWvkw+nR7HvUjJDkRdV/C+QYXGUuuUCkUYhMFJRs5cRSHvQvoZl+4paZz+tJ0RPK5n7n17Zlcjc6DZ0gKHcjQC12qPKGzxZS4SsWJtEEL2lZj/QlaGQmjwd+d/tf4uPY+c2YaQXlLHGP06Fjc0ZzcHL5xVQY1KkxidQHxLvMD6WS7mPXUmllJBuQ== 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=Guwb3t8uIy2FkP1gYqa+7TDdglYDWSmyRFNXpFNpwk0=; b=Oxc/GsmU9YjfgWMt5hpZo3Ch3r4Ib1fXimp0nliMF2v19qtGq1lNdozJBC5kw7l5FEZZ++m8wEF97EbOEJjat5ZTecBHrngL7IXhJOOuDvDuZ55IFF6mJ+uv0rhMETATaU39Q8DoFqXQJziUYAXJy4gVGkt2eqQrMSxTfm0iuyDe7/RkSH2Pl2EfhT/1jSU7da0pp6XUzPL8C2j9YgPkpn7JSoDYsCSYExnnIE6CqGcdclBlYFavYlQSfYZ8sbZtVbW0tu1cM4LcAeLkxHg3bJ3lLJbPlcS25fLRcK4ax7QbnjlpIWTgyHBHeLPAwRGfLvaVK/nhtn+XHJUXyKol0Q== 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=Guwb3t8uIy2FkP1gYqa+7TDdglYDWSmyRFNXpFNpwk0=; b=hfbZomVGSwN4U0KsuYsV3/jVi6NVGOMft+3UutdIa+3Df0hf+eZCadUxWsmZv8NVvExeDJLY+8AUxMf15a9Xq6xBdvkuXx1S0z1GbgHdFW9Y+5FRezJI85hSfVpBk/so/2evphzAbdKaj6qmot1XVPFICWw3IObAkZ4lrRf/OnqS/RwiyjexScUhTQKHtOKY12/XLWGV0uB3M7WlrHODAKoSMm7KARYUFcttZBU/65B0ldsloT3KiKEi/8WJnb44VN3TheQAHR8htm0SUrzyqRH/3C+IQvkKfmaq0m4TKgGnZwELcWyQ2d0jPhQ9+FcKyZqb6gzb8ecr45hX7kLEZA== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 16:39:48 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Tue, 8 Aug 2023 16:39:48 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:32 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [BX6i7W40K4vDYTFQiPSqhe30cwk8RgM0PGPsiVx0fHc=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-6-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: 529fdbf5-b762-4b94-0faf-08db982e1447 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3mmaq/Mhy8TAf/PrQ0Dzpn5q4WgDsUSQDz4hj9J0VJN2D/KUryEdptBW8OcVbXfFCuZJcycumZ8xDA6vDMt7Jrf1iz9dtuOmKimiScTXAV1FNl0413qElRwVzWAG3jg2ZcomwAC5a/9rscw3AOi1y7JSIxcXsHAm6xo6eCAMvXcI4nkmkmEbmQCNkdWZZxseCKjUJlaec0+3B77Fj3mve5xLct3di2viGwmo+rFb/yTtMq9S8YKIXLBlLzQVT3UuwdkMv+D0qz4lpLmj63CWGbakEZXc+isbWgB7ybgonhZogZTEPYjMH72QF98r/ifDJ13/Krg5mqF1Fj5kaAz158KnAzM6iwlMjMlHed3TIS8rRJSSSP/BM6aEw1jfxqMFGAqtUNAYOHVRIa2dY+J7IbSqSSSeLF1NfMDi4WRCEAp9AZ0XE8BAbvbHmFEbeSRPdj3aPf0aJf9WFYFwO6yThk3IYtu5+uovkptSWGoEQV5bE0ahhxNt6Wo8JMLvYf9ihkeleIMR1l1hAt+34va3GU4/979KQR0WRCNIiXkpwcTypi6vgJvpeFRgOq7i0gWeFGHLSQl/OnVt4m26t1DhYZgH/6xVs7KrnC38Vv0MPeklaxWzZFnh008qMH5L/zhrtdVWSWX1QuJqbfwkkIPbT0wn6yp40R3tdt2AJISGt6DNFaL2+B7ica3bB17Yn1X24/S2X4sOy4ZkK5aiSQ9ves30s+V4lR5mDbSiot2b/xOqEx6t39+NaRR9G57roUvcZ9H4baBXWlNqMXNh5+b9Dsg X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 2XuZrr5WEyH+Be/uq2Y4JgKTg2k5iOtqOvFMzWMH27qeWV0bh3tipXt/XF4o5avAKJjEdVVzMJ8kczvO3GvQzyHQtk4LdkEhT+LCZ952ZMIHFzo5bK5lSzywuQ2PVagkPX3AuL4L1nPVM0OZlWHcn2DuIQjf05cWo0nQkAq8ybSR6dxT15jOdR8Qg69p0uT9RqKK6vGp4Gk2xcjF2xO2fLjjxvnTIGUybigR0ig5AcKfjTeVZFj1G1SaVU1s2Cqz+Pk8CRIUjhF6dqHuTioNxAAbbRooqW44yEkcsI87cU9tMLfV5HKdCx2zeHXfSBlEWpTdJ/oNNml7Cc2RkWf8xLRvu0YydfSqw5T7phzp8gX82Yd9OQIxt04yj570NMMQxF4VBABCXt7eUZoxnPj95zkNGQgLETBkwRxFBnhZXszA8CJo9wiqt9duTa36jqEcEOxi8+wNXsB3Eg/iWn/8pZEnZ0bYy0gFsCXYgd5LGTk1iMdVy7Uos1PwmRCCaiGW8q6wGjOXx5iBeI42n1gvJ2wUXGmrTr4MyQ0fLm14WyvvwYsAtKOLGxIINslrbY6GpqvWKSIbNvtRVV7GT2LMChGhFaKlzyUeKsXK83m+Djp+g5bfcg6iLPnrJrTEfQ9J X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: uLytL9qJorg3wmc8lKXZx1RQ3imcfq6R7qc2B+/3Nt9oekt1tEqI1BabL7oKrN0Nu80vqVDhcCMK6NGygVSBVWavxnODW9RSwAg3z7+qdLisdenE2eu5Sk5m9DSNi9kDtzj1yr9+ySCKDk6wquI1IxTDtM+lNmsv0yR76CrpNjWJyimoL2W2jtGxRvlNMuJaiQrwlJdSf5pviCg/+8arGvmkIrR+i3ly176/9wnrmd6oHFr+4HbGmLFgUYTCJGwrA1ucVxirKtAf/qGwSeYGboWvfa3/j9FMmteYfegiUKwc2Oh1Fh7R9x1QIDuxihP4pSjd3i2G68ka9fUF+V8uSQSRXttiMJDs/mHvJaVjiRDvC4a5RbTRoay4VWlleKiVUIoECE0Ta113ZKAIJWwt95mXnLZsuegBpT0kSwv9+wbllJ5apJmHjV1u8HJ3hhxtWJHfdYAHiZXBI5BfrCAY61FarQHNtTr3dSgPtz0A+Hs7oYBncoEbmwMRpcWP8hSvgK7/3rxzt3LWxwRRaYI+ryDwtDLgyibvfQ4rCvQJ6gOncG/bD6WZsoP/2kRkwEbn3MzjGIQwTxmu7URv35M+11kI7m7xugj0eR3TjQfzSZLjAJ2yekR6n/Wyxf28FA0EUOef2zKjRicgMAP2OPFJDplp7gRwJ0yXNLuag7uqXSjnmxYsVuslrSUozHcwGW3E16mBeGn2zZNyWCCiYpc6gqLJ6qqsMFuF0Fame8ofIQFkF2gupI/WP4vYf6rEQBOKZm1qiYaX60lOC5FAsYnrruX6mOH2KuaDOWo5Thmt+T61A8IrRDTkRdv91aTdyIsIhpy6Xx6T8+5JTS4hFFxuIaEH4XrU1SFa5HM0Bjqv2GMLltL+Ox6gZzATXyOdNrrFb09y6OuMkSOK9ieTo6mLgWEREz+tPbFWLYoiE215antqEBjB7jnTS3CK84KoVyteaWB5LfdKT++B828ugta72P6Sb+YfqZYW6nTc8Snz0rYi2Fx/uIiEQYKWJ51OIx/pZDVHNrk2mL8AYvk1jiUi1xL/zFT1cOONJifeq3I0JuYJEE049DT+4g3RZe7Rl79BIhGmn064CkCqMuR6K2xJQgSkg5qIE0ilLSqAghP2Ca0oBqfGyHnQ0n0eCVK4kJNYnxm+3DhD9KMBZJOWDM+VhJ9Kibg9GSVJm7EZZ36aJVlN070nBuoKeMhQ4cMC58w9Z4CebOPoWEzYtTs2dYJHAw3RdwruigYob/AFLqu/i7Ih/68jrvbhbcELft8tLKOp X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 529fdbf5-b762-4b94-0faf-08db982e1447 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:48.1410 (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: AS8P250MB0268 Subject: [FFmpeg-devel] [PATCH 11/15] avformat/dovi_isom: Don't use AVFormatContext* for logctx 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: 03zaPKkQ9RxN Pass it as void* instead. While just at it, also constify the pointee of AVDOVIDecoderConfigurationRecord* in ff_isom_put_dvcc_dvvc(). Signed-off-by: Andreas Rheinhardt --- libavformat/dovi_isom.c | 12 +++++++----- libavformat/dovi_isom.h | 7 ++++--- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/libavformat/dovi_isom.c b/libavformat/dovi_isom.c index 76681b9451..c8fdf566e4 100644 --- a/libavformat/dovi_isom.c +++ b/libavformat/dovi_isom.c @@ -28,7 +28,8 @@ #include "avformat.h" #include "dovi_isom.h" -int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf_ptr, uint64_t size) +int ff_isom_parse_dvcc_dvvc(void *logctx, AVStream *st, + const uint8_t *buf_ptr, uint64_t size) { uint32_t buf; AVDOVIDecoderConfigurationRecord *dovi; @@ -70,7 +71,7 @@ int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf return ret; } - av_log(s, AV_LOG_TRACE, "DOVI in dvcC/dvvC/dvwC box, version: %d.%d, profile: %d, level: %d, " + av_log(logctx, AV_LOG_TRACE, "DOVI in dvcC/dvvC/dvwC box, version: %d.%d, profile: %d, level: %d, " "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", dovi->dv_version_major, dovi->dv_version_minor, dovi->dv_profile, dovi->dv_level, @@ -82,8 +83,8 @@ int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf return 0; } -void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE], - AVDOVIDecoderConfigurationRecord *dovi) +void ff_isom_put_dvcc_dvvc(void *logctx, uint8_t out[ISOM_DVCC_DVVC_SIZE], + const AVDOVIDecoderConfigurationRecord *dovi) { PutBitContext pb; @@ -106,7 +107,8 @@ void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE], flush_put_bits(&pb); - av_log(s, AV_LOG_DEBUG, "DOVI in %s box, version: %d.%d, profile: %d, level: %d, " + av_log(logctx, AV_LOG_DEBUG, + "DOVI in %s box, version: %d.%d, profile: %d, level: %d, " "rpu flag: %d, el flag: %d, bl flag: %d, compatibility id: %d\n", dovi->dv_profile > 10 ? "dvwC" : (dovi->dv_profile > 7 ? "dvvC" : "dvcC"), dovi->dv_version_major, dovi->dv_version_minor, diff --git a/libavformat/dovi_isom.h b/libavformat/dovi_isom.h index 1526164319..1221a52793 100644 --- a/libavformat/dovi_isom.h +++ b/libavformat/dovi_isom.h @@ -28,8 +28,9 @@ #define ISOM_DVCC_DVVC_SIZE 24 -int ff_isom_parse_dvcc_dvvc(AVFormatContext *s, AVStream *st, const uint8_t *buf_ptr, uint64_t size); -void ff_isom_put_dvcc_dvvc(AVFormatContext *s, uint8_t out[ISOM_DVCC_DVVC_SIZE], - AVDOVIDecoderConfigurationRecord *dovi); +int ff_isom_parse_dvcc_dvvc(void *logctx, AVStream *st, + const uint8_t *buf_ptr, uint64_t size); +void ff_isom_put_dvcc_dvvc(void *logctx, uint8_t out[ISOM_DVCC_DVVC_SIZE], + const AVDOVIDecoderConfigurationRecord *dovi); #endif /* AVFORMAT_DOVI_ISOM_H */ From patchwork Tue Aug 8 16:40:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43186 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2408912pzh; Tue, 8 Aug 2023 09:41:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFYQJzxXMoGqvJDzNVp5Es57hIxW4lpKIjsyy3OJg77gPIxd+Gst8eB2152siVHlNT+GK5S X-Received: by 2002:a17:906:3104:b0:99c:ced6:842f with SMTP id 4-20020a170906310400b0099cced6842fmr118882ejx.10.1691512867110; Tue, 08 Aug 2023 09:41:07 -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 s6-20020a170906c30600b00993b02dd96dsi7659384ejz.372.2023.08.08.09.41.06; Tue, 08 Aug 2023 09:41:07 -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=ZO4JNL0Z; 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 7133168C820; Tue, 8 Aug 2023 19:40:01 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05olkn2103.outbound.protection.outlook.com [40.92.91.103]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F19D968C802 for ; Tue, 8 Aug 2023 19:39:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IbXSw7MHLbSp5VgMgYR8kAfDWmaAeFADD2fCVuwFKHbJXPwg+2dwzRki5eYmFqIxHEHqEzyP2/Jit7QMuN5cn3s+qc4zDqSdpx9Oy0MiMI+YOXn6876bkBqsTMVqsuzcfW56pqNu83oK0U348twh80zByJcwEfDMPfAe/xE6XFXjvS9Nr51P0eI3626rOOfW5WtWUZO8zSYigKV79SYOH0cVmISvrtdvNpwsjmY76DtEUjfA3tuajyzoeF7ESRvswSAO5YO1PxV/K+I4BaX6yXuEiLfm2UtLT9TADmEewBP0ZT+IocHaVRWf19wwP7luOGYCSrz4/YFXf/2d7r/x4Q== 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=yhgTftEw5mKRrniLoA80fXp4AEQ903mxryMU7SweBak=; b=Q9XpS6sxGShvFj/jRNn2SeILWaT/At9zLafinopoyCgdu3BjrXCUj7Xqv+D/klmPXoDE7BZlnrN8dYfDgR31s+bbIhXtZKfKsY9ICvGUpwc5eFtoDZ3TZzcTVsPXxp7aSQNNYnFoa9ZzvaisycnjcgTPdmyvcVBiCoa1oxKSOA6Byu1AdPZ7mNeSJFRTUl51GLN2KcKdPth0W6bhW1t+z4KZQXARLz8LmbNWsi7kni2Xmuxot6iBtYUcJMpcpUsiDss5aCFgC2KvwtjTFb32+2T9Cn2QNE4kSR332l2wHWJKm1znpEaJ9arq6YRfXHOeG2hTKOp95xAVfgNQwE/hDw== 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=yhgTftEw5mKRrniLoA80fXp4AEQ903mxryMU7SweBak=; b=ZO4JNL0ZX/ANaPQJQSuD1pwuFi9Kp9hkPtdrgcx2kF8mMWm35/Wi8xIzpQZhAHYRW0kuTrZZzOQAGrwVbzxVi+F5DSXRsVTxlK61QwfrZwOdIIeMf7TsAl6gelUWTdgYtwmuLSwoCdUVxs9uAL89GvmX5N5gqkNt+zMSoSz8dBqBEE48FrwX7b8b4RLXY0dk4vZeQo7PNpgM43e0YI4P2Mka/2RmgRZN9DzfT/69O+sjC640kWGUuIJ6hbxvuBzKmqj9jmQl8EH8O/Rz89vhgO1wLuCDYlZAjuLVz1EjX1Tghkab8v/7BT87eFsGlvWOVdwLJOX272LXpupozNfq8w== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by AS8P250MB0268.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:37f::6) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.26; Tue, 8 Aug 2023 16:39:49 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Tue, 8 Aug 2023 16:39:49 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:33 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [pDoFJYRCHB40ix+pi8avsOlhWJwMMCJ1/XNAdWtutGc=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-7-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|AS8P250MB0268:EE_ X-MS-Office365-Filtering-Correlation-Id: dcb9385f-410c-4500-d79c-08db982e14f9 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoMTHls4qxpPCYYkh36TB/2RSvU+rRLrL7hgb+tTI8NC9vSU2Ojb6YTsoCj1yaHs5tN9FLxzj2eInkeWKpQqwL/y1oqK3nhaeBMswBSCM8G6lwXipzuuyvkXCS5sLcIl9AT5OoaGLxBYrzyOYTrETo/UpDSutvAH+nOinjIkIzDXCNeCx6B+9MEyKTZAP4xUNpMhhl77mogn7g8B6epAR8HAYvM9sW4xFZKs2hKl296Lop3D0P3Ay+oJBP4+B+Tffd5t5rPe0xPOsxQk0CkRhytqAyJsesElqEgo81LrOAjL/xCo0NDqmzkKpFdd2BYaGBucaHDuq6XDytI0Q1wpvvcvSeHgunfhG9d/AEFx+Bao/BUYPxUFD8kGwOSk8THInDvpF8K8gxxGTuSXVaFGSukkpyUOQW+e81AMFJBJrZzoIXJMOY/DOwE3+2QgU0XnWAUr+I0bU4YQwzP/jRPTKr5aJf8EiaYLtBfVwgrsTaFICz1vQ0X0Qt2ETRU3QS41jjaPUpAAy4HHBJn3KYLt9XJdlOORCNySacaImfFo6Y8c+Rag0v3VEoWaD4ADSoX9+txD7fngW2DE/UoK7awOosENeJalFzrkve2Ct7R8nhbuafmRO0uL+YXnVLLUQ2EkKXU14HXngi78rGPXIXRXtdcIAHM9NQUgiN24s5iTDQ70R5uxLJwBpavvkLZuaQ2AzQAyn/aHtioR5weocgphulZkCSQJVcvT8kXsrhgd95NMt2XQkcAKXMnFjp8QKrjev0= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: SzEJplDwsLFuL/ofA/d20N/XIElgkcuxxmCwTuRRPZnRh4FmVpgf3wVzU3sFrLuHXkFYCJo/VB7ki/QD5GjmQdYW8VamwHITKJ9kYmHoY3HGeUwJX5aXUjFcKv2I9q3xaoEyf9/mCdvOLSeqkeM6WnFLc4rymlkE96PhkxxMoS/kITdr+ky14ZWphrSjs/jZCuPC4FKTKX8eDSyHpEVAbQba56hqxXDoNQO9s7RgENRO5aRKjMel3Oii7WTY6vU26MaF50NtMGaOZhRFrAebikEIhUnA6uhMfBS/Vhq3Xnagnq6bBqK7EXBCAl57yQ2cst9CJ7gCPTGakNYMXLc0F3vxM/tbc/Z+fdKvNxo320PvCFDt0AYfmqwWQCaaxkVuNXbtAyrYTKVSx1WLv1189k/HiTDFhl545mwdOUcZ5pQK0hji7dzpKqaiDEIcKnJdHASEF/9frOuXF/IUArXenmvkT7qG4fMtfEkSqPmQcTHKRw9LXLzYmZxxG6DE2NsEjdiXJlUiZtg5UMXkJjwZVmMEzrS11TBSEu78cPIlJ/MWbFdft0cqf0oqvAAzBa+CyQuYN54okFYls+RyYOWWkknaSOYMytl7LgAWgsNqz45+2SjViBU60GimU9zhCaeG X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 4ekCJp8IsrxIp2eNMmmzHbXBX4sNAk7KDvmH0HjiAYAr02xiIcXp0JPrOUKgohygfnRTN+tfxfuvEkHc6F4ZU76xdS8mC3TqvUMalID3OV63zioCTEN7ZyB8IYX7GQ1m905o+KMQew+030w7mYZYZ1SXJATA8roYKE170wqXKWq8qfOYjg3iLw4xd8Qy42BjQFn0UqxIarv1wibmkQRiWX9MTYDPibSyoNt1oSs0HqIwfJ51AYBASfWA5p2WGCD1bMHWBTgPZ+na1jCT2100WlWBHVk/RkptvDlDGCEdZ7PPjFpjk5qw1EfX59sskMAvbmt5L4KIHBXISHNyEglIxFTjFPrMLAgkgKfHoQPXny/CX/1lLM0w9vwlRL638UhBibVEpJoBUmxJpAKW6Mz3wB4aMeH3JB6Vsr+fSdHPXtjFc6T05sG4FdSkq1CuJWgFA1IXh5FqOI6y1A4yZoh21Axadb7942R28nCSQ1byw+i10cSDc53QqVCM8s2hsK/yRbztWIWp0OD9VhU0pat06knwS8PgJq2CWpwdPcInFBtudGDjCZxzQVAqOOPUnSPqCm66qgTR+px4VuuI+YUTDrPcp64wdm76V9njxKPO2hzv9NfLVFDerTN+DagUj961fd9TeAOowP25FGCXwkO/8wKEhRfOUE1HnaY2OVaNhbz4X6SgJ+Cw/DxsLmYw2MbcOJxtJ248b2tTCjArRhHPBqSl67Yt0pZ655i108bIkYreA9aYj+RK5hBn3ayhv91P/3EeeOPznhhJg8XcwHxgSabTtRWM6j4jJb5JmMoV/lNzCqsQvVdQO/hDtMYc/HU0VCSDOgUgfg11kc48zXutI+mwVeJywN6W82E+wD/PlJqKZ7bB/GEntXKMmnsavTFMDyb/w2eqWLLpmDoCdC4x6dvRpWcVPKmbrjvTY3euGbZ7ghTi8tUvZKiL0mFHCUyRMGnqcT4A/4INReWwnuYiBhFQ1/2Cq9Tij4+0chFttxoCousKLMv7lrloNEDyV2Zaa2TnufaeJe095T+GOOxB7Xu59MCTIITlrn6xNU7cJBpktENlitvMMl2l506mp8YEoEXGHyRZt960YX4JLRx2cJ6zhHRrTJmO3zL5octrDLYAi7gCv19nztDtagUyNhEWYUsdlPkLwEuuRiZXaOrS3MnC9JvKxLdCUqPHTcac+20QWWswHdhN4BzuHnZynGHcay3kITnqNZcMTDT7eppB9KzZduUykVpqbRUnIueyNjETfhPeluyZQ8OioBmRjzlJ X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: dcb9385f-410c-4500-d79c-08db982e14f9 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:49.3242 (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: AS8P250MB0268 Subject: [FFmpeg-devel] [PATCH 12/15] avformat/matroskaenc: Add const where appropriate 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: NCIkFfuj6AcL Also move getting the DOVI side data immediately before its use. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 12a28a6b5c..abac70dd80 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1667,12 +1667,11 @@ static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer, return 0; } -static void mkv_write_blockadditionmapping(AVFormatContext *s, MatroskaMuxContext *mkv, - AVIOContext *pb, mkv_track *track, AVStream *st) +static void mkv_write_blockadditionmapping(AVFormatContext *s, const MatroskaMuxContext *mkv, + AVIOContext *pb, mkv_track *track, const AVStream *st) { #if CONFIG_MATROSKA_MUXER - AVDOVIDecoderConfigurationRecord *dovi = (AVDOVIDecoderConfigurationRecord *) - av_stream_get_side_data(st, AV_PKT_DATA_DOVI_CONF, NULL); + const AVDOVIDecoderConfigurationRecord *dovi; if (IS_SEEKABLE(s->pb, mkv)) { track->blockadditionmapping_offset = avio_tell(pb); @@ -1686,6 +1685,8 @@ static void mkv_write_blockadditionmapping(AVFormatContext *s, MatroskaMuxContex + 4 /* BlockAddIDType */); } + dovi = (const AVDOVIDecoderConfigurationRecord *) + av_stream_get_side_data(st, AV_PKT_DATA_DOVI_CONF, NULL); if (dovi && dovi->dv_profile <= 10) { ebml_master mapping; uint8_t buf[ISOM_DVCC_DVVC_SIZE]; From patchwork Tue Aug 8 16:40:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43180 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2408338pzh; Tue, 8 Aug 2023 09:40:07 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGjvpSyDqvkpBpDqVBFHBM2lIpBJlygkIwsBMee/8v7XGqC2RKCElV+9pQlIvZwv0xyhA3v X-Received: by 2002:a17:906:3183:b0:99c:c15f:574c with SMTP id 3-20020a170906318300b0099cc15f574cmr130418ejy.0.1691512806746; Tue, 08 Aug 2023 09:40:06 -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 z13-20020a17090655cd00b0099bd6dd9362si7911361ejp.907.2023.08.08.09.40.06; Tue, 08 Aug 2023 09:40:06 -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=ea31RFw4; 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 4904768C7B5; Tue, 8 Aug 2023 19:39:55 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2098.outbound.protection.outlook.com [40.92.64.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 28C5A68C780 for ; Tue, 8 Aug 2023 19:39:52 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=L04+qycBOVpXHsFUpcvoHpN3an+P7Bx6l2YQBG5dVgumeADEMjXJv7EVif2uPBR7Ln62kxtnfU7MXaINmvhzd/OfdiIdUHwrL4iGWSO7WmwGHNgU3IdFOqBWqogderuO7oDg/U2H4y4g2S8s3H/LIT/pr7US7FK5keDJNqhqA8/QQWa6PZ1CiBvE0zIDAd2ja0bAAY5wPhBAhTrtODkvhfPrxs1vY+2ShAIKbH/mO441UJbHAO+oDlRJHc1H9gxOGh4lypprwu2p8I6VMzItjeAzfmowuG/jp+PCZ3C3Y2M4QNY8YqkbWIYf1PK2wFABbBoBpJM1SMSOKUUaeK4/dA== 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=wJw4vrC5nrHHzg21zX4JRd6Rn9EjB+yRIrQjI4w2dAQ=; b=bUV5cweD754XbVTcSwstiNkKIyyi7XiAqu9VLogWIqVS3pgerxEgfsIzP0LdAE/1fE5aoEOocfO9ZmkfP5mlw512aCHlUSEIV+VnmK5Sk3EQTlrigd0yzpA9Olmw4D5YGSVLOcWXU04Z+pi7S/DpXe6wQPq5m22ayE4jCKLIQ8gxjpf9gOC6IuQQUvSNhfcKFpAMtipbL9DuwQ8Aw1wrdOEbJnOA0As1UY7cL29S/z4W049sNMtwgpTtJXUoVFbEIeqYW1GLp8OkpIXAuysiPflUbW7jHhIhilxlLUSVFMJCSARar8JwLFv8b7ZwCRuXxQSZSzC1TgK0AIl9Uo1lzw== 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=wJw4vrC5nrHHzg21zX4JRd6Rn9EjB+yRIrQjI4w2dAQ=; b=ea31RFw4V9RA2Ki3XXW1MNnCDe1BZf3PiGyoVxeox+57MnfYBNhzsvJ9NrId+ol6EW0V+ZjDfvCK4lhcaJDuJuTCiNplkFHHVcP5jx8cWNs2F+71FKEXIh2Wlhp+qr9pjFSSt3+C3WsSFYS6g+fY74TO+kHmY6NrkmkeL0evu2EIsB42MycbRe/Ga9/2bXHpDTjv06iSwu/8GqSib0WCPuIMsi0xsfYyLDsd1MQTB6MGWZy/oyNMSC8yPHyM14ZjQsTmLI6psqpet5aD0L/40FLqsdkdaUbXFB+177Qv3tc3C2neoFBlL70ylJCpM6/Iiyv9M8Cp//nkllxUX0W4Bw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0355.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 16:39:50 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Tue, 8 Aug 2023 16:39:50 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:34 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [nkHVDAPt6s/4A5rB0ubGDjlOdv8YS3Qj0LgIg1TDvQg=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-8-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0355:EE_ X-MS-Office365-Filtering-Correlation-Id: 986a2f3a-0082-4aef-7896-08db982e15a5 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoMTHls4qxpPCYYkh36TB/2b0CZgHCiwf8eie2Kgx4FldJfQdmHJDfN4SwgPnWc11XA5gXC9okjoq8N5azeFZ5DU/DMIyx73KU+uWe8Pf1Btbo1nGXK1Nl5sqw289M1AnRS5Gdo3c1jtFBV2u3RyFjVCj0/uGRPZxzR4DgU1tm1XGzlk5KvHfpKgyDZlHquij1rLmYgRv1BGwebqoBn/vAVfLeljlaelHaT+qsK9uL80xK9DOpb40SwW+5j9ks+z4y+oKvBcvIcrVETTFJ25Jn8zI0MrXy6Pk1RAImYyHDj4ThfbYeUxKTS4zTCGNIZjaRHn2XvolsnLkF61mUCDd3EIqwfKuqYlPfLg8FEfl9zN+iCuJZ1sK4Yp8/2ejFaKCCcDd8JhrtiORIIxTIc4PKthXRk2JJ7GhMvfBa8Pb2FOjoh9D9IwPRLXIGJ66UOXS1YBcAcjyu/ipLkxulUFzl70rki9g8QxAwnnfWkxyDGBTG8cynewqKpzd8pWCk191DYTLF1MH4r6P2b8+v58oQcvj2qreEWtapE9Xn/5+MldbczazhCmRh9EHBTq0ioFQmKhy43fcCVzjZwZ//9GG2xd693WxnDeh1opXqJAtOcU0Bo/x2FCSb3WQgQ4VJOIoYd1p9M46cCkuzuiW8ItI3g6yatwlYd0MT3GnLCDI6VhXkl3U61jRVljDhHEA85lKv4bk5h8d5RycQDBRzpGQFOhrecCrNkhKScghAIRkUzLdP+XkILdh7WPDGx6rcp5WU= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: PGAx144oLub/6dZ5R+Gwoy1W7mWfNWJYnx0+02o1bUG5vqh5JTOcjZUntIl9p8BGIja0kCQgrXS/bDvHcBt+tcKLDO0H7K4Ti6nP8oNI05Zf2vkQ7o11igZwRCi3+mwht+mSSaCvlE9Egh2VnWB9ZrEesamDA3xk9Zy1dXnIKO2YofwpSGoQzQ5QWyTnvUXbSjg8cjghB3bQb4fn9ksfAA0wioiRkeBDmcK05SHvaiZScfqYnq1ejYMhCCVJA7sVIJSlsuxT7sI8GevQ+SRBjswmjiRHjGkuNs+KTyHOCNFGcm8NI9dwyci4xR7nMb/9iJAy7AdC57z23juedcCKN/9xX5NCZOuIQsRSSPPpK6MgMIrXTRsuasoYe6e1QYa02yj4e2xgq7ajUtdT/6/reUuOBTGKMljypFPgxoKQlaRCs4TmBpoDHRf6ZamYGeScw7gPIYZipb5qpIa/G1pn2oriFaGHlih6GA1espQLb9kp17829nftlNXweG18zck4/DMphpPULwymTLRKHRa5X5bPEfLyZx9ORzOYrm3QpzDd+eOl93bIMT3MLSVWxlu/SkHF0EnpO3atxZvlG400WP8orpwMsLBBgpGgNIHwtZdlo9Ae7gk9NF7wAcwt9+ti X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: FFcKwLICSXxg016Aco2+Qay/Vw3ONGbf46eUgvSlWTwcJW5aIL/urM62yHpKDmgF8jY9n7W77OdB/ypij4Af3wCNSTpTdmKVTi1s/AI4dV/Erqp24jIUuy5IrX1bFtLCzykQ6RjcwtEuLSQUA6jLH72F3sC0Q1BjNCHRus9S2qQtD+2QJg2mVEIlop3tDi+WoWf5TDiDPQxeMuoHQRFWLiyg/pK9YG0flWwKX5VU1u4Vb+maBer0nhF4Wg9teulkcAR27QmeqClL36KwdRcUHYsCktg9GAIWp1Dq8t/uxlfmMsRoRdnapXX5ww+o4v7W1K6oEeXjtE1KMdnBcrmMFVhlPupoi23fL6UdK6DRlTXl+Yc73ROed4bhVkh7yleycD6jK3crA6W6SVtuvei2JhBZVf2nMluuiTa1Mt+AIWmlEwBInzb98CyGP9GmIPoJsayaWPnphnPQhnUBcdWc92jlD3lI1/exz6fcVXE1tBFvO29a3ulvuEYjnBSjQ+B8Ac42Cbd6nU8pQ2cv1RcS5ozRCvxm1a2FwfXpE4jcp7kW4mP+S+LrEIfTGUuvrb/LawGc7lyzYi011m/e+eQ5c7NJGc7PXg8gSbxPxwCJRD6YIeBx8w9C5ikUTVvRCCyghWdI2M1A7nyDDSJe17+IF6wcdoTzR6r3MR6Xyn+bcAC53s1J6bunm+PRpvphIgLeGv/WQb0VWYCCPiVXw77heLsIzb1TWA9Na4sQEYuzobwFQ56gsoFEgqBOik4flLvd8JaCK657X8gJzXWbDHiTATdnt7tSWj/xa6aeL7B1vI7CuozrnB0eADQfy1glLIqXyYawZaQuUlVdcUTeLHbYRKzAN3VU8VQR3xHsnlM8tQ8Kl8Bk8k97aGdwd1J6dNz2Wc4xmgKhQ2UjLHCjaHansHAFn3XWvlQEHskt4CRiPfrydB2ExNrRuqLCDlD4/7qFhsJNPQ9tex8mt+rbJBoTcl3pgoIS9hX4/uAhxktwJ1gtqZ4+Sx/o6VXu+/kEdrZNkZZUq78oqE18jj0mEvgRSn4RzWuYYBkmg3145tXki5hN9tNyP+QQ0yCZkKJuhMo6WpmX7hWQPtasQkOiclhr1JnIZgiLMiCpetSqY0iH+7i0SkzR4vW9UBJY8HQsXSosd1XixG6hUi3p9bCzMN9ATVSge4KgNJXDHPfUMGO3D2AoTM2bmxQBiEYg8NkOwRyllYFKU9szrkbBecqkwE35YiIicqlAwGWN2TXAeYxxxIFnz+95xGSXUGYzFIz8VAvB X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 986a2f3a-0082-4aef-7896-08db982e15a5 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:50.5362 (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: PR3P250MB0355 Subject: [FFmpeg-devel] [PATCH 13/15] avformat/matroskaenc: Don't reserve space for HDR10+ when unnecessary 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: On5Vh5LGv07g Do it only for video (the only thing for type for which HDR10+ makes sense). This effectively reverts changes to several FATE ref-files made in bda44f0f39e8ee646e54f15989d7845f4bf58d26. Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 9 +++- tests/ref/fate/aac-autobsf-adtstoasc | 4 +- tests/ref/fate/matroska-alac-remux | 4 +- tests/ref/fate/matroska-avoid-negative-ts | 4 +- tests/ref/fate/matroska-dovi-write-config8 | 4 +- tests/ref/fate/matroska-dvbsub-remux | 4 +- tests/ref/fate/matroska-encoding-delay | 14 +++--- tests/ref/fate/matroska-flac-extradata-update | 4 +- tests/ref/fate/matroska-h264-remux | 4 +- .../fate/matroska-mastering-display-metadata | 4 +- tests/ref/fate/matroska-move-cues-to-front | 4 +- tests/ref/fate/matroska-mpegts-remux | 4 +- tests/ref/fate/matroska-ms-mode | 4 +- tests/ref/fate/matroska-ogg-opus-remux | 10 ++--- tests/ref/fate/matroska-opus-remux | 10 ++--- tests/ref/fate/matroska-pgs-remux | 4 +- tests/ref/fate/matroska-pgs-remux-durations | 4 +- tests/ref/fate/matroska-qt-mode | 4 +- tests/ref/fate/matroska-zero-length-block | 4 +- tests/ref/fate/shortest-sub | 4 +- tests/ref/lavf/mka | 4 +- tests/ref/lavf/mkv | 4 +- tests/ref/lavf/mkv_attachment | 4 +- tests/ref/seek/lavf-mkv | 44 +++++++++---------- 24 files changed, 84 insertions(+), 79 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index abac70dd80..5c251cec7b 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1668,7 +1668,8 @@ static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer, } static void mkv_write_blockadditionmapping(AVFormatContext *s, const MatroskaMuxContext *mkv, - AVIOContext *pb, mkv_track *track, const AVStream *st) + const AVCodecParameters *par, AVIOContext *pb, + mkv_track *track, const AVStream *st) { #if CONFIG_MATROSKA_MUXER const AVDOVIDecoderConfigurationRecord *dovi; @@ -1679,10 +1680,12 @@ static void mkv_write_blockadditionmapping(AVFormatContext *s, const MatroskaMux // we either write the default value here, or a void element. Either of them will // be overwritten when finishing the track. put_ebml_uint(pb, MATROSKA_ID_TRACKMAXBLKADDID, 0); + if (par->codec_type == AVMEDIA_TYPE_VIDEO) { // Similarly, reserve space for an eventual HDR10+ ITU T.35 metadata BlockAdditionMapping. put_ebml_void(pb, 3 /* BlockAdditionMapping */ + 4 /* BlockAddIDValue */ + 4 /* BlockAddIDType */); + } } dovi = (const AVDOVIDecoderConfigurationRecord *) @@ -2010,7 +2013,7 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv, } if (!IS_WEBM(mkv)) - mkv_write_blockadditionmapping(s, mkv, pb, track, st); + mkv_write_blockadditionmapping(s, mkv, par, pb, track, st); if (!IS_WEBM(mkv) || par->codec_id != AV_CODEC_ID_WEBVTT) { uint8_t *codecpriv; @@ -2763,6 +2766,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, track->max_blockaddid = FFMAX(track->max_blockaddid, additional_id); } + if (par->codec_type == AVMEDIA_TYPE_VIDEO) { side_data = av_packet_get_side_data(pkt, AV_PKT_DATA_DYNAMIC_HDR10_PLUS, &side_data_size); @@ -2785,6 +2789,7 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, track->max_blockaddid = FFMAX(track->max_blockaddid, MATROSKA_BLOCK_ADD_ID_ITU_T_T35); } + } ebml_writer_close_or_discard_master(&writer); diff --git a/tests/ref/fate/aac-autobsf-adtstoasc b/tests/ref/fate/aac-autobsf-adtstoasc index 12b80ef6bd..76125083b6 100644 --- a/tests/ref/fate/aac-autobsf-adtstoasc +++ b/tests/ref/fate/aac-autobsf-adtstoasc @@ -1,5 +1,5 @@ -68cb46874ca6029d3ae3a184b4a71b04 *tests/data/fate/aac-autobsf-adtstoasc.matroska -6657 tests/data/fate/aac-autobsf-adtstoasc.matroska +3d4465a7ea2cfba31af737e288c892fe *tests/data/fate/aac-autobsf-adtstoasc.matroska +6646 tests/data/fate/aac-autobsf-adtstoasc.matroska #extradata 0: 2, 0x0030001c #tb 0: 1/1000 #media_type 0: audio diff --git a/tests/ref/fate/matroska-alac-remux b/tests/ref/fate/matroska-alac-remux index 7f2698eee8..3eb3cdcb37 100644 --- a/tests/ref/fate/matroska-alac-remux +++ b/tests/ref/fate/matroska-alac-remux @@ -1,5 +1,5 @@ -d9b986b34e36e865912fd42d2c5b0cab *tests/data/fate/matroska-alac-remux.matroska -1293821 tests/data/fate/matroska-alac-remux.matroska +c683b17ab66c9f0fba57da7af86740c9 *tests/data/fate/matroska-alac-remux.matroska +1293810 tests/data/fate/matroska-alac-remux.matroska #extradata 0: 36, 0x562b05d8 #tb 0: 1/1000 #media_type 0: audio diff --git a/tests/ref/fate/matroska-avoid-negative-ts b/tests/ref/fate/matroska-avoid-negative-ts index dcde937d52..f52f3dec72 100644 --- a/tests/ref/fate/matroska-avoid-negative-ts +++ b/tests/ref/fate/matroska-avoid-negative-ts @@ -1,5 +1,5 @@ -6a1a524a5700de7b94bce5a283bbe8b9 *tests/data/fate/matroska-avoid-negative-ts.matroska -973085 tests/data/fate/matroska-avoid-negative-ts.matroska +69461a333cae20646d4e514b7b510bef *tests/data/fate/matroska-avoid-negative-ts.matroska +973074 tests/data/fate/matroska-avoid-negative-ts.matroska #extradata 0: 22, 0x2885037c #tb 0: 1/1000 #media_type 0: video diff --git a/tests/ref/fate/matroska-dovi-write-config8 b/tests/ref/fate/matroska-dovi-write-config8 index 58eb454865..de90101a55 100644 --- a/tests/ref/fate/matroska-dovi-write-config8 +++ b/tests/ref/fate/matroska-dovi-write-config8 @@ -1,5 +1,5 @@ -80d2b23a6f27ab28b02a907b37b9649c *tests/data/fate/matroska-dovi-write-config8.matroska -3600620 tests/data/fate/matroska-dovi-write-config8.matroska +56eea905c35996a729371372dd3113f9 *tests/data/fate/matroska-dovi-write-config8.matroska +3600609 tests/data/fate/matroska-dovi-write-config8.matroska #extradata 0: 551, 0xa18acf66 #extradata 1: 2, 0x00340022 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-dvbsub-remux b/tests/ref/fate/matroska-dvbsub-remux index b5bb028343..03341d9668 100644 --- a/tests/ref/fate/matroska-dvbsub-remux +++ b/tests/ref/fate/matroska-dvbsub-remux @@ -1,5 +1,5 @@ -7154511243fd7edb695c159bb12a0948 *tests/data/fate/matroska-dvbsub-remux.matroska -39041 tests/data/fate/matroska-dvbsub-remux.matroska +5d1591e9abd7e1373d43bc776572aaf7 *tests/data/fate/matroska-dvbsub-remux.matroska +39018 tests/data/fate/matroska-dvbsub-remux.matroska #extradata 0: 5, 0x00bb0064 #extradata 1: 5, 0x00bb0064 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-encoding-delay b/tests/ref/fate/matroska-encoding-delay index 437992468d..3059c32e03 100644 --- a/tests/ref/fate/matroska-encoding-delay +++ b/tests/ref/fate/matroska-encoding-delay @@ -1,5 +1,5 @@ -416f35d123daef715b7c4bbb75c9c778 *tests/data/fate/matroska-encoding-delay.matroska -961251 tests/data/fate/matroska-encoding-delay.matroska +c51ac49b96b213e6646196fc81f8eb84 *tests/data/fate/matroska-encoding-delay.matroska +961240 tests/data/fate/matroska-encoding-delay.matroska #extradata 0: 22, 0x32ea0490 #tb 0: 1/1000 #media_type 0: video @@ -32,7 +32,7 @@ dts_time=-0.010000 duration=24 duration_time=0.024000 size=1152 -pos=1268 +pos=1257 flags=K__ [/PACKET] [PACKET] @@ -45,7 +45,7 @@ dts_time=0.000000 duration=40 duration_time=0.040000 size=237628 -pos=2428 +pos=2417 flags=K__ [/PACKET] [PACKET] @@ -58,7 +58,7 @@ dts_time=0.014000 duration=24 duration_time=0.024000 size=1152 -pos=240063 +pos=240052 flags=K__ [/PACKET] [PACKET] @@ -71,7 +71,7 @@ dts_time=0.038000 duration=24 duration_time=0.024000 size=1152 -pos=241238 +pos=241227 flags=K__ [/PACKET] [PACKET] @@ -84,7 +84,7 @@ dts_time=0.040000 duration=40 duration_time=0.040000 size=238066 -pos=242398 +pos=242387 flags=K__ [/PACKET] [STREAM] diff --git a/tests/ref/fate/matroska-flac-extradata-update b/tests/ref/fate/matroska-flac-extradata-update index 37e0367297..d6713aaafa 100644 --- a/tests/ref/fate/matroska-flac-extradata-update +++ b/tests/ref/fate/matroska-flac-extradata-update @@ -1,5 +1,5 @@ -8a75767c14e63e7d15291c5c4918a661 *tests/data/fate/matroska-flac-extradata-update.matroska -1840 tests/data/fate/matroska-flac-extradata-update.matroska +fdbfdc51b519fd5e8f425aca1e7b8704 *tests/data/fate/matroska-flac-extradata-update.matroska +1807 tests/data/fate/matroska-flac-extradata-update.matroska #extradata 0: 34, 0x93650c81 #extradata 1: 34, 0x93650c81 #extradata 2: 34, 0x93650c81 diff --git a/tests/ref/fate/matroska-h264-remux b/tests/ref/fate/matroska-h264-remux index bfc80a273f..aefd6f65ef 100644 --- a/tests/ref/fate/matroska-h264-remux +++ b/tests/ref/fate/matroska-h264-remux @@ -1,5 +1,5 @@ -38ede644af311f443d7446600f25a8e3 *tests/data/fate/matroska-h264-remux.matroska -2036093 tests/data/fate/matroska-h264-remux.matroska +bc0ce442f20d1d62663b40391a3be812 *tests/data/fate/matroska-h264-remux.matroska +2036071 tests/data/fate/matroska-h264-remux.matroska #tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/matroska-mastering-display-metadata b/tests/ref/fate/matroska-mastering-display-metadata index c63365c181..ad36f01e61 100644 --- a/tests/ref/fate/matroska-mastering-display-metadata +++ b/tests/ref/fate/matroska-mastering-display-metadata @@ -1,5 +1,5 @@ -a4924bfe22ed0c72b0eddc353bbee10c *tests/data/fate/matroska-mastering-display-metadata.matroska -1669615 tests/data/fate/matroska-mastering-display-metadata.matroska +b3204c8fa6a78037243cc4948a2775ee *tests/data/fate/matroska-mastering-display-metadata.matroska +1669593 tests/data/fate/matroska-mastering-display-metadata.matroska #extradata 0: 4, 0x040901a3 #extradata 3: 200, 0x506463a8 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-move-cues-to-front b/tests/ref/fate/matroska-move-cues-to-front index ce3b9fce92..79ccc2fd93 100644 --- a/tests/ref/fate/matroska-move-cues-to-front +++ b/tests/ref/fate/matroska-move-cues-to-front @@ -1,5 +1,5 @@ -03ed7fcf99dd993ebb9bc9c6c93ba73e *tests/data/fate/matroska-move-cues-to-front.matroska -23210319 tests/data/fate/matroska-move-cues-to-front.matroska +74a5ed3f0b14112322c8bf3e94d6e98b *tests/data/fate/matroska-move-cues-to-front.matroska +23210297 tests/data/fate/matroska-move-cues-to-front.matroska #tb 0: 1/1000 #media_type 0: audio #codec_id 0: pcm_s24be diff --git a/tests/ref/fate/matroska-mpegts-remux b/tests/ref/fate/matroska-mpegts-remux index 1f211dfc29..af41b57af1 100644 --- a/tests/ref/fate/matroska-mpegts-remux +++ b/tests/ref/fate/matroska-mpegts-remux @@ -1,5 +1,5 @@ -53424355db1d78441b62ad114d6ea502 *tests/data/fate/matroska-mpegts-remux.matroska -6524 tests/data/fate/matroska-mpegts-remux.matroska +ca1b91e49b6e238b641007c186d8f424 *tests/data/fate/matroska-mpegts-remux.matroska +6502 tests/data/fate/matroska-mpegts-remux.matroska #tb 0: 1/1000 #media_type 0: audio #codec_id 0: ac3 diff --git a/tests/ref/fate/matroska-ms-mode b/tests/ref/fate/matroska-ms-mode index b12e9ac9f2..7ce0f1e4ff 100644 --- a/tests/ref/fate/matroska-ms-mode +++ b/tests/ref/fate/matroska-ms-mode @@ -1,5 +1,5 @@ -f3b1b804d40d70d012e85ba6d03ea8f1 *tests/data/fate/matroska-ms-mode.matroska -413116 tests/data/fate/matroska-ms-mode.matroska +703d268b966d5dfabe5e22c2de69dc66 *tests/data/fate/matroska-ms-mode.matroska +413105 tests/data/fate/matroska-ms-mode.matroska #extradata 0: 40, 0x54290c93 #extradata 1: 114, 0xb6c80771 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-ogg-opus-remux b/tests/ref/fate/matroska-ogg-opus-remux index c70c58a697..cd3eade361 100644 --- a/tests/ref/fate/matroska-ogg-opus-remux +++ b/tests/ref/fate/matroska-ogg-opus-remux @@ -1,5 +1,5 @@ -d891990279e6ba202448f9fffde52d3f *tests/data/fate/matroska-ogg-opus-remux.matroska -10215 tests/data/fate/matroska-ogg-opus-remux.matroska +b602a1a4aaa4fbca4b8aaf39b66d7235 *tests/data/fate/matroska-ogg-opus-remux.matroska +10204 tests/data/fate/matroska-ogg-opus-remux.matroska #extradata 0: 19, 0x399c0471 #tb 0: 1/1000 #media_type 0: audio @@ -57,7 +57,7 @@ dts_time=-0.007000 duration=20 duration_time=0.020000 size=402 -pos=555 +pos=544 flags=K__ [/PACKET] [PACKET] @@ -70,7 +70,7 @@ dts_time=0.013000 duration=20 duration_time=0.020000 size=216 -pos=964 +pos=953 flags=K__ [/PACKET] [PACKET] @@ -83,7 +83,7 @@ dts_time=0.033000 duration=20 duration_time=0.020000 size=215 -pos=1187 +pos=1176 flags=K__ [/PACKET] [STREAM] diff --git a/tests/ref/fate/matroska-opus-remux b/tests/ref/fate/matroska-opus-remux index f5dcbe164e..975510e167 100644 --- a/tests/ref/fate/matroska-opus-remux +++ b/tests/ref/fate/matroska-opus-remux @@ -1,5 +1,5 @@ -dc14cd32921d86e03c155bb745edf44b *tests/data/fate/matroska-opus-remux.matroska -9370 tests/data/fate/matroska-opus-remux.matroska +fe0258eb0d4b525203ea240c87a154d3 *tests/data/fate/matroska-opus-remux.matroska +9359 tests/data/fate/matroska-opus-remux.matroska #extradata 0: 19, 0x3a04048f #tb 0: 1/1000 #media_type 0: audio @@ -68,7 +68,7 @@ dts_time=-0.007000 duration=20 duration_time=0.020000 size=320 -pos=511 +pos=500 flags=K__ [/PACKET] [PACKET] @@ -81,7 +81,7 @@ dts_time=0.014000 duration=20 duration_time=0.020000 size=159 -pos=838 +pos=827 flags=K__ [/PACKET] [PACKET] @@ -94,7 +94,7 @@ dts_time=0.034000 duration=20 duration_time=0.020000 size=148 -pos=1004 +pos=993 flags=K__ [/PACKET] [STREAM] diff --git a/tests/ref/fate/matroska-pgs-remux b/tests/ref/fate/matroska-pgs-remux index 482357b899..a086111495 100644 --- a/tests/ref/fate/matroska-pgs-remux +++ b/tests/ref/fate/matroska-pgs-remux @@ -1,5 +1,5 @@ -60161b7f8af39a8d280cc8b1f8693129 *tests/data/fate/matroska-pgs-remux.matroska -49759 tests/data/fate/matroska-pgs-remux.matroska +d39daa393d66ae0b0c153be045897585 *tests/data/fate/matroska-pgs-remux.matroska +49748 tests/data/fate/matroska-pgs-remux.matroska #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: hdmv_pgs_subtitle diff --git a/tests/ref/fate/matroska-pgs-remux-durations b/tests/ref/fate/matroska-pgs-remux-durations index 6280110948..37494cd98f 100644 --- a/tests/ref/fate/matroska-pgs-remux-durations +++ b/tests/ref/fate/matroska-pgs-remux-durations @@ -1,5 +1,5 @@ -2c78a4337f61f24175a8ffe06087e581 *tests/data/fate/matroska-pgs-remux-durations.matroska -49771 tests/data/fate/matroska-pgs-remux-durations.matroska +27af80eecea4f15f415f22841bc699d5 *tests/data/fate/matroska-pgs-remux-durations.matroska +49760 tests/data/fate/matroska-pgs-remux-durations.matroska #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: hdmv_pgs_subtitle diff --git a/tests/ref/fate/matroska-qt-mode b/tests/ref/fate/matroska-qt-mode index e14584893b..62a2d82f16 100644 --- a/tests/ref/fate/matroska-qt-mode +++ b/tests/ref/fate/matroska-qt-mode @@ -1,5 +1,5 @@ -a976ac0fd5c1ca916280f64525d12c10 *tests/data/fate/matroska-qt-mode.matroska -1884254 tests/data/fate/matroska-qt-mode.matroska +f2eac23e9f7f3a7dac9e2d94885ff4f1 *tests/data/fate/matroska-qt-mode.matroska +1884243 tests/data/fate/matroska-qt-mode.matroska #extradata 0: 90, 0x817d0185 #tb 0: 1/1000 #media_type 0: video diff --git a/tests/ref/fate/matroska-zero-length-block b/tests/ref/fate/matroska-zero-length-block index 0f90ccbdd7..3987cc14c4 100644 --- a/tests/ref/fate/matroska-zero-length-block +++ b/tests/ref/fate/matroska-zero-length-block @@ -1,5 +1,5 @@ -b9a8a67ffdba18eec1c04827d3d404ca *tests/data/fate/matroska-zero-length-block.matroska -645 tests/data/fate/matroska-zero-length-block.matroska +f577fad2fff41d6e055f605281582b8d *tests/data/fate/matroska-zero-length-block.matroska +634 tests/data/fate/matroska-zero-length-block.matroska #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: subrip diff --git a/tests/ref/fate/shortest-sub b/tests/ref/fate/shortest-sub index 4db0e13328..49e13d65d7 100644 --- a/tests/ref/fate/shortest-sub +++ b/tests/ref/fate/shortest-sub @@ -1,5 +1,5 @@ -791a2ce136bef538491bbe31ac0134b1 *tests/data/fate/shortest-sub.matroska -139262 tests/data/fate/shortest-sub.matroska +2b6e72494d74aaf07380bfe3d50b62d5 *tests/data/fate/shortest-sub.matroska +139251 tests/data/fate/shortest-sub.matroska #extradata 1: 167, 0xf7272d5f #tb 0: 1/1000 #media_type 0: video diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka index 40b1f07f9b..93a0b8f71a 100644 --- a/tests/ref/lavf/mka +++ b/tests/ref/lavf/mka @@ -1,3 +1,3 @@ -dffd74918d13be7dd07e83832de3a15c *tests/data/lavf/lavf.mka -43584 tests/data/lavf/lavf.mka +77db16a9fe1c42a230c85124bfb40cad *tests/data/lavf/lavf.mka +43573 tests/data/lavf/lavf.mka tests/data/lavf/lavf.mka CRC=0x3a1da17e diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 5d0bf06fa9..8ddc9cf57f 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,3 +1,3 @@ -1dce6c32d49a8f637262db2d8e7f2744 *tests/data/lavf/lavf.mkv -320439 tests/data/lavf/lavf.mkv +05889ab61cc6144018c80e50c781fe44 *tests/data/lavf/lavf.mkv +320428 tests/data/lavf/lavf.mkv tests/data/lavf/lavf.mkv CRC=0xec6c3c68 diff --git a/tests/ref/lavf/mkv_attachment b/tests/ref/lavf/mkv_attachment index b79bf9a619..6a08a580d2 100644 --- a/tests/ref/lavf/mkv_attachment +++ b/tests/ref/lavf/mkv_attachment @@ -1,3 +1,3 @@ -140ffb4f6a734972a9d38f4e6d57f304 *tests/data/lavf/lavf.mkv_attachment -472589 tests/data/lavf/lavf.mkv_attachment +901b4ba820fe1d6c627ce2a4b31b65af *tests/data/lavf/lavf.mkv_attachment +472578 tests/data/lavf/lavf.mkv_attachment tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68 diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv index 90d91e3968..6abdbd6ee7 100644 --- a/tests/ref/seek/lavf-mkv +++ b/tests/ref/seek/lavf-mkv @@ -1,48 +1,48 @@ -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 687 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 676 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292319 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292319 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 ret:-1 st: 1 flags:0 ts: 2.577000 ret: 0 st: 1 flags:1 ts: 1.471000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320160 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320149 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146871 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146860 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153000 ret: 0 st: 0 flags:1 ts: 1.048000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292319 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 ret: 0 st: 1 flags:0 ts:-0.058000 -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 687 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 676 size: 208 ret: 0 st: 1 flags:1 ts: 2.836000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320160 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320149 size: 209 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146871 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146860 size: 27925 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292319 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 ret:-1 st: 1 flags:0 ts: 1.307000 ret: 0 st: 1 flags:1 ts: 0.201000 -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 687 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 676 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292319 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 ret: 0 st: 0 flags:0 ts: 0.883000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292319 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 ret:-1 st: 1 flags:0 ts: 2.672000 ret: 0 st: 1 flags:1 ts: 1.566000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320160 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320149 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146871 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146860 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 903 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 From patchwork Tue Aug 8 16:40:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43181 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2408448pzh; Tue, 8 Aug 2023 09:40:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEMZgy+ULBNwRC4Z2YO5/X1a17ABNe2dGeV7yLqVSowCLgM8MyetYim0KSO21NiUDD7l1Z1 X-Received: by 2002:a17:906:92:b0:99b:c517:88a1 with SMTP id 18-20020a170906009200b0099bc51788a1mr98132ejc.67.1691512818110; Tue, 08 Aug 2023 09:40:18 -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 y16-20020a17090668d000b0099cd8eab16csi3319595ejr.559.2023.08.08.09.40.17; Tue, 08 Aug 2023 09:40:18 -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=EFNoOzUA; 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 4E9BC68C7F9; Tue, 8 Aug 2023 19:39:56 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2098.outbound.protection.outlook.com [40.92.64.98]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6BA0068C7CE for ; Tue, 8 Aug 2023 19:39:53 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hk9Bb6sjzkAYC15rz2JkplIbAomnlzgHHJG4KCLfxtlzlDno0kIqi+sEtnnNBjF/HvkOExGvbdODIrzAxF+cvPMe3QS2kNvM0yWl+I0r90Z946ZFZFOAhR9D+gazAdpBEoNJzZ9F/iIOy87UuVRvfPlvbhyYp0UlQ9doB1249g2yIf8ED03iZtSv2p2uV7tTn0GKJNzR5pb/brima4Mc2Rt8a5l15Ke7IfjJ0QMIzYYYRKgIM9ye2W+mowHyKko0qJsAgR52UTqyBXf2aSeNQNAQPHe+CYHimgj4ueZCXtjD7MGP9w27sbPlLx38QmlGsxJmkLEe/b1vQnjYpU3dxA== 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=RxTi8kLmwp7D+4CccklxBqNeedyc6ljPjh5FjwnLxbk=; b=VVvirjUNBsrZeNeou6zyJQhZSWJoAkjyu1znpQa1hv7mlsABZ/LPxQ+WYtBuCpXgio+gRM0bRMcCrsrA9EP3t8cZQI3E8IPWn/oz7w2DbnWJmnifPQ1083efsnNGymIlmebC/rpmU6QgLqYZvaX2oO9kND7K0wyKc2HmLdw0qPntm9HjEvROEdm76RHnVzhfHOS1iKxIOEUMZgiAcb3XU2OHxyYovdDfFHTpr9sFTn7425Gg8PrvWjDPNVxDTsCNNEFAAjnJkPuP8LyXWrZycRATaX2SkCYWCO+3WBOwjZzfGSKLeNdSUeXu1PE7DkHErzs4me/kRU3psLm7MxiFJg== 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=RxTi8kLmwp7D+4CccklxBqNeedyc6ljPjh5FjwnLxbk=; b=EFNoOzUASOnl/ahrobxvJKjNJGCl3IoPVgtyF4603Nuppf/ZgD4DiEojBSjDIltwUKDIzovKtGV2TChDxq0d0CPXirRVUoQvD9b+oqhN++HNEJlHZnt5TZc074cDeJvhfL6hz+kv9paZQYYECFbjbWNKJeQGg1ZkEQ0/G/a+tMJbRDfI9/5d5bTD7lcqJDfGFdM6qqhjzUnyWNmQWPxo8Be06wqmQyMvSUN9fIMB1dmbQ+wDodmgq3JGEMmCjV7Ia2dslTRuQW5szdl6/QV1o7ZrtYRY/+o3vCnYf8Px7o16g/1jjPH7/HZRtdk+vwKxOv/mSb04B7Ot8GiDierXLQ== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0355.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 16:39:51 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Tue, 8 Aug 2023 16:39:51 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:35 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [3xHIuLnIU8mj+I6Er63qQzy3LB/xwaAy242FwRjyL2o=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-9-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0355:EE_ X-MS-Office365-Filtering-Correlation-Id: e688a5c8-ab33-46f5-7bdc-08db982e1653 X-MS-Exchange-SLBlob-MailProps: AZnQBsB9XmoMTHls4qxpPCYYkh36TB/2+k2bo8+gI5kcL2mvchAKOz+XTqADHFDeTibAM1kdjciW0xGcyXIk/yriH3UjecyKEQ9YOLWPnRaDnOf5x3NadPmNm008UC3fZ9wFieCGWNz+Ef/uTiYgyuNlGo5Kim1oWrAPnorl9M/uiDPYwz3uiPV+VCgVwzMDM8Z45pQH3cgNZstowkuPoC/DYWcJMylsoBlqIhshAAGpQRD1AVrFBSAG4geqHFLRtN2Qx81RbZhXSITPM6jF0+bxUjjxWa5o8ZGkA6DIRzGZW4zTVnGk+7ml+kYCVkjUuM2EoPRRMd9xCpHTivpdNpIZuzB6CnUbHRZPDw4TMAxgvmBxuzu0I3r8g1kZCzLcz0fb2PqatU88W875bXlTJVN5BE/03/+FsiOOQxuUHtU5UHvhJYb0EbnRn7vOn+K1jD19BBoh80W+ygCDYoEEnvaSji6TRWNeiB7OEDUhj7I2UXhJMyDGHk0/+qn6JOen7rZwkGC7QoazjteaOD0b7ch8DwqKcUuz3iJH1Ph8UzG9gF66B905L7nrpnNW2ciD1L2s/JIXMYE+PfQnzPreytV6P6Jbb5QyLc/YYg2L9CQu9N0gn0BUIQ6/DiQPvMv32WGnwfMMcIxDWjzwuwSwuFWAk5c8ljxqaGhHE6wGHVzp4x/+332dnJms7tXHcVwZ+TWmtPtqOiLLMDiwrWAZquspkeiIVgLvldeBNbZv0A7a0+qXKTl+p/qvBIIy6+dW7wqx2Cy14fI= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 09FpZIEvqBDSrn3VK5NR33b2STZAjR5jmNLfc8LzAynxR1a9ImGppJypvkDWlx+s0ZHL2Y3Fox+UpmU2ysh1qMp0caGKu0bzDJXkRzzYlcErSppBX+HK7XGfip5Znki3XmvrAO/T65EbDnVnBgQTMk4E1Y+IfWKgqErZllr5U30X50p6joPcvDHFP/kFZiJ1Dy7Z3tp6vknT/aDN0osWNwBsvDTrDlNxlDHXPFtvyaK2BOKgQoEiit8mOrKcKYeT71a5Tt1XGsk/AZ4aXTTy5t/xB/WWvKU14JsRHdEkUL92GJLZ5MQQcsRMrxKyT5WUsbgEGzSq573wWYkObWYeNt54nyLn3Bw/eM/zYe62lJ4TZ1yiyEFQ14JzDy+9pbmu2Ks9wAAwqs0URvE2Gfejqwwsdwy5JsqkxdfMg/ufSOSSChBBytrx1KLa4RpTH8b3qZHWLCixHOydEXv1HwyZrgTeh3TCRtFniWBcta2FihZR4NNxsP9w66cU2UWCB/VD+PSAvlPjfrCEQejwq9EcmOQTvaaIcwCx5r2QD7kzNv2J5oxfMVeGeRJoZz5fW/27+ODDYqB+AJqnQo2jJROUnMj1XY+D01Dz2JsQyCkolZbrdOdkHQ5xsLvgxbqYjOYP X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: YFjOPWwTQTSx5cmKbUPsDPOr0lzrzFhK0iiVvhhlZs5oLTYrT9zGL7ETWbP33/g0m/lA4I0KRwe7lD7h1oI7cLpWxvjv1UsjP71un76IEhFKMZX1KnKDQv42CI6UHdG3JrBRv9cBMmFnSSnKbhK8F42zTx3tfsfV141CQVKumJLEnkxWFlNgANwqi2qvAX/w9gvDI9WxwHrgZt8RaWyuBcn7FUmToGZXORDU5awv7x7RUCb8YjgNRuiwbyNAkXhzCrhfstv72WTA2CHvCDY3g8xPXUpKXLxNGkk/nKm2+z+G3sJXEzgh4stVVjCh9vU3iKbXm9YEEpnx3jU5j3kMihrgmnzZ3svEXypA+pOO45fLW0Q97pJ4H6o3YjpdJvltR5Ghs9t+clueb6ac6cSOaz4JYGdOMOWkY/CgPlxEqpZ5CmrUi5UHTKSlfXKY2+gjVm2maKbHJmajuAa+ZiYTsl9tVrWJ6Wk6ET4lx5L/qAuKTShNyh+rIK0y7eayr7eTiDuwuzbrWgaNYc65BiG85Tio+IM1VrSsHP4OnDSNvYc/YHrg2sa3W5zw+Lj3BalUkyQAuJFolkxS/jQru+nguhpb0yS9xxDhVNRPE7m6PT9h+kJcAxOxp9he9pcTgH1eaznjLMz/glTkFFtbXpceMLOD6hiIfcLpOux2lvf8yVdh/7NzYY/E2NNKDv9qUHs/qLWdYtmpX0jH0vhRqgcLMi4fxQWWxHvDKEuJ0CBIjq2QujXkDL7GQe5FPyNicERcVDXMO9gnhLcmqhj2XTXHbKPv2r06azusiw9aBvyBaBe/k/dbw8tmgKs3B1mS4swe2NT4XI+C79vrEeWnayl911sYW3/wpafrmF0niHsNdObYHIztL84W8QBs1UDjF/owGA5a/JCvXcuUk4NQSSchkuDUs/cWXtDzQPs1FkhyvGa09yMmw1C8Q5LHAi/7Z7NyRz+7D3ZvZu5YqZJZfDeZDaHNsMJH9RBhKZ/Y7W4tZvZZ2wluJ2H1r8+ruxeuZJvLfZgSRKj6KVAIxp/rCSMii4bEof9o3REHAUa3OgDUEwgRD/71SE+U8G6FlROntkzchljg54m+3cGloAFIVx5MwBN09a0NB5niH/vXVzIKpDlMUY2rQj2iBGPgomwNIeynjg4qCT34y+jTNHPIJogCZ1cqUFMXWvNATXVPO7psJYH75nLqt9gxIiPD8ZxOIUETJQ0Uprp974PuTlecnAMyR1pLYRsV/8/FRecOFdoSxvAGlBAnwuGFJ7Dv49fFgMWq X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: e688a5c8-ab33-46f5-7bdc-08db982e1653 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:51.5846 (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: PR3P250MB0355 Subject: [FFmpeg-devel] [PATCH 14/15] avformat/matroskaenc: Reindent after the previous commit 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: uDAgqdejloSI Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 49 ++++++++++++++++++++------------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 5c251cec7b..7cbae47e42 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1681,10 +1681,11 @@ static void mkv_write_blockadditionmapping(AVFormatContext *s, const MatroskaMux // be overwritten when finishing the track. put_ebml_uint(pb, MATROSKA_ID_TRACKMAXBLKADDID, 0); if (par->codec_type == AVMEDIA_TYPE_VIDEO) { - // Similarly, reserve space for an eventual HDR10+ ITU T.35 metadata BlockAdditionMapping. - put_ebml_void(pb, 3 /* BlockAdditionMapping */ - + 4 /* BlockAddIDValue */ - + 4 /* BlockAddIDType */); + // Similarly, reserve space for an eventual + // HDR10+ ITU T.35 metadata BlockAdditionMapping. + put_ebml_void(pb, 3 /* BlockAdditionMapping */ + + 4 /* BlockAddIDValue */ + + 4 /* BlockAddIDType */); } } @@ -2767,28 +2768,28 @@ static int mkv_write_block(void *logctx, MatroskaMuxContext *mkv, } if (par->codec_type == AVMEDIA_TYPE_VIDEO) { - side_data = av_packet_get_side_data(pkt, - AV_PKT_DATA_DYNAMIC_HDR10_PLUS, - &side_data_size); - if (side_data && side_data_size) { - uint8_t *payload = t35_buf; - size_t payload_size = sizeof(t35_buf) - 6; - - bytestream_put_byte(&payload, 0xB5); // country_code - bytestream_put_be16(&payload, 0x3C); // provider_code - bytestream_put_be16(&payload, 0x01); // provider_oriented_code - bytestream_put_byte(&payload, 0x04); // application_identifier - - ret = av_dynamic_hdr_plus_to_t35((AVDynamicHDRPlus *)side_data, &payload, - &payload_size); - if (ret < 0) - return ret; + side_data = av_packet_get_side_data(pkt, + AV_PKT_DATA_DYNAMIC_HDR10_PLUS, + &side_data_size); + if (side_data && side_data_size) { + uint8_t *payload = t35_buf; + size_t payload_size = sizeof(t35_buf) - 6; + + bytestream_put_byte(&payload, 0xB5); // country_code + bytestream_put_be16(&payload, 0x3C); // provider_code + bytestream_put_be16(&payload, 0x01); // provider_oriented_code + bytestream_put_byte(&payload, 0x04); // application_identifier + + ret = av_dynamic_hdr_plus_to_t35((AVDynamicHDRPlus *)side_data, &payload, + &payload_size); + if (ret < 0) + return ret; - mkv_write_blockadditional(&writer, t35_buf, payload_size + 6, - MATROSKA_BLOCK_ADD_ID_ITU_T_T35); - track->max_blockaddid = FFMAX(track->max_blockaddid, + mkv_write_blockadditional(&writer, t35_buf, payload_size + 6, MATROSKA_BLOCK_ADD_ID_ITU_T_T35); - } + track->max_blockaddid = FFMAX(track->max_blockaddid, + MATROSKA_BLOCK_ADD_ID_ITU_T_T35); + } } ebml_writer_close_or_discard_master(&writer); From patchwork Tue Aug 8 16:40:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 43187 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9329:b0:130:ccc6:6c4b with SMTP id r41csp2409003pzh; Tue, 8 Aug 2023 09:41:17 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEGbcfA5ntBy7HRJudnT6Cam5qNwPJgDhlHQw0hzKYYDiaYJkAxRCUm3k5trfY7oI8r9+RR X-Received: by 2002:a17:906:53d1:b0:99c:7134:4f95 with SMTP id p17-20020a17090653d100b0099c71344f95mr113215ejo.32.1691512877019; Tue, 08 Aug 2023 09:41:17 -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 l18-20020a1709067d5200b0099364d9f0e4si3758484ejp.278.2023.08.08.09.41.16; Tue, 08 Aug 2023 09:41:16 -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=rbjO7cRJ; 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 6097168C826; Tue, 8 Aug 2023 19:40:02 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01olkn2062.outbound.protection.outlook.com [40.92.64.62]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id F021668C7F9 for ; Tue, 8 Aug 2023 19:39:55 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=PV3KPmyWZr17PDjLov5HoofEalWQh4bCnhS4QF3t3myew8wskYoaK9aGoo+1YizYHMM7TJIcNJRbqgBQrZ2FQX+yoAkxQzh07buJu4pka4hb850c3WQ1N4w5a/0wwa3i8LyD/7uHsddjeqADfw+4uuGRBNyv2Au1+FloOBKkMj7iuh7sCMv3/3L2XjPvE8/ovWZ2mkUx+SKnKobzYHXBMBdnWM/o9OFv75jHUaFY5KhR0FPh7/2nZQllGxMX/t7CBzhMyC5/cFL8jee87mAqB3EeuxcJykX6gXioopttKX1M10M3u3hlr5Hz3WC06JOvSTJgMcD8QJa09Eb2CwyF+Q== 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=/J1No6plkzl5CTDTcc0JLkZMZZoN3HMFyotSS/KmhKw=; b=NMNtXLB8hIB92Z6OobAW8HcIYN2jQxLG1q6l7eQ88Vziqvyuc9bdYJv3IYItit5l6PLyhBWzD1aG45AJMFnifTfKEyy5ho6nKyJGuJPO7qtf6Yu5HGL+gPQubZkmYV684Xy/cxJSpEDNg1z0kkx34xrzOzvgm05sUN2u4v9SRPffIz8DL1ZLIL79J+y/p2RMsKiV9NVb0SJpxFR+ACOk1T4uh16O1zJuL/8ShrOsxnieaz/Xihb0roFLD0t9hiYLV884ensIlkQHqA2FPZx5VhedGIeZ6xe6SIJQsqvTvT3Dm6Y0nd6XQN00G6yT/HxEwAgAmzDjwIEFLzRVrWKwhA== 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=/J1No6plkzl5CTDTcc0JLkZMZZoN3HMFyotSS/KmhKw=; b=rbjO7cRJzC4RCPptRwIvLXqwiEFZa6b5pBRyMESCO8UeYsr0/iRvd7REculVfDzo1Q135f9Nu6Y0QoZAqqka2kgBCTttzrPMDVAfOSVrTR1ivNgdvoss6VE/vbXbqdAp77aNPgmNDJzlpPljHku00dvcaw1c6MlBZ5cchX+gULs3uksatlnNSSwLMHYHLN8TPEafZTy3bwDW2yOS4DQfyxF/IgtaG/wNC07HD7c4WiF+LGDkPgyqgEbF3QcbQb2oDUHbzF823zRKUw4IIgPE0RLoPAfSUz794eaIPz75RyN00X8Wn7zEryzlIJx6BlcuQqoZtZ04frDLa2UIhvz+Aw== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0355.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17e::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.27; Tue, 8 Aug 2023 16:39:52 +0000 Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa]) by AS8P250MB0744.EURP250.PROD.OUTLOOK.COM ([fe80::5e01:aea5:d3a8:cafa%3]) with mapi id 15.20.6652.021; Tue, 8 Aug 2023 16:39:52 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 8 Aug 2023 18:40:36 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [AGk2C3hhBGeOApsEFu05OgKGBd7dEQVCxBBTD+zVo7Q=] X-ClientProxiedBy: ZR0P278CA0085.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:22::18) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230808164036.810177-10-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0355:EE_ X-MS-Office365-Filtering-Correlation-Id: 03fadf0c-2868-4cde-f634-08db982e16f7 X-MS-Exchange-SLBlob-MailProps: EgT5Wr3QDKy65eRJXb6jJynmsNGeDtzHVy61tZjS7vrLJ5kvMD+kfY0Mn/dvxcyWP3BKODJWRTCZrBROd4lHkEIuLbyEPzZsI6b7U+i5Cl787qHZGNkHSA8F/ZemdsAd/XzxNZ8ebwPCCY1v69SRyGAK5dpM6YLwUOaqr3B8wi64RNNWZ/SLjZ+V/feBvc8xQR63z0r//+6VW8o3jbJsTrI5r33LQIwBuq3KVCUH6K7/leNXjyZJZb2T2jEGjgSqF+m+M7BlkwwY/yOlUiFenu/jfRpb+wNODw7q8eP1qx3Fq5Kmd0YU0mTfgxjJlXOTGqVaOIBwbF7nS9oPlgDyNwtxj856A9Zbq8DBMPLghWO0cK2djZZKnztd6WeVm8ObfTbEFMThej98/e0hhKCsvSIvu0o0EoV1Gr04fw/jmGicUOA1KfsCD5me7cWYhDxVGjvvBcU+yAz+UJSDv2J3YNcT1rmL6IwRXUAtqVOSFAU04Xo1NE6sLcX04P763orkAaO2NoHUeGanw6AmQsZXv0EoeGk/74hJRdeW8wtSfej1iWyFNU6/B62/VdI/LmX23hI3X0A7KF0cDAzNZgepS3MAm56xfInevFaPnE4wH1f4eIf9ar7CCwVL1qnxR8HD2HFexrWxdB3wRYhKCg0RkG9d63QDLwlBKu8RAN/5AQa7mwx7t7tkvecbcgvqJCgRSwf6yWUwn85szpGbq0h4M5WlYigoPzo9XF4LkBvHTmk= X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: j+z7xLEgzTSoJ9MCV1zAugKAMiUQutU/PXgTN9iis6VZhXBH/eRo6amVW+eIR8b8ydWaGF/G7G8R1sFB14zPgFWkIHZEJGAeDRg4jf9YGzXWCgNOdFOm1gu9igZUhc25nzye3CheyhV43kzVNjJ4o60xok2Otid+62uTxeElyjocyGFwwU1TICI6t+EZ0l6nU0kw4kSiruoIKBxvGOtyXqTT24BP8iU8oUZITflmz+DOxB+MdJejB+pHHAUKZPtXu+A6Iu/4DlOLFDWYxXoWYhnJjCTAwY+P8B/pCWXvIp22FdZAfvtmhHqG+glq6Jkw20pKaFJX6llCKOPkZBLFUyk2FgQaFIbHo7eX1qvJWIw+kZRqpsNO6kL8mQzh90/FoBkyuLrpszATEISaAHc7vVvtrp4B3WGQJdMxdLepcjLtcCPEKLcvA7z3RAg2gSGfjBD6HxFf7LPKXPXc0gNeisPmf/0uXpl5byJb6+q6ZhFQJJ7QqvjbYjjpaVPx4a3fCgaYKou/InVJR/KF6OMxBiEXCKbO0bDyRYUEHP9zytPPklVsGDfNWMH8586DGJ+wET36VozVnSg06DCFM1R/jYhR6MUAxxP8OGtC1ZIl1EFUFImCl/F17zvTjta6PL6M X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: rcrTJ7Gqfbh3AlFo4Mh0/bdmjMazUnP0bBGvoyZUxaZDmJsOSf+xlxwfLxB0j9+9Rq55BJERO+MCwNsLmEw6zHhEFp6mPx2Ljc4rO4RW1KahwqsRC6bLBETkrs1RBktCnSe1lhoTKIEYbSUI9hIslYrwGi7iTrODbSHjZxkY70Jji2+AxK8SsY/bhjGMucpEcN/xExPG2Fnj/NAblDbJq4BX1/BY/BlA32fA2UYsi7v9psiHDZE7Apc1faaTLI05MKi5bYVTr+OnCPI3nIP+Bk+T4OE/1fFSNqSUkAcci7ql7zuG2c9gMbecCTVJwjzulkNdl4S7GIEuDGJSjuC1abUECxAAerib9WSPCC6NHxU9OapLlRT51sIH0DHeS4qJlM4mZoBb6sRCqNiH4M95WOs4bN4AxH6Dce1eEQNSdj+9x/Fs8tg9s13YP9J86MHxwaiH2h4dQKTSwl8Ju40X5xx7J1BfIkULiWu3cXLRIQlFeM7XjmoWlfWq7J+/CP2/XU+v8Mym9qr03tfEEWqOEAZmvyArGcT/Z665gXOopFVRJoitZhse+BVdTnM0uZGgY6U14gf+DDoWK0IFf5wuQzEYHxdkbjqjYeeiIODw8Yx48KzCYRgd3+aRGGkImmtR3BahYE1op3ZWTgNfi+s/4s5jJGRqkLDGhpm4Dxiazjsm4p1Qy7GuHk5nXQvWnpBxh/nJaRAgT3p6eG8KuaRf3n8ntcMQbkyE1trMYgenrIdYS00ApNEEMh+lUdVg/ehmVypGFKJrgEDgbbvwllz3lu8KyJ0fj9OP+GjBmnrF7D/y91s1TGbWk+CSr2t8jKzFh2lF4hBH0aZTPrF6tPqX32ljrTxreV7yEfg6usounXAkzR0Jw8FI/3kHw1Gw94+8W1SaW4VVFgEFWltOuZiiUS/edRtTEPRzQsWTYRi+yQGtZz9EgAC5bn4IkTm2vuhOcvz0uMJJR2c9yiDCC0JQjdR/t9nzbajEP14nKCREUqWk8nOwnShs0bHYkJ5sF/jZq8ESzxSOQ8Teh3uunl2U4ai0MB8qUqQ4EJRkeanFE5/1b8hq2cskrmR/IAYUVOXnYSoRZgyKFlYsSmaijwcFjj0TBzuMNtzb51RB/bIDakwEIqY05SlY1juahYAr3fIaBjQLoJWKpcxChTmv6Wv2HZPFViAGLxqqnzSvnt/pO6sbR7Xn8VWDgNIce83BIVJS4A9gWHMPk5xrqNTgq7mFmDp/mge/OkVAf3JyVKYMI52m9eGpBGy4+z7t16WatBgu X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 03fadf0c-2868-4cde-f634-08db982e16f7 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 Aug 2023 16:39:52.6866 (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: PR3P250MB0355 Subject: [FFmpeg-devel] [PATCH 15/15] avformat/matroskaenc: Don't write \0 unnecessarily 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: 85X61sOesfWN Writing the duration SimpleTag is special: It's size is reserved in advance via an EBML Void element (if seekable) and this reserved space is overwritten when writing the trailer; it does not use put_ebml_string(). The string to write is created via snprintf on a buffer of size 20; this buffer is then written via put_ebml_binary() with a size of 20. EBML strings need not be zero-terminated; if not, they are implicitly terminated by the element's length field. snprintf() always zero-terminates the buffer, i.e. the last byte can be discarded when using an EBML string. This patch does this. The FATE changes are as expected: One byte saved for every track; the only exception is the matroska-qt-mode test: An additional byte is saved because an additional byte could be saved from the enclosing Tags length field. Signed-off-by: Andreas Rheinhardt --- Why has this been overlooked for so long? libavformat/matroskaenc.c | 15 ++++--- tests/ref/fate/aac-autobsf-adtstoasc | 4 +- tests/ref/fate/matroska-alac-remux | 4 +- tests/ref/fate/matroska-avoid-negative-ts | 4 +- tests/ref/fate/matroska-dovi-write-config7 | 4 +- tests/ref/fate/matroska-dovi-write-config8 | 4 +- tests/ref/fate/matroska-dvbsub-remux | 4 +- tests/ref/fate/matroska-encoding-delay | 14 +++--- tests/ref/fate/matroska-flac-extradata-update | 4 +- tests/ref/fate/matroska-h264-remux | 4 +- tests/ref/fate/matroska-hdr10-plus-remux | 6 +-- .../fate/matroska-mastering-display-metadata | 4 +- tests/ref/fate/matroska-move-cues-to-front | 4 +- tests/ref/fate/matroska-mpegts-remux | 4 +- tests/ref/fate/matroska-ms-mode | 4 +- tests/ref/fate/matroska-ogg-opus-remux | 10 ++--- tests/ref/fate/matroska-opus-remux | 10 ++--- tests/ref/fate/matroska-pgs-remux | 4 +- tests/ref/fate/matroska-pgs-remux-durations | 4 +- tests/ref/fate/matroska-qt-mode | 4 +- tests/ref/fate/matroska-spherical-mono-remux | 4 +- tests/ref/fate/matroska-vp8-alpha-remux | 4 +- tests/ref/fate/matroska-zero-length-block | 4 +- tests/ref/fate/rgb24-mkv | 4 +- tests/ref/fate/shortest-sub | 4 +- tests/ref/fate/webm-av1-extradata-update | 4 +- tests/ref/fate/webm-dash-chapters | 4 +- tests/ref/fate/webm-hdr10-plus-remux | 6 +-- tests/ref/fate/webm-webvtt-remux | 4 +- tests/ref/lavf-fate/av1.mkv | 4 +- tests/ref/lavf/mka | 4 +- tests/ref/lavf/mkv | 4 +- tests/ref/lavf/mkv_attachment | 4 +- tests/ref/seek/lavf-mkv | 44 +++++++++---------- 34 files changed, 109 insertions(+), 104 deletions(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 7cbae47e42..e813ef86cf 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -264,8 +264,12 @@ typedef struct MatroskaMuxContext { /** 4 * (1-byte EBML ID, 1-byte EBML size, 8-byte uint max) */ #define MAX_CUETRACKPOS_SIZE 40 -/** 2 + 1 Simpletag header, 2 + 1 + 8 Name "DURATION", 23B for TagString */ -#define DURATION_SIMPLETAG_SIZE (2 + 1 + (2 + 1 + 8) + 23) +/** DURATION_STRING_LENGTH must be <= 112 or the containing + * simpletag will need more than one byte for its length field. */ +#define DURATION_STRING_LENGTH 19 + +/** 2 + 1 Simpletag header, 2 + 1 + 8 Name "DURATION", rest for TagString */ +#define DURATION_SIMPLETAG_SIZE (2 + 1 + (2 + 1 + 8) + (2 + 1 + DURATION_STRING_LENGTH)) /** Seek preroll value for opus */ #define OPUS_SEEK_PREROLL 80000000 @@ -3239,7 +3243,7 @@ after_cues: if (track->duration_offset > 0) { double duration_sec = track->duration * av_q2d(st->time_base); - char duration_string[20] = ""; + char duration_string[DURATION_STRING_LENGTH + 1] = ""; ebml_master simpletag; av_log(s, AV_LOG_DEBUG, "stream %d end duration = %" PRIu64 "\n", i, @@ -3250,11 +3254,12 @@ after_cues: 2 + 1 + 8 + 23); put_ebml_string(tags_bc, MATROSKA_ID_TAGNAME, "DURATION"); - snprintf(duration_string, 20, "%02d:%02d:%012.9f", + snprintf(duration_string, sizeof(duration_string), "%02d:%02d:%012.9f", (int) duration_sec / 3600, ((int) duration_sec / 60) % 60, fmod(duration_sec, 60)); - put_ebml_binary(tags_bc, MATROSKA_ID_TAGSTRING, duration_string, 20); + put_ebml_binary(tags_bc, MATROSKA_ID_TAGSTRING, + duration_string, DURATION_STRING_LENGTH); end_ebml_master(tags_bc, simpletag); } } diff --git a/tests/ref/fate/aac-autobsf-adtstoasc b/tests/ref/fate/aac-autobsf-adtstoasc index 76125083b6..616f875ab3 100644 --- a/tests/ref/fate/aac-autobsf-adtstoasc +++ b/tests/ref/fate/aac-autobsf-adtstoasc @@ -1,5 +1,5 @@ -3d4465a7ea2cfba31af737e288c892fe *tests/data/fate/aac-autobsf-adtstoasc.matroska -6646 tests/data/fate/aac-autobsf-adtstoasc.matroska +b8594ae7884fcad4acfc5b997d012857 *tests/data/fate/aac-autobsf-adtstoasc.matroska +6645 tests/data/fate/aac-autobsf-adtstoasc.matroska #extradata 0: 2, 0x0030001c #tb 0: 1/1000 #media_type 0: audio diff --git a/tests/ref/fate/matroska-alac-remux b/tests/ref/fate/matroska-alac-remux index 3eb3cdcb37..70fb11a14f 100644 --- a/tests/ref/fate/matroska-alac-remux +++ b/tests/ref/fate/matroska-alac-remux @@ -1,5 +1,5 @@ -c683b17ab66c9f0fba57da7af86740c9 *tests/data/fate/matroska-alac-remux.matroska -1293810 tests/data/fate/matroska-alac-remux.matroska +71f41fb8d2fe30281c254c378921bf2a *tests/data/fate/matroska-alac-remux.matroska +1293809 tests/data/fate/matroska-alac-remux.matroska #extradata 0: 36, 0x562b05d8 #tb 0: 1/1000 #media_type 0: audio diff --git a/tests/ref/fate/matroska-avoid-negative-ts b/tests/ref/fate/matroska-avoid-negative-ts index f52f3dec72..05821cbf09 100644 --- a/tests/ref/fate/matroska-avoid-negative-ts +++ b/tests/ref/fate/matroska-avoid-negative-ts @@ -1,5 +1,5 @@ -69461a333cae20646d4e514b7b510bef *tests/data/fate/matroska-avoid-negative-ts.matroska -973074 tests/data/fate/matroska-avoid-negative-ts.matroska +dede1d72a28c7eb0a849acf230b08247 *tests/data/fate/matroska-avoid-negative-ts.matroska +973072 tests/data/fate/matroska-avoid-negative-ts.matroska #extradata 0: 22, 0x2885037c #tb 0: 1/1000 #media_type 0: video diff --git a/tests/ref/fate/matroska-dovi-write-config7 b/tests/ref/fate/matroska-dovi-write-config7 index ef4c87d885..aaeeb34751 100644 --- a/tests/ref/fate/matroska-dovi-write-config7 +++ b/tests/ref/fate/matroska-dovi-write-config7 @@ -1,5 +1,5 @@ -82581e39700ff479516c33402e8b1d5d *tests/data/fate/matroska-dovi-write-config7.matroska -72702 tests/data/fate/matroska-dovi-write-config7.matroska +7adef53df9e14358e0b99f8a829e2d97 *tests/data/fate/matroska-dovi-write-config7.matroska +72700 tests/data/fate/matroska-dovi-write-config7.matroska #extradata 0: 116, 0x2b8d1669 #extradata 1: 116, 0x2b8d1669 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-dovi-write-config8 b/tests/ref/fate/matroska-dovi-write-config8 index de90101a55..55fe191047 100644 --- a/tests/ref/fate/matroska-dovi-write-config8 +++ b/tests/ref/fate/matroska-dovi-write-config8 @@ -1,5 +1,5 @@ -56eea905c35996a729371372dd3113f9 *tests/data/fate/matroska-dovi-write-config8.matroska -3600609 tests/data/fate/matroska-dovi-write-config8.matroska +0730145aa317d800cb4bde0e3a38bb8d *tests/data/fate/matroska-dovi-write-config8.matroska +3600607 tests/data/fate/matroska-dovi-write-config8.matroska #extradata 0: 551, 0xa18acf66 #extradata 1: 2, 0x00340022 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-dvbsub-remux b/tests/ref/fate/matroska-dvbsub-remux index 03341d9668..f55b9642c4 100644 --- a/tests/ref/fate/matroska-dvbsub-remux +++ b/tests/ref/fate/matroska-dvbsub-remux @@ -1,5 +1,5 @@ -5d1591e9abd7e1373d43bc776572aaf7 *tests/data/fate/matroska-dvbsub-remux.matroska -39018 tests/data/fate/matroska-dvbsub-remux.matroska +d6385d4623cd59061c13e26b004eaa8e *tests/data/fate/matroska-dvbsub-remux.matroska +39016 tests/data/fate/matroska-dvbsub-remux.matroska #extradata 0: 5, 0x00bb0064 #extradata 1: 5, 0x00bb0064 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-encoding-delay b/tests/ref/fate/matroska-encoding-delay index 3059c32e03..d2ff2d07be 100644 --- a/tests/ref/fate/matroska-encoding-delay +++ b/tests/ref/fate/matroska-encoding-delay @@ -1,5 +1,5 @@ -c51ac49b96b213e6646196fc81f8eb84 *tests/data/fate/matroska-encoding-delay.matroska -961240 tests/data/fate/matroska-encoding-delay.matroska +156c5c615bee0c55e76275df8d84e505 *tests/data/fate/matroska-encoding-delay.matroska +961238 tests/data/fate/matroska-encoding-delay.matroska #extradata 0: 22, 0x32ea0490 #tb 0: 1/1000 #media_type 0: video @@ -32,7 +32,7 @@ dts_time=-0.010000 duration=24 duration_time=0.024000 size=1152 -pos=1257 +pos=1255 flags=K__ [/PACKET] [PACKET] @@ -45,7 +45,7 @@ dts_time=0.000000 duration=40 duration_time=0.040000 size=237628 -pos=2417 +pos=2415 flags=K__ [/PACKET] [PACKET] @@ -58,7 +58,7 @@ dts_time=0.014000 duration=24 duration_time=0.024000 size=1152 -pos=240052 +pos=240050 flags=K__ [/PACKET] [PACKET] @@ -71,7 +71,7 @@ dts_time=0.038000 duration=24 duration_time=0.024000 size=1152 -pos=241227 +pos=241225 flags=K__ [/PACKET] [PACKET] @@ -84,7 +84,7 @@ dts_time=0.040000 duration=40 duration_time=0.040000 size=238066 -pos=242387 +pos=242385 flags=K__ [/PACKET] [STREAM] diff --git a/tests/ref/fate/matroska-flac-extradata-update b/tests/ref/fate/matroska-flac-extradata-update index d6713aaafa..a4f8bf2dac 100644 --- a/tests/ref/fate/matroska-flac-extradata-update +++ b/tests/ref/fate/matroska-flac-extradata-update @@ -1,5 +1,5 @@ -fdbfdc51b519fd5e8f425aca1e7b8704 *tests/data/fate/matroska-flac-extradata-update.matroska -1807 tests/data/fate/matroska-flac-extradata-update.matroska +f0b0a6a8a0fc975aef9048023faf7c92 *tests/data/fate/matroska-flac-extradata-update.matroska +1804 tests/data/fate/matroska-flac-extradata-update.matroska #extradata 0: 34, 0x93650c81 #extradata 1: 34, 0x93650c81 #extradata 2: 34, 0x93650c81 diff --git a/tests/ref/fate/matroska-h264-remux b/tests/ref/fate/matroska-h264-remux index aefd6f65ef..2c727f03cd 100644 --- a/tests/ref/fate/matroska-h264-remux +++ b/tests/ref/fate/matroska-h264-remux @@ -1,5 +1,5 @@ -bc0ce442f20d1d62663b40391a3be812 *tests/data/fate/matroska-h264-remux.matroska -2036071 tests/data/fate/matroska-h264-remux.matroska +f6b943ed3ff05087d0ef58fbaf7abcb0 *tests/data/fate/matroska-h264-remux.matroska +2036067 tests/data/fate/matroska-h264-remux.matroska #tb 0: 1/25 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/matroska-hdr10-plus-remux b/tests/ref/fate/matroska-hdr10-plus-remux index bb0580db33..923fd2a7ab 100644 --- a/tests/ref/fate/matroska-hdr10-plus-remux +++ b/tests/ref/fate/matroska-hdr10-plus-remux @@ -1,5 +1,5 @@ -0f941512f69b1cc0ac27f3375e56a0cc *tests/data/fate/matroska-hdr10-plus-remux.matroska -13892 tests/data/fate/matroska-hdr10-plus-remux.matroska +299d8f8b5174f9a8747304056d742501 *tests/data/fate/matroska-hdr10-plus-remux.matroska +13891 tests/data/fate/matroska-hdr10-plus-remux.matroska #tb 0: 1/1000 #media_type 0: video #codec_id 0: vp9 @@ -16,7 +16,7 @@ dts_time=0.000000 duration=40 duration_time=0.040000 size=13350 -pos=436 +pos=435 flags=K__ [SIDE_DATA] side_data_type=HDR10+ Dynamic Metadata (SMPTE 2094-40) diff --git a/tests/ref/fate/matroska-mastering-display-metadata b/tests/ref/fate/matroska-mastering-display-metadata index ad36f01e61..3726469213 100644 --- a/tests/ref/fate/matroska-mastering-display-metadata +++ b/tests/ref/fate/matroska-mastering-display-metadata @@ -1,5 +1,5 @@ -b3204c8fa6a78037243cc4948a2775ee *tests/data/fate/matroska-mastering-display-metadata.matroska -1669593 tests/data/fate/matroska-mastering-display-metadata.matroska +9d0fb8123a2e90e85153428a91d1ee9d *tests/data/fate/matroska-mastering-display-metadata.matroska +1669589 tests/data/fate/matroska-mastering-display-metadata.matroska #extradata 0: 4, 0x040901a3 #extradata 3: 200, 0x506463a8 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-move-cues-to-front b/tests/ref/fate/matroska-move-cues-to-front index 79ccc2fd93..1deacaa370 100644 --- a/tests/ref/fate/matroska-move-cues-to-front +++ b/tests/ref/fate/matroska-move-cues-to-front @@ -1,5 +1,5 @@ -74a5ed3f0b14112322c8bf3e94d6e98b *tests/data/fate/matroska-move-cues-to-front.matroska -23210297 tests/data/fate/matroska-move-cues-to-front.matroska +4ca0bdb5636523c3e43b9dbf692ae21c *tests/data/fate/matroska-move-cues-to-front.matroska +23210293 tests/data/fate/matroska-move-cues-to-front.matroska #tb 0: 1/1000 #media_type 0: audio #codec_id 0: pcm_s24be diff --git a/tests/ref/fate/matroska-mpegts-remux b/tests/ref/fate/matroska-mpegts-remux index af41b57af1..c6b7d324b0 100644 --- a/tests/ref/fate/matroska-mpegts-remux +++ b/tests/ref/fate/matroska-mpegts-remux @@ -1,5 +1,5 @@ -ca1b91e49b6e238b641007c186d8f424 *tests/data/fate/matroska-mpegts-remux.matroska -6502 tests/data/fate/matroska-mpegts-remux.matroska +52e030428110a8c1b74c03c7ad31a6ca *tests/data/fate/matroska-mpegts-remux.matroska +6500 tests/data/fate/matroska-mpegts-remux.matroska #tb 0: 1/1000 #media_type 0: audio #codec_id 0: ac3 diff --git a/tests/ref/fate/matroska-ms-mode b/tests/ref/fate/matroska-ms-mode index 7ce0f1e4ff..5c91209910 100644 --- a/tests/ref/fate/matroska-ms-mode +++ b/tests/ref/fate/matroska-ms-mode @@ -1,5 +1,5 @@ -703d268b966d5dfabe5e22c2de69dc66 *tests/data/fate/matroska-ms-mode.matroska -413105 tests/data/fate/matroska-ms-mode.matroska +a2897e3951b0054d0fa31fe51860444f *tests/data/fate/matroska-ms-mode.matroska +413103 tests/data/fate/matroska-ms-mode.matroska #extradata 0: 40, 0x54290c93 #extradata 1: 114, 0xb6c80771 #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-ogg-opus-remux b/tests/ref/fate/matroska-ogg-opus-remux index cd3eade361..bf6613e257 100644 --- a/tests/ref/fate/matroska-ogg-opus-remux +++ b/tests/ref/fate/matroska-ogg-opus-remux @@ -1,5 +1,5 @@ -b602a1a4aaa4fbca4b8aaf39b66d7235 *tests/data/fate/matroska-ogg-opus-remux.matroska -10204 tests/data/fate/matroska-ogg-opus-remux.matroska +87d0185c5b780dd9509aafd957236bdd *tests/data/fate/matroska-ogg-opus-remux.matroska +10203 tests/data/fate/matroska-ogg-opus-remux.matroska #extradata 0: 19, 0x399c0471 #tb 0: 1/1000 #media_type 0: audio @@ -57,7 +57,7 @@ dts_time=-0.007000 duration=20 duration_time=0.020000 size=402 -pos=544 +pos=543 flags=K__ [/PACKET] [PACKET] @@ -70,7 +70,7 @@ dts_time=0.013000 duration=20 duration_time=0.020000 size=216 -pos=953 +pos=952 flags=K__ [/PACKET] [PACKET] @@ -83,7 +83,7 @@ dts_time=0.033000 duration=20 duration_time=0.020000 size=215 -pos=1176 +pos=1175 flags=K__ [/PACKET] [STREAM] diff --git a/tests/ref/fate/matroska-opus-remux b/tests/ref/fate/matroska-opus-remux index 975510e167..9f2526dc57 100644 --- a/tests/ref/fate/matroska-opus-remux +++ b/tests/ref/fate/matroska-opus-remux @@ -1,5 +1,5 @@ -fe0258eb0d4b525203ea240c87a154d3 *tests/data/fate/matroska-opus-remux.matroska -9359 tests/data/fate/matroska-opus-remux.matroska +b9881205f8945fefc16a6f23474071a6 *tests/data/fate/matroska-opus-remux.matroska +9358 tests/data/fate/matroska-opus-remux.matroska #extradata 0: 19, 0x3a04048f #tb 0: 1/1000 #media_type 0: audio @@ -68,7 +68,7 @@ dts_time=-0.007000 duration=20 duration_time=0.020000 size=320 -pos=500 +pos=499 flags=K__ [/PACKET] [PACKET] @@ -81,7 +81,7 @@ dts_time=0.014000 duration=20 duration_time=0.020000 size=159 -pos=827 +pos=826 flags=K__ [/PACKET] [PACKET] @@ -94,7 +94,7 @@ dts_time=0.034000 duration=20 duration_time=0.020000 size=148 -pos=993 +pos=992 flags=K__ [/PACKET] [STREAM] diff --git a/tests/ref/fate/matroska-pgs-remux b/tests/ref/fate/matroska-pgs-remux index a086111495..318cc65ec3 100644 --- a/tests/ref/fate/matroska-pgs-remux +++ b/tests/ref/fate/matroska-pgs-remux @@ -1,5 +1,5 @@ -d39daa393d66ae0b0c153be045897585 *tests/data/fate/matroska-pgs-remux.matroska -49748 tests/data/fate/matroska-pgs-remux.matroska +b03d39ae755cb07fde023f6e9e6186ce *tests/data/fate/matroska-pgs-remux.matroska +49747 tests/data/fate/matroska-pgs-remux.matroska #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: hdmv_pgs_subtitle diff --git a/tests/ref/fate/matroska-pgs-remux-durations b/tests/ref/fate/matroska-pgs-remux-durations index 37494cd98f..4a07f5edf2 100644 --- a/tests/ref/fate/matroska-pgs-remux-durations +++ b/tests/ref/fate/matroska-pgs-remux-durations @@ -1,5 +1,5 @@ -27af80eecea4f15f415f22841bc699d5 *tests/data/fate/matroska-pgs-remux-durations.matroska -49760 tests/data/fate/matroska-pgs-remux-durations.matroska +1d8fedf8f90f755f9dd6914489ee8ab2 *tests/data/fate/matroska-pgs-remux-durations.matroska +49759 tests/data/fate/matroska-pgs-remux-durations.matroska #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: hdmv_pgs_subtitle diff --git a/tests/ref/fate/matroska-qt-mode b/tests/ref/fate/matroska-qt-mode index 62a2d82f16..90bbd52bde 100644 --- a/tests/ref/fate/matroska-qt-mode +++ b/tests/ref/fate/matroska-qt-mode @@ -1,5 +1,5 @@ -f2eac23e9f7f3a7dac9e2d94885ff4f1 *tests/data/fate/matroska-qt-mode.matroska -1884243 tests/data/fate/matroska-qt-mode.matroska +bab6f4122a60a0d4e192fb93c17a5464 *tests/data/fate/matroska-qt-mode.matroska +1884240 tests/data/fate/matroska-qt-mode.matroska #extradata 0: 90, 0x817d0185 #tb 0: 1/1000 #media_type 0: video diff --git a/tests/ref/fate/matroska-spherical-mono-remux b/tests/ref/fate/matroska-spherical-mono-remux index 0940e3ea86..e9904b2c92 100644 --- a/tests/ref/fate/matroska-spherical-mono-remux +++ b/tests/ref/fate/matroska-spherical-mono-remux @@ -1,5 +1,5 @@ -281555d95fca08f3ba103eefa1c22b54 *tests/data/fate/matroska-spherical-mono-remux.matroska -161584 tests/data/fate/matroska-spherical-mono-remux.matroska +fddfea5f05a7a9a0d187df9a72900055 *tests/data/fate/matroska-spherical-mono-remux.matroska +161582 tests/data/fate/matroska-spherical-mono-remux.matroska #extradata 0: 43, 0x2b0e0d7b #extradata 1: 43, 0x2b0e0d7b #tb 0: 1/1000 diff --git a/tests/ref/fate/matroska-vp8-alpha-remux b/tests/ref/fate/matroska-vp8-alpha-remux index 86024b3477..eba3ffb77a 100644 --- a/tests/ref/fate/matroska-vp8-alpha-remux +++ b/tests/ref/fate/matroska-vp8-alpha-remux @@ -1,5 +1,5 @@ -635702724143e90d2a3ec457f65676cf *tests/data/fate/matroska-vp8-alpha-remux.matroska -235026 tests/data/fate/matroska-vp8-alpha-remux.matroska +129f76bb3cee967ebd067efa30c4e4f7 *tests/data/fate/matroska-vp8-alpha-remux.matroska +235025 tests/data/fate/matroska-vp8-alpha-remux.matroska #tb 0: 1/1000 #media_type 0: video #codec_id 0: vp8 diff --git a/tests/ref/fate/matroska-zero-length-block b/tests/ref/fate/matroska-zero-length-block index 3987cc14c4..2affd97067 100644 --- a/tests/ref/fate/matroska-zero-length-block +++ b/tests/ref/fate/matroska-zero-length-block @@ -1,5 +1,5 @@ -f577fad2fff41d6e055f605281582b8d *tests/data/fate/matroska-zero-length-block.matroska -634 tests/data/fate/matroska-zero-length-block.matroska +451a43f61da7baee559005881d94203e *tests/data/fate/matroska-zero-length-block.matroska +633 tests/data/fate/matroska-zero-length-block.matroska #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: subrip diff --git a/tests/ref/fate/rgb24-mkv b/tests/ref/fate/rgb24-mkv index 484198aaa4..99234f1052 100644 --- a/tests/ref/fate/rgb24-mkv +++ b/tests/ref/fate/rgb24-mkv @@ -1,5 +1,5 @@ -4801308890e7a9db51fc13b05f817165 *tests/data/fate/rgb24-mkv.matroska -58226 tests/data/fate/rgb24-mkv.matroska +e181dc84058c3584598333dabd110123 *tests/data/fate/rgb24-mkv.matroska +58225 tests/data/fate/rgb24-mkv.matroska #tb 0: 1/10 #media_type 0: video #codec_id 0: rawvideo diff --git a/tests/ref/fate/shortest-sub b/tests/ref/fate/shortest-sub index 49e13d65d7..9caee587ce 100644 --- a/tests/ref/fate/shortest-sub +++ b/tests/ref/fate/shortest-sub @@ -1,5 +1,5 @@ -2b6e72494d74aaf07380bfe3d50b62d5 *tests/data/fate/shortest-sub.matroska -139251 tests/data/fate/shortest-sub.matroska +73d142a80965f9e0884a5863abde0dab *tests/data/fate/shortest-sub.matroska +139249 tests/data/fate/shortest-sub.matroska #extradata 1: 167, 0xf7272d5f #tb 0: 1/1000 #media_type 0: video diff --git a/tests/ref/fate/webm-av1-extradata-update b/tests/ref/fate/webm-av1-extradata-update index 68bbb9ad89..3a84511bae 100644 --- a/tests/ref/fate/webm-av1-extradata-update +++ b/tests/ref/fate/webm-av1-extradata-update @@ -1,5 +1,5 @@ -fbf3091fdf05b2856c578e7c948d68c3 *tests/data/fate/webm-av1-extradata-update.webm -23048 tests/data/fate/webm-av1-extradata-update.webm +dc7593b977b092e522018de7e0d12681 *tests/data/fate/webm-av1-extradata-update.webm +23047 tests/data/fate/webm-av1-extradata-update.webm #extradata 0: 35, 0x527207cd #tb 0: 1/1000 #media_type 0: video diff --git a/tests/ref/fate/webm-dash-chapters b/tests/ref/fate/webm-dash-chapters index 9444824c4c..f32e83852f 100644 --- a/tests/ref/fate/webm-dash-chapters +++ b/tests/ref/fate/webm-dash-chapters @@ -1,5 +1,5 @@ -aa3ca15fae0239d6bf67fa0658a8bc3b *tests/data/fate/webm-dash-chapters.webm -111150 tests/data/fate/webm-dash-chapters.webm +e2d3d812e6d9cf05a36eaefe02801a99 *tests/data/fate/webm-dash-chapters.webm +111149 tests/data/fate/webm-dash-chapters.webm #extradata 0: 3469, 0xc6769ddc #tb 0: 1/1000 #media_type 0: audio diff --git a/tests/ref/fate/webm-hdr10-plus-remux b/tests/ref/fate/webm-hdr10-plus-remux index d8dbb93598..04ab55e56f 100644 --- a/tests/ref/fate/webm-hdr10-plus-remux +++ b/tests/ref/fate/webm-hdr10-plus-remux @@ -1,5 +1,5 @@ -30923c8d916f5719f62727f24957974f *tests/data/fate/webm-hdr10-plus-remux.webm -13843 tests/data/fate/webm-hdr10-plus-remux.webm +7c5ae91189589c07f92aa97cb9b3d9e1 *tests/data/fate/webm-hdr10-plus-remux.webm +13842 tests/data/fate/webm-hdr10-plus-remux.webm #tb 0: 1/1000 #media_type 0: video #codec_id 0: vp9 @@ -16,7 +16,7 @@ dts_time=0.000000 duration=40 duration_time=0.040000 size=13350 -pos=393 +pos=392 flags=K__ [SIDE_DATA] side_data_type=HDR10+ Dynamic Metadata (SMPTE 2094-40) diff --git a/tests/ref/fate/webm-webvtt-remux b/tests/ref/fate/webm-webvtt-remux index 88def03dbe..b247eec894 100644 --- a/tests/ref/fate/webm-webvtt-remux +++ b/tests/ref/fate/webm-webvtt-remux @@ -1,5 +1,5 @@ -0b43695bf27bbe48ea44e969d8908e1f *tests/data/fate/webm-webvtt-remux.webm -6528 tests/data/fate/webm-webvtt-remux.webm +c372c76c062d368f1d17373c19f83579 *tests/data/fate/webm-webvtt-remux.webm +6524 tests/data/fate/webm-webvtt-remux.webm #tb 0: 1/1000 #media_type 0: subtitle #codec_id 0: webvtt diff --git a/tests/ref/lavf-fate/av1.mkv b/tests/ref/lavf-fate/av1.mkv index 685fd70811..84924fe05c 100644 --- a/tests/ref/lavf-fate/av1.mkv +++ b/tests/ref/lavf-fate/av1.mkv @@ -1,3 +1,3 @@ -279268e8d6ffcc2299e725a756bbb1a0 *tests/data/lavf-fate/lavf.av1.mkv -55657 tests/data/lavf-fate/lavf.av1.mkv +ba198efa114b4db3c9f772728f84978b *tests/data/lavf-fate/lavf.av1.mkv +55656 tests/data/lavf-fate/lavf.av1.mkv tests/data/lavf-fate/lavf.av1.mkv CRC=0x7c27cc15 diff --git a/tests/ref/lavf/mka b/tests/ref/lavf/mka index 93a0b8f71a..135fade76c 100644 --- a/tests/ref/lavf/mka +++ b/tests/ref/lavf/mka @@ -1,3 +1,3 @@ -77db16a9fe1c42a230c85124bfb40cad *tests/data/lavf/lavf.mka -43573 tests/data/lavf/lavf.mka +4fede420f36a21bbb3ae4e5d6a884267 *tests/data/lavf/lavf.mka +43572 tests/data/lavf/lavf.mka tests/data/lavf/lavf.mka CRC=0x3a1da17e diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index 8ddc9cf57f..1b25aea6aa 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,3 +1,3 @@ -05889ab61cc6144018c80e50c781fe44 *tests/data/lavf/lavf.mkv -320428 tests/data/lavf/lavf.mkv +d5f719b715ad5eb6860c85f0d8202b8e *tests/data/lavf/lavf.mkv +320426 tests/data/lavf/lavf.mkv tests/data/lavf/lavf.mkv CRC=0xec6c3c68 diff --git a/tests/ref/lavf/mkv_attachment b/tests/ref/lavf/mkv_attachment index 6a08a580d2..3a599c6ed5 100644 --- a/tests/ref/lavf/mkv_attachment +++ b/tests/ref/lavf/mkv_attachment @@ -1,3 +1,3 @@ -901b4ba820fe1d6c627ce2a4b31b65af *tests/data/lavf/lavf.mkv_attachment -472578 tests/data/lavf/lavf.mkv_attachment +7681b6ece94f20684838bcbba2458c58 *tests/data/lavf/lavf.mkv_attachment +472576 tests/data/lavf/lavf.mkv_attachment tests/data/lavf/lavf.mkv_attachment CRC=0xec6c3c68 diff --git a/tests/ref/seek/lavf-mkv b/tests/ref/seek/lavf-mkv index 6abdbd6ee7..78c2b13b46 100644 --- a/tests/ref/seek/lavf-mkv +++ b/tests/ref/seek/lavf-mkv @@ -1,48 +1,48 @@ -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 676 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 674 size: 208 ret: 0 st:-1 flags:0 ts:-1.000000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837 ret: 0 st:-1 flags:1 ts: 1.894167 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 27834 ret: 0 st: 0 flags:0 ts: 0.788000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 27834 ret: 0 st: 0 flags:1 ts:-0.317000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837 ret:-1 st: 1 flags:0 ts: 2.577000 ret: 0 st: 1 flags:1 ts: 1.471000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320149 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320147 size: 209 ret: 0 st:-1 flags:0 ts: 0.365002 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146860 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146858 size: 27925 ret: 0 st:-1 flags:1 ts:-0.740831 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837 ret:-1 st: 0 flags:0 ts: 2.153000 ret: 0 st: 0 flags:1 ts: 1.048000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 27834 ret: 0 st: 1 flags:0 ts:-0.058000 -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 676 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 674 size: 208 ret: 0 st: 1 flags:1 ts: 2.836000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320149 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320147 size: 209 ret:-1 st:-1 flags:0 ts: 1.730004 ret: 0 st:-1 flags:1 ts: 0.624171 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146860 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146858 size: 27925 ret: 0 st: 0 flags:0 ts:-0.482000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837 ret: 0 st: 0 flags:1 ts: 2.413000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 27834 ret:-1 st: 1 flags:0 ts: 1.307000 ret: 0 st: 1 flags:1 ts: 0.201000 -ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 676 size: 208 +ret: 0 st: 1 flags:1 dts:-0.011000 pts:-0.011000 pos: 674 size: 208 ret: 0 st:-1 flags:0 ts:-0.904994 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837 ret: 0 st:-1 flags:1 ts: 1.989173 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 27834 ret: 0 st: 0 flags:0 ts: 0.883000 -ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292308 size: 27834 +ret: 0 st: 0 flags:1 dts: 0.960000 pts: 0.960000 pos: 292306 size: 27834 ret: 0 st: 0 flags:1 ts:-0.222000 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837 ret:-1 st: 1 flags:0 ts: 2.672000 ret: 0 st: 1 flags:1 ts: 1.566000 -ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320149 size: 209 +ret: 0 st: 1 flags:1 dts: 0.982000 pts: 0.982000 pos: 320147 size: 209 ret: 0 st:-1 flags:0 ts: 0.460008 -ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146860 size: 27925 +ret: 0 st: 0 flags:1 dts: 0.480000 pts: 0.480000 pos: 146858 size: 27925 ret: 0 st:-1 flags:1 ts:-0.645825 -ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 892 size: 27837 +ret: 0 st: 0 flags:1 dts: 0.000000 pts: 0.000000 pos: 890 size: 27837