From patchwork Mon Aug 21 20:15:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 43280 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:47ca:b0:130:ccc6:6c4b with SMTP id ey10csp1662822pzb; Mon, 21 Aug 2023 13:15:31 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHy1HO7lfqzTvGHCh64s3dl8et3kBHD9vWZWGEMHbTHCx9q9hdH7ZOk4kzhCtaXKd0ZxHDy X-Received: by 2002:a17:906:1da2:b0:99b:c830:cf23 with SMTP id u2-20020a1709061da200b0099bc830cf23mr6327769ejh.27.1692648930877; Mon, 21 Aug 2023 13:15:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1692648930; cv=none; d=google.com; s=arc-20160816; b=nfgdqeP2/3aP/0FeXyvQaSEfwbNr4HEJrqjP/YsO0dGisvF45ogVLq6sPAn2kMVkOr SuT+lsRnLIvBlperU18s1C5TieAu10niFAeu+GkJQxNYHhRrX5T3wUUEazHi0PxuzfK1 6eDFwrHR/0sCAT6AIO0QUdCpRQhclRzSBoagsQYEyB/ehdGqsUscu3+cIhD1hQn2GQfJ 7vX2ky8j2eGMaWf1jnfHBVbleos+M2jqy6AP4BIMKdNR42GTaqAwpfyXj8fX+YGfAusp 5f6hWI262Q5w+02aML2mClgVBbh5NxJAfwMuiv/6+i9ndq+IkupZD0aGng7EzgDv/5il pUNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=JqB992A5ILe004BS53GBguP85lGmzL8Dyfiqa18/e6I=; fh=nsVKsSaZMdLznXlUv/EWC2FmpLC7hjoSIJBzkkMfbDw=; b=dUB5sKKs85CgRr3VRhj4np6IE9tnOTfK+gEQUdoakX6RW+JkUOKpDj5vuvD7MramCP 3VE3DC6RH8ZUHkSxYNS0sAiVAO6bzL/jlHZnEk0rsoj7LG17iMRn4gV5eHhQ6GKkJHjq /ktEDv9rJ+usUGEjW7RP1ob3y0pXBD5fOn0AnvOnt6VAOIkeXWwIK3i23oYUblyphIbJ kvNJ2qgVhtZrBn+7pCe9bkbORiLZjK8705FpLkS/FKh6e5jnmErTCONvmJNriGq116zz IUF8nkF5TLRyXOqI8txCCJru5KsDkJEoQYpuXUX+oXtCxnsCQ9YLYPK9agtt+zTOFZVG cZaA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20221208.gappssmtp.com header.s=20221208 header.b=g621yOq2; 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 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id p20-20020a170906605400b0099cbd8ab716si6494368ejj.820.2023.08.21.13.15.30; Mon, 21 Aug 2023 13:15: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=@martin-st.20221208.gappssmtp.com header.s=20221208 header.b=g621yOq2; 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 Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0FDFF68C2C7; Mon, 21 Aug 2023 23:15:27 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 929D268B2EB for ; Mon, 21 Aug 2023 23:15:20 +0300 (EEST) Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2b962c226ceso59626841fa.3 for ; Mon, 21 Aug 2023 13:15:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20221208.gappssmtp.com; s=20221208; t=1692648920; x=1693253720; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=hy11LC77B5teOMtg7NIIwOcZRJInR2Wy4qJLyNtlfCk=; b=g621yOq2z36hg62PXsp9483RBS63c/QKkEEwCUsXXTUl7k5p6cE3nim5phQvAxq9jl JTgNw8kYSnXCynY8P/+RLJv9ev7O7gWaoeTAy0gbQUGiMIsBmCTsOV13g/GioG39c4RX q/opU3p+heWGBc8lOUUhg81XwBtV4whF02Eg6a34KGgqLnDFlMrO9KtXK5JdPTvlNc8a C0YFnGFEzcDBwpyUr+t1+Ep3JWJKIC9CusBuGE2DWeWtlSHfZ5dBGvgUia5MR+Oz1N7R ZrAYvkMw9fWRqYVEc573dJzxJjJ46SEnlAI3XOAaK/G1D9ZZflKayd7daupIlgtnhrB+ Xn0g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692648920; x=1693253720; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=hy11LC77B5teOMtg7NIIwOcZRJInR2Wy4qJLyNtlfCk=; b=Kgn84hS4+iUtdKrEXfQrRSNion0WiezTo31nXTdEEsSu+L3vQnUvyyIjaZjVagbF/Q t2oS4xRczjRhAy4w29+EBXgWGdwWDhZuOrV8HbPfXlnVwC6LJW/+PoSSaezgMpfPgl+e ZZyKfc08KRe/hou1OVi+IbsVftaz7nRSenoehJRvIc805QlvZYEQtrQU9EzcZMT19xEH txguUY3z+S3ISJW9mYzyQyLRHcDkASsRo6zSg7g+pdeFBgzsWRakfAGiZZxD3x2vrFED R4YhiDZNY5pYqyhDyUUwGFuJrdz2owRVJGSDsHVaHHwDqKXPYbhapqul5ctiZpjuhN6C tq2g== X-Gm-Message-State: AOJu0YyyS6wVsamxzMMv7+J7TflRKEicdZgS7OZ98wSW28D4WX2WIMSa 3NxLYLkA1T6wg+3LEQEoEvbWcXFImYUlpg7Vaqutew== X-Received: by 2002:a2e:8192:0:b0:2bb:a770:7981 with SMTP id e18-20020a2e8192000000b002bba7707981mr6102787ljg.32.1692648919628; Mon, 21 Aug 2023 13:15:19 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id n22-20020a2e86d6000000b002b6dc35da95sm2435697ljj.139.2023.08.21.13.15.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Aug 2023 13:15:19 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Aug 2023 23:15:18 +0300 Message-Id: <20230821201518.2132316-1-martin@martin.st> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] fate/matroska: Stop using unicode in command line paramters 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: CsWLzZqaeOuU The fate-run.sh shell script exports LC_ALL=C before invoking the test executables; this is probably done for consistency. When executing Windows binaries with Wine, it normally handles UTF-8 command line parameters just fine - but with LC_ALL set to C, it treats them as plain ASCII. As the unicode command line parameters wasn't the main thing being tested here, just convert them to plain ASCII, for portability. This fixes the test for all test configurations that use Wine. --- tests/fate/matroska.mak | 6 +++--- tests/ref/fate/matroska-stereo_mode | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/fate/matroska.mak b/tests/fate/matroska.mak index 44f5c535e4..d1c316e998 100644 --- a/tests/fate/matroska.mak +++ b/tests/fate/matroska.mak @@ -228,10 +228,10 @@ FATE_MATROSKA_FFMPEG_FFPROBE-$(call REMUX, MATROSKA, OGG_DEMUXER THEORA_DECODER) fate-matroska-stereo_mode: CMD = transcode ogg $(TARGET_SAMPLES)/vp3/offset_test.ogv matroska \ "-c copy -write_crc32 0 -default_mode infer \ -map 0 -disposition:s:0 +original+dub -metadata:s:0 language=ger \ - -map 0 -metadata:s:1 stereo_mode=left_right -metadata:s:1 language=ger-at -metadata:s:1 description-ger=Deutsch -metadata:s:1 description-fre=Français \ - -map 0 -metadata:s:2 stereo_mode=bottom_top -metadata:s:2 language=eng -metadata:s:2 description-de=Deutsch -metadata:s:2 description-fra=Français \ + -map 0 -metadata:s:1 stereo_mode=left_right -metadata:s:1 language=ger-at -metadata:s:1 description-ger=Deutsch -metadata:s:1 description-fre=Francais \ + -map 0 -metadata:s:2 stereo_mode=bottom_top -metadata:s:2 language=eng -metadata:s:2 description-de=Deutsch -metadata:s:2 description-fra=Francais \ -map 0 -metadata:s:3 stereo_mode=row_interleaved_rl -sar:3 3:1 -disposition:3 +default -metadata:s:3 language=deu-at \ - -map 0 -metadata:s:4 stereo_mode=col_interleaved_rl -sar:4 16:9 -metadata:s:4 language=fre -metadata:s:4 description-deu-at=Österreichisch \ + -map 0 -metadata:s:4 stereo_mode=col_interleaved_rl -sar:4 16:9 -metadata:s:4 language=fre -metadata:s:4 description-deu-at=Oesterreichisch \ -map 0 -metadata:s:5 stereo_mode=anaglyph_cyan_red -sar:5 16:9 -disposition:5 +default -metadata:s:5 language=fra \ -map 0 -metadata:s:6 stereo_mode=12 -sar:6 2:1 -metadata:s:6 language=de -metadata:s:6 description-deu=Deutsch" \ "-map 0 -c copy" \ diff --git a/tests/ref/fate/matroska-stereo_mode b/tests/ref/fate/matroska-stereo_mode index 3cd5e379f4..d406bb9b52 100644 --- a/tests/ref/fate/matroska-stereo_mode +++ b/tests/ref/fate/matroska-stereo_mode @@ -1,5 +1,5 @@ -1f074fcfb6f64ade0ad4b01f9e910515 *tests/data/fate/matroska-stereo_mode.matroska -1470758 tests/data/fate/matroska-stereo_mode.matroska +41cc6b0d334ac0465988579b99b78002 *tests/data/fate/matroska-stereo_mode.matroska +1470756 tests/data/fate/matroska-stereo_mode.matroska #extradata 0: 3510, 0x560c3919 #extradata 1: 3510, 0x560c3919 #extradata 2: 3510, 0x560c3919 @@ -126,7 +126,7 @@ DISPOSITION:original=0 TAG:language=ger-at TAG:stereo_mode=left_right TAG:DESCRIPTION-ger=Deutsch -TAG:DESCRIPTION-fre=Français +TAG:DESCRIPTION-fre=Francais TAG:DURATION=00:00:10.000000000 [SIDE_DATA] side_data_type=Stereo 3D @@ -141,7 +141,7 @@ DISPOSITION:original=0 TAG:language=eng TAG:stereo_mode=bottom_top TAG:DESCRIPTION-ger=Deutsch -TAG:DESCRIPTION-fre=Français +TAG:DESCRIPTION-fre=Francais TAG:DURATION=00:00:10.000000000 [SIDE_DATA] side_data_type=Stereo 3D @@ -168,7 +168,7 @@ DISPOSITION:dub=0 DISPOSITION:original=0 TAG:language=fre TAG:stereo_mode=col_interleaved_rl -TAG:DESCRIPTION-DEU-AT=Österreichisch +TAG:DESCRIPTION-DEU-AT=Oesterreichisch TAG:DURATION=00:00:10.000000000 [SIDE_DATA] side_data_type=Stereo 3D