From patchwork Fri Aug 11 10:43: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: 43209 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:8b1b:b0:130:ccc6:6c4b with SMTP id l27csp1257175pzh; Fri, 11 Aug 2023 03:43:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG+wWVOlZbA6P2us6okVGjwOCRlxeUI8DiDN0vfae7i45CHEK/CGNesvghCKRpkKWKgHieB X-Received: by 2002:ac2:58c6:0:b0:4fe:85c:aeba with SMTP id u6-20020ac258c6000000b004fe085caebamr994546lfo.21.1691750611064; Fri, 11 Aug 2023 03:43: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 gl24-20020a170906e0d800b0099bd7765448si3294597ejb.464.2023.08.11.03.43.30; Fri, 11 Aug 2023 03:43: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=Bopv8web; 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 96D9968C7C9; Fri, 11 Aug 2023 13:43:28 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from EUR03-DBA-obe.outbound.protection.outlook.com (mail-dbaeur03olkn2075.outbound.protection.outlook.com [40.92.58.75]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5C2A968C686 for ; Fri, 11 Aug 2023 13:43:22 +0300 (EEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fP7tC+qwSKGTNzAN/SXms8osRRvd65sklS9HhxndCOVj9VaBA1vRqPgBugorPTgPV9FcPJJotGRrAVPojwGGvhsW0iJTs/ohnhcCjNIx8LPyC1DouF2cIw6qdaUxhpsvIlsNu6hYRV3DViu+nhfW13UddZQ/wXjybK7e0z5XBEBq0uCBLWbzqKvL9zzXOwYuihZf6S/MIp3/iNHxFU1JP+MXgeyE3svMzK1CMZFFktC+7KkVxVT4FC4ptIAcP6fN1XXSde04UuGMMLfOdYOgyIAThBYpSfeO8EFfWF5zYq/LvMX+RhCL3HuJDWmOjbDL0LDViv9kg2msbyfLfjIx+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=tjhfMDMzGCovlMzmkgGarpBywmfq2R5UWt9p2rTnoHs=; b=chHilvDJzALyclH+D4YnsECNrCqcnWWP+SsF+QBxkEhlixhvMgGbwscn11we73nVj0MsmUl2gv3bCJHwLjtFkuNzSt0ibKLDXzuSxjIv5XvZjL8KHI0KBBlIq63Z1z3oecp+QXoPrvqi5cMFfY/DFJVZ1Noh797sfvKe7EiR21chXiM2fbdnnJo2BZQenPlPyFNbSLm9vwaKu1EECMa2fKLClDhgZ878OyG0J5Mh8gwcDqE5luPoG+gQKxEqcAce3iiYQSXw+vc0tODY/RVgwfrlqSEWHV9goo3nr8argjDCodpuIP4N+hWrt5Mlu+9wPHPX2Y7i1SiGvQtppRSJJQ== 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=tjhfMDMzGCovlMzmkgGarpBywmfq2R5UWt9p2rTnoHs=; b=Bopv8webUZx1aKl6jjAd7i9QYczmRwVzxisinHcR5scREgEOh9d6iLp0QR0CO5TDjxwCiAwhEd9z+WR1Iw5F32Ok+E3TAYyHhjksye11PK6QyYIJrLc60wk70F5+1uC1z5lE+j2iCSBkCuwNJYPQhYx+hcqRZbXANm/gjPT/m7n4X0HIGKiJIdgPKNSCltTKDje56p9w50PwFi4RU6O4ys2/zN2ySRpjDdfAjHED5DD3wSkfM73jyYFQphRXSb4yB22K8ExuHl3NG6WWDq6nq4DjnmcBQWJMthGhWCTdUskTdDk4wfbCmYQGy8gRXWkmViEWKYUoHDstXN7DSO7wIg== Received: from AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) by PR3P250MB0273.EURP250.PROD.OUTLOOK.COM (2603:10a6:102:17c::9) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6652.30; Fri, 11 Aug 2023 10:43:20 +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.029; Fri, 11 Aug 2023 10:43:20 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 11 Aug 2023 12:43:24 +0200 Message-ID: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: X-TMN: [iC9UOwZyr++d7QUpVF4Xdc+tcLrq18+7xy5nTUN4p2k=] X-ClientProxiedBy: ZR2P278CA0021.CHEP278.PROD.OUTLOOK.COM (2603:10a6:910:46::17) To AS8P250MB0744.EURP250.PROD.OUTLOOK.COM (2603:10a6:20b:541::14) X-Microsoft-Original-Message-ID: <20230811104328.2278289-4-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: AS8P250MB0744:EE_|PR3P250MB0273:EE_ X-MS-Office365-Filtering-Correlation-Id: 58ccee51-f3ce-49c7-24c2-08db9a57c196 X-MS-Exchange-SLBlob-MailProps: ZILSnhm0P3nMLW7c7Td5qj0CguLCiW3dfE+bnfN00KBr9zdpB/5K84bOX+Vcj2WTxa9/dIDuyl7O/sp8Ms3g12cDw2pbMVPtHlsC1SSIhQDwvz55ev/cnPFuxanhM0BkDCFpbpmVyVV+ws+nVyExYEI5Pu7Q2WIUiAHlpopaCHlCY6Fqnq+LLSAeTt5u8SuobhJG0JiudJnyasgOmPyIQg+UdUwVcNG9kqQIqUBPDbPiTnZbO+Mk5efyFQrsHlavYDv/GVKAdZyb9srrmSKdslVBeTElTXg8mL1cf5cbV9z0LhyQpDWuTXAlA33TOB+2y1QojDZenBkIgPDLeXywihWiapNwqSuGnDf0A0GfiMMLHN9LkhM5+8INytWUuZHsUU/u8doO2JCElJuYRB5kjc2erQbPRGe92ouPGyRGCKK667zNSEVnqt++sbIkUstjvzVavUg7XgEOj9J01ghOki1iOOUaZxoeJRaM6g4NJywzRxohlYhnH6IUi4rt89Ul+37drgjjiMu83V3dj1c11RLiXd2dEAYhNxWGop4iHAZ6MuFLk02Or8fsz3LR0lpZPHeSPpCRDi43fNwLWv1FbvYgpUb78vG9C9HycrA9IxO5mAYHg+fPf0ehPeDYl5YZlV5xnEapWPHoYyn1yt24gcaxg4urzEnzZM52RqaQ9OVPyX1z6QkpekTJE4NVAyR45/aekGfYHrSZh7D2bqzxuR5T4/CeG5SZylwrtBAWAQGu1lbhlEgCiQmvdzYMSLpKq05XNw0jqlSMzCPJZ0f5AK5li/Yl5adW X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: NZNyCin0Ro5zvTpLk7Rg+UGS6ES1EX5BujHHqL6rm2qEydYVgmLxfG9vZo79+m7o4gd5CXAFDcn7rpcFjn7GLw3yvJYvpW9I2nPu/CIdNuk8z53Kf8whxYwExsAIG9kHbXz1aEQfC6cfbIv57n3+RHsb8tkXi/S/lsriRLQuwBZ6L9P9NxuRgEfLV4uSgNg23RAj0WGhYQOuzLKhLUhMyGe80+ERpQ+pbtKvmj9XuriJIVHBy9ChL63UIt5ChGETMHmAqMHUsZKOa277AvpGhW6E3JGQ+wUNpfltbHKhCgL9XMh4Yv7Z5g9rXHtLAykflLIvCpfxye3yIJx69MeAZTyQg6PINGzbYbgF+WekhzV6dyfLI1zLorQFD/CF8uKT3LaH99KUumKNdkqvaHopAZnt1p1ZolHCr1ZYoAgcXTk50k7heLx2V8rrbLBLeUWbLcmIT2FTrQz9e9ndwTXsul2OrcKcPjM3VNA0SMz5SnfVUAjFKRdpdGDpcuf7fS9y5jsvzTOiPc7XmlbW17KGiBd43bzhNY/1Le/lm2DdKy1dis0x2NnDZAWyXvFCFc4JpHrCjNYy3tOies6CBEyCxiWa8iUtvqoica9f48KpbESgHnRolO3nhARFE3YZQZNx X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 8G9+lF+VpmFvOvU0BCEWL9aep56NEG1aGNtX7Df2bvRVM4w6IJcWdkc6rqtNmaPLcnx1pS8BVUl90RUaOP3U3UzACESMdQvTgOng/rr/OuVc1XmVNAtT5+SFOwzCk+tuD9DPwPIEcozixpgPbqdd1ZcX6kg+qPA8gQKyqZxwteR1llOLoyjFhoJxFxaCIr8tpZzFCBO956GoCKO1dhA4/XID95J/U4S78C5PO5oDlCQKupeqWrn/HzFdKXLbXzxHgks4IVHweQdsWqYrI+W8i49YOsGkQ/PbZTTuiOxlrkr5PQTmmI0Xe0M2aaofpuOdCUwEqVpdi5qGIIScv9JV30K7QgbV6EZB/segDNDhajPl5cRCmGMWOfSFXGidqlNBwx6XbrGmRdA6LAjQpketaJuAA5cw9kqqbqM5CXBzUxNt6W91vqFKDDs4NE5LOjtB6LGSxlUgKk8mMpbiwQ4vPQUDZRcbDEJoQeyQvQB/OQ2Zlc1osk9rNtCc/RBEnVhfY55ipJs3aCBgTdAdZ0u0YqJG69Kh5gRtxdo3Hc1ChcPYiVaZp5tFcLcSBIem+1UcFAv6PcaiDepKdF7TZ+iJIHMv3hrtnBg15rqScR4H7YEqtVSMpQya2RALQLPXBYsjQwad0OKqRhT2B1rKApVCjiYfGgbobwEap7HrDp4X20V9Kibjz7cNGQJI0A3PLZQnNOb785ES+J/ut4N7oDLhKsRDEr3kNCzGsFVPdVb1vCrKW5t+PpBB/cMwiVEtcTNqTwP51hxXuByO0ZFJM7mr+c8USxRgVJ1vqxYevwK1F9jTJGWoRFl11dWZtgcySMCC5dWjCBtXZO8Nh3Csj6Z6rV6TsebMiwcqJ63XHwHvO+rgJRFXdp8PXVIeRfTZNnjvivvc/YTEkXVk3mePBdNU7tbV6tZaFUL7c8n4NK9zVBEivMkhDyHDF1DVojyzplWcZEdqPOTyxVgx+8zjT8P/tFd5AMkGwdIf4whXtXV3v1UqWNVYTKz4WBqUMXtgn/r5lUCv/mYiWVd4tavpYVtYWAHV43VYKo+IyvL+pIDePLPT+AUhpKxqc8QGeoMh5QArFJQiRit+USq+D5qALfVVVgWR2noEGNX6TCHu/4fBj/Lnm+p0hxNSMB/6zovJ4UBKB4PNcvxsOjzUEbwk91xFjFxAdMWseAjmL2p5LcPOFE8LVStnXGFFlFn35kJUWOuGItcD9uyBPWXAj3iZmANyUKfrL+A/lsSOWmUcH4rzsUqYntHE0m7tXrEKeFMbNJ7a X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 58ccee51-f3ce-49c7-24c2-08db9a57c196 X-MS-Exchange-CrossTenant-AuthSource: AS8P250MB0744.EURP250.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2023 10:43:20.7612 (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: PR3P250MB0273 Subject: [FFmpeg-devel] [PATCH 5/9] avformat/matroskaenc: Improve message for WebM-incompatible StereoModes 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: NjUs260MpseF Signed-off-by: Andreas Rheinhardt --- libavformat/matroskaenc.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 20d3af3b42..c4be6791ab 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -1583,6 +1583,7 @@ static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer, const AVStream *st, int is_webm, int *h_width, int *h_height) { + const char *error_message_addendum = ""; const AVDictionaryEntry *tag; MatroskaVideoStereoModeType format = MATROSKA_VIDEO_STEREOMODE_TYPE_NB; @@ -1656,6 +1657,7 @@ static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer, // if webm, do not write unsupported modes if (is_webm && !(webm_bitfield >> format)) { + error_message_addendum = " for WebM"; goto fail; } @@ -1668,7 +1670,8 @@ static int mkv_write_stereo_mode(AVFormatContext *s, EbmlWriter *writer, return 0; fail: av_log(s, AV_LOG_ERROR, - "The specified stereo mode is not valid.\n"); + "The specified stereo mode is not valid%s.\n", + error_message_addendum); return AVERROR(EINVAL); }