[FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for running FATE on Windows/MSYS2

[FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for running FATE on Windows/MSYS2

[ffmpegagent]

When setting up the new Patchword builders I noticed some issues when
running FATE tests on Windows. Initially I had them suppressed on the
builders, but this patchset should finally fix it.

softworkz (3):
  tests/fate: Fix subtitle fate tests on Windows
  tests/source-check: Fix make inclusion-guard check EOL-agnostic
  tests/hevc: Fix concat input when running in MSYS2 shell

 .gitattributes             | 38 +++++++++++++++++++++++++++++++++++++-
 tests/fate/hevc.mak        |  2 +-
 tests/fate/source-check.sh |  2 +-
 3 files changed, 39 insertions(+), 3 deletions(-)


base-commit: 4014784b6229fe0829c2b154694fc13fcb963864
Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-77%2Fsoftworkz%2Fsubmit_fate_subs_eol-v1
Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-77/softworkz/submit_fate_subs_eol-v1
Pull-Request: https://github.com/ffstaging/FFmpeg/pull/77
-- 
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 1/3] tests/fate: Fix subtitle fate tests on Windows

[softworkz]

From: softworkz <softworkz@hotmail.com>

..when checked out with autocrlf=on, which is Git default
on Windows.

Signed-off-by: softworkz <softworkz@hotmail.com>
---
 .gitattributes | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index b64bbed2eb..eaf7f7f9a1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,38 @@
 *.pnm -diff -text
-Changelog    merge=union
+Changelog merge=union
+tests/ref/fate/sub-aqtitle eol=lf
+tests/ref/fate/sub-ass-to-ass-transcode eol=lf
+tests/ref/fate/sub-cc eol=lf
+tests/ref/fate/sub-cc-realtime
+tests/ref/fate/sub-cc-realtime eol=lf
+tests/ref/fate/sub-cc-scte20 eol=lf
+tests/ref/fate/sub-charenc eol=lf
+tests/ref/fate/sub-dvb eol=lf
+tests/ref/fate/sub-jacosub eol=lf
+tests/ref/fate/sub-lrc-remux eol=lf
+tests/ref/fate/sub-microdvd eol=lf
+tests/ref/fate/sub-microdvd-remux eol=lf
+tests/ref/fate/sub-movtext eol=lf
+tests/ref/fate/sub-mpl2 eol=lf
+tests/ref/fate/sub-mpsub eol=lf
+tests/ref/fate/sub-mpsub-frames eol=lf
+tests/ref/fate/sub-pgs-remux eol=lf
+tests/ref/fate/sub-pjs eol=lf
+tests/ref/fate/sub-realtext eol=lf
+tests/ref/fate/sub-sami eol=lf
+tests/ref/fate/sub-sami2 eol=lf
+tests/ref/fate/sub-scc-remux eol=lf
+tests/ref/fate/sub-srt eol=lf
+tests/ref/fate/sub-srt-badsyntax eol=lf
+tests/ref/fate/sub-srt-empty-events eol=lf
+tests/ref/fate/sub-srt-madness-timeshift eol=lf
+tests/ref/fate/sub-srt-rrn-remux eol=lf
+tests/ref/fate/sub-ssa-to-ass-remux eol=lf
+tests/ref/fate/sub-stl eol=lf
+tests/ref/fate/sub-subviewer eol=lf
+tests/ref/fate/sub-subviewer1 eol=lf
+tests/ref/fate/sub-ttmlenc eol=lf
+tests/ref/fate/sub-vplayer eol=lf
+tests/ref/fate/sub-webvtt eol=lf
+tests/ref/fate/sub-webvtt2 eol=lf
+tests/ref/fate/sub-webvttenc eol=lf
-- 
ffmpeg-codebot

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 2/3] tests/source-check: Fix make inclusion-guard check EOL-agnostic

[softworkz]

From: softworkz <softworkz@hotmail.com>

..to make it work when checked out with autocrlf=on,
which is Git default on Windows.

Signed-off-by: softworkz <softworkz@hotmail.com>
---
 tests/fate/source-check.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fate/source-check.sh b/tests/fate/source-check.sh
index 4d7e175784..99e869e869 100755
--- a/tests/fate/source-check.sh
+++ b/tests/fate/source-check.sh
@@ -28,7 +28,7 @@ for f in `git ls-files | grep '\.h$'` ; do
         -e 's/_vaf_/_/' \
     | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
 
-    git grep -L "^#define $macro$" $f
+    git grep -L "^#define $macro\>" $f
 done
 
 echo "Use of av_clip() where av_clip_uintp2() could be used:"
-- 
ffmpeg-codebot

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH 3/3] tests/hevc: Fix concat input when running in MSYS2 shell

[softworkz]

From: softworkz <softworkz@hotmail.com>

MSYS2 considers the colon (:) as path separator (=separating multiple
paths) and thinks it needs to convert it to a Windows
path separator (;).

Setting the MSYS2_ARG_CONV_EXCL environment variable
keeps MSYS2 from doing this replacement.

Signed-off-by: softworkz <softworkz@hotmail.com>
---
 tests/fate/hevc.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index e432345ef7..dee34e940d 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -283,7 +283,7 @@ $(TARGET_SAMPLES)/hevc-conformance/LS_A_Orange_2.bit|$\
 $(TARGET_SAMPLES)/hevc/mv_nuh_layer_id.bit|$\
 $(TARGET_SAMPLES)/hevc-conformance/NoOutPrior_B_Qualcomm_1.bit|$\
 $(TARGET_SAMPLES)/hevc-conformance/MVHEVCS_A.bit
-fate-hevc-mv-switch: CMD = framecrc -i "concat:$(INPUT)" -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags +accurate_rnd+bitexact
+fate-hevc-mv-switch: CMD = MSYS2_ARG_CONV_EXCL=concat: framecrc -i "concat:$(INPUT)" -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags +accurate_rnd+bitexact
 FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, SCALE_FILTER CONCAT_PROTOCOL) += fate-hevc-mv-switch
 
 # multiview stream, select view by position
-- 
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 3/3] tests/hevc: Fix concat input when running in MSYS2 shell

[Zhao Zhili]

> On May 12, 2025, at 17:59, softworkz <ffmpegagent@gmail.com> wrote:
> 
> From: softworkz <softworkz@hotmail.com>
> 
> MSYS2 considers the colon (:) as path separator (=separating multiple
> paths) and thinks it needs to convert it to a Windows
> path separator (;).
> 
> Setting the MSYS2_ARG_CONV_EXCL environment variable
> keeps MSYS2 from doing this replacement.

Doesn’t work for me.

The test failed if when set

—samples=/home/quink/ffmpeg-fate-sample

but success when set

—samples=D:/bin/msys/home/quink/ffmpeg-fate-sample

Other test case don’t have this issue. With a single input,
msys can convert the unix path to Windows path before pass
to ffmpeg, but failed for concat.

> 
> Signed-off-by: softworkz <softworkz@hotmail.com>
> ---
> tests/fate/hevc.mak | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
> index e432345ef7..dee34e940d 100644
> --- a/tests/fate/hevc.mak
> +++ b/tests/fate/hevc.mak
> @@ -283,7 +283,7 @@ $(TARGET_SAMPLES)/hevc-conformance/LS_A_Orange_2.bit|$\
> $(TARGET_SAMPLES)/hevc/mv_nuh_layer_id.bit|$\
> $(TARGET_SAMPLES)/hevc-conformance/NoOutPrior_B_Qualcomm_1.bit|$\
> $(TARGET_SAMPLES)/hevc-conformance/MVHEVCS_A.bit
> -fate-hevc-mv-switch: CMD = framecrc -i "concat:$(INPUT)" -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags +accurate_rnd+bitexact
> +fate-hevc-mv-switch: CMD = MSYS2_ARG_CONV_EXCL=concat: framecrc -i "concat:$(INPUT)" -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags +accurate_rnd+bitexact
> FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, SCALE_FILTER CONCAT_PROTOCOL) += fate-hevc-mv-switch
> 
> # multiview stream, select view by position
> -- 
> ffmpeg-codebot
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 3/3] tests/hevc: Fix concat input when running in MSYS2 shell

[softworkz .]

> -----Original Message-----
> From: Zhao Zhili <quinkblack@foxmail.com>
> Sent: Montag, 12. Mai 2025 18:53
> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
> Cc: softworkz <softworkz@hotmail.com>
> Subject: Re: [FFmpeg-devel] [PATCH 3/3] tests/hevc: Fix concat input when
> running in MSYS2 shell
> 
> 
> 
> > On May 12, 2025, at 17:59, softworkz <ffmpegagent@gmail.com> wrote:
> >
> > From: softworkz <softworkz@hotmail.com>
> >
> > MSYS2 considers the colon (:) as path separator (=separating multiple
> > paths) and thinks it needs to convert it to a Windows
> > path separator (;).
> >
> > Setting the MSYS2_ARG_CONV_EXCL environment variable
> > keeps MSYS2 from doing this replacement.
> 
> Doesn’t work for me.
> 
> The test failed if when set
> 
> —samples=/home/quink/ffmpeg-fate-sample
> 
> but success when set
> 
> —samples=D:/bin/msys/home/quink/ffmpeg-fate-sample

Another case that this patch fixes is

—samples=../fate-suite

> Other test case don’t have this issue.

Because no other test uses the concat: protocol.

> With a single input,
> msys can convert the unix path to Windows path before pass
> to ffmpeg, but failed for concat.

The problem is the colon behind concat, which it considers to 
be a separator and hence changes it to a semicolon.
When the samples-path starts with a slash, it might behave 
differently again, no sure.

I'll add a note to the commit message, explaining which cases 
it fixes.

Thanks,
sw


_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 3/3] tests/hevc: Fix concat input when running in MSYS2 shell

[Zhao Zhili]

> On May 13, 2025, at 01:04, softworkz . <softworkz-at-hotmail.com@ffmpeg.org> wrote:
> 
> 
> 
>> -----Original Message-----
>> From: Zhao Zhili <quinkblack@foxmail.com>
>> Sent: Montag, 12. Mai 2025 18:53
>> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
>> Cc: softworkz <softworkz@hotmail.com>
>> Subject: Re: [FFmpeg-devel] [PATCH 3/3] tests/hevc: Fix concat input when
>> running in MSYS2 shell
>> 
>> 
>> 
>>> On May 12, 2025, at 17:59, softworkz <ffmpegagent@gmail.com> wrote:
>>> 
>>> From: softworkz <softworkz@hotmail.com>
>>> 
>>> MSYS2 considers the colon (:) as path separator (=separating multiple
>>> paths) and thinks it needs to convert it to a Windows
>>> path separator (;).
>>> 
>>> Setting the MSYS2_ARG_CONV_EXCL environment variable
>>> keeps MSYS2 from doing this replacement.
>> 
>> Doesn’t work for me.
>> 
>> The test failed if when set
>> 
>> —samples=/home/quink/ffmpeg-fate-sample
>> 
>> but success when set
>> 
>> —samples=D:/bin/msys/home/quink/ffmpeg-fate-sample

> 
> Another case that this patch fixes is
> 
> —samples=../fate-suite
> 
>> Other test case don’t have this issue.
> 
> Because no other test uses the concat: protocol.
> 
>> With a single input,
>> msys can convert the unix path to Windows path before pass
>> to ffmpeg, but failed for concat.
> 
> The problem is the colon behind concat, which it considers to 
> be a separator and hence changes it to a semicolon.
> When the samples-path starts with a slash, it might behave 
> differently again, no sure.
> 
> I'll add a note to the commit message, explaining which cases 
> it fixes.

OK. Some other test cases don't work with D:/bin/msys/home/quink/ffmpeg-fate-sample.
Only relative path with the patch can make fate success.

It’s a tough work experience on Windows.

> 
> Thanks,
> sw
> 
> 
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel@ffmpeg.org
> https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
> 
> To unsubscribe, visit link above, or email
> ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 3/3] tests/hevc: Fix concat input when running in MSYS2 shell

[softworkz .]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Zhao Zhili
> Sent: Montag, 12. Mai 2025 19:24
> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH 3/3] tests/hevc: Fix concat input when
> running in MSYS2 shell
> 
> 
> 
> > On May 13, 2025, at 01:04, softworkz . <softworkz-at-hotmail.com@ffmpeg.org>
> wrote:
> >
> >
> >
> >> -----Original Message-----
> >> From: Zhao Zhili <quinkblack@foxmail.com>
> >> Sent: Montag, 12. Mai 2025 18:53
> >> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
> >> Cc: softworkz <softworkz@hotmail.com>
> >> Subject: Re: [FFmpeg-devel] [PATCH 3/3] tests/hevc: Fix concat input when
> >> running in MSYS2 shell
> >>
> >>
> >>
> >>> On May 12, 2025, at 17:59, softworkz <ffmpegagent@gmail.com> wrote:
> >>>
> >>> From: softworkz <softworkz@hotmail.com>
> >>>
> >>> MSYS2 considers the colon (:) as path separator (=separating multiple
> >>> paths) and thinks it needs to convert it to a Windows
> >>> path separator (;).
> >>>
> >>> Setting the MSYS2_ARG_CONV_EXCL environment variable
> >>> keeps MSYS2 from doing this replacement.
> >>
> >> Doesn’t work for me.
> >>
> >> The test failed if when set
> >>
> >> —samples=/home/quink/ffmpeg-fate-sample
> >>
> >> but success when set
> >>
> >> —samples=D:/bin/msys/home/quink/ffmpeg-fate-sample
> 
> >
> > Another case that this patch fixes is
> >
> > —samples=../fate-suite
> >
> >> Other test case don’t have this issue.
> >
> > Because no other test uses the concat: protocol.
> >
> >> With a single input,
> >> msys can convert the unix path to Windows path before pass
> >> to ffmpeg, but failed for concat.
> >
> > The problem is the colon behind concat, which it considers to
> > be a separator and hence changes it to a semicolon.
> > When the samples-path starts with a slash, it might behave
> > differently again, no sure.
> >
> > I'll add a note to the commit message, explaining which cases
> > it fixes.
> 
> OK. Some other test cases don't work with D:/bin/msys/home/quink/ffmpeg-fate-
> sample.
> Only relative path with the patch can make fate success.
> 
> It’s a tough work experience on Windows.

Yea, unfortunately.

I'm trying to make it a little bit better at least with the new 
Patchwork checks - like here: 
https://patchwork.ffmpeg.org/project/ffmpeg/patch/520f9af365f550aefc3e9abfacab83cfc8817b8e.1747043988.git.ffmpegagent@gmail.com/

For Windows there's one with MSVC and one with GCC (both on MSYS2), 
hopefully it (FATE on Win) won't get broken so often anymore, going forward.

What's interesting is that this MSYS2 issue with concat: doesn't
happen on those DevOps builds, where I'm invoking it from Windows
CMD like this:

"C:\msys64\usr\bin\bash.exe" -lc "set -e -o pipefail; cd $(cygpath -u '%FFSRC%') && make fate -k -j16 2> >(tee build.log >&2)" || (C:\msys64\usr\bin\bash.exe -lc "cd $(cygpath -u '%FFSRC%'); ./report_status.sh error make_fate 'Make fate failed' build.log" & exit 1)


I didn't bother trying to analyze any further, though.

Best regards
sw
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH v2 0/3] tests/fate: Improvements for running FATE on Windows/MSYS2

[ffmpegagent]

When setting up the new Patchword builders I noticed some issues when
running FATE tests on Windows. Initially I had them suppressed on the
builders, but this patchset should finally fix it.

Version V2

 * Clarified commit message in 3/3 regarding the requirement for a relative
   path to the fate samples (thanks, Zhao)

.

softworkz (3):
  tests/fate: Fix subtitle fate tests on Windows
  tests/source-check: Fix make inclusion-guard check EOL-agnostic
  tests/hevc: Fix concat input when running in MSYS2 shell

 .gitattributes             | 38 +++++++++++++++++++++++++++++++++++++-
 tests/fate/hevc.mak        |  2 +-
 tests/fate/source-check.sh |  2 +-
 3 files changed, 39 insertions(+), 3 deletions(-)


base-commit: 4014784b6229fe0829c2b154694fc13fcb963864
Published-As: https://github.com/ffstaging/FFmpeg/releases/tag/pr-ffstaging-77%2Fsoftworkz%2Fsubmit_fate_subs_eol-v2
Fetch-It-Via: git fetch https://github.com/ffstaging/FFmpeg pr-ffstaging-77/softworkz/submit_fate_subs_eol-v2
Pull-Request: https://github.com/ffstaging/FFmpeg/pull/77

Range-diff vs v1:

 1:  facfadfcb0 = 1:  facfadfcb0 tests/fate: Fix subtitle fate tests on Windows
 2:  73ab2c2be5 = 2:  73ab2c2be5 tests/source-check: Fix make inclusion-guard check EOL-agnostic
 3:  520f9af365 ! 3:  c9e21574c0 tests/hevc: Fix concat input when running in MSYS2 shell
     @@ Commit message
          Setting the MSYS2_ARG_CONV_EXCL environment variable
          keeps MSYS2 from doing this replacement.
      
     +    NOTE: This makes it possible to run the test from an MSYS2 shell,
     +    but it only works when using a relative path like
     +
     +    --samples=../fate-suite (in configure)
     +
     +    or
     +
     +    SAMPLES=../fate-suite (in make fate)
     +
     +    Reviewed-by: Zhao Zhili <zhilizhao@tencent.com>
          Signed-off-by: softworkz <softworkz@hotmail.com>
      
       ## tests/fate/hevc.mak ##

-- 
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH v2 1/3] tests/fate: Fix subtitle fate tests on Windows

[softworkz]

From: softworkz <softworkz@hotmail.com>

..when checked out with autocrlf=on, which is Git default
on Windows.

Signed-off-by: softworkz <softworkz@hotmail.com>
---
 .gitattributes | 38 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 37 insertions(+), 1 deletion(-)

diff --git a/.gitattributes b/.gitattributes
index b64bbed2eb..eaf7f7f9a1 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,38 @@
 *.pnm -diff -text
-Changelog    merge=union
+Changelog merge=union
+tests/ref/fate/sub-aqtitle eol=lf
+tests/ref/fate/sub-ass-to-ass-transcode eol=lf
+tests/ref/fate/sub-cc eol=lf
+tests/ref/fate/sub-cc-realtime
+tests/ref/fate/sub-cc-realtime eol=lf
+tests/ref/fate/sub-cc-scte20 eol=lf
+tests/ref/fate/sub-charenc eol=lf
+tests/ref/fate/sub-dvb eol=lf
+tests/ref/fate/sub-jacosub eol=lf
+tests/ref/fate/sub-lrc-remux eol=lf
+tests/ref/fate/sub-microdvd eol=lf
+tests/ref/fate/sub-microdvd-remux eol=lf
+tests/ref/fate/sub-movtext eol=lf
+tests/ref/fate/sub-mpl2 eol=lf
+tests/ref/fate/sub-mpsub eol=lf
+tests/ref/fate/sub-mpsub-frames eol=lf
+tests/ref/fate/sub-pgs-remux eol=lf
+tests/ref/fate/sub-pjs eol=lf
+tests/ref/fate/sub-realtext eol=lf
+tests/ref/fate/sub-sami eol=lf
+tests/ref/fate/sub-sami2 eol=lf
+tests/ref/fate/sub-scc-remux eol=lf
+tests/ref/fate/sub-srt eol=lf
+tests/ref/fate/sub-srt-badsyntax eol=lf
+tests/ref/fate/sub-srt-empty-events eol=lf
+tests/ref/fate/sub-srt-madness-timeshift eol=lf
+tests/ref/fate/sub-srt-rrn-remux eol=lf
+tests/ref/fate/sub-ssa-to-ass-remux eol=lf
+tests/ref/fate/sub-stl eol=lf
+tests/ref/fate/sub-subviewer eol=lf
+tests/ref/fate/sub-subviewer1 eol=lf
+tests/ref/fate/sub-ttmlenc eol=lf
+tests/ref/fate/sub-vplayer eol=lf
+tests/ref/fate/sub-webvtt eol=lf
+tests/ref/fate/sub-webvtt2 eol=lf
+tests/ref/fate/sub-webvttenc eol=lf
-- 
ffmpeg-codebot

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH v2 2/3] tests/source-check: Fix make inclusion-guard check EOL-agnostic

[softworkz]

From: softworkz <softworkz@hotmail.com>

..to make it work when checked out with autocrlf=on,
which is Git default on Windows.

Signed-off-by: softworkz <softworkz@hotmail.com>
---
 tests/fate/source-check.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fate/source-check.sh b/tests/fate/source-check.sh
index 4d7e175784..99e869e869 100755
--- a/tests/fate/source-check.sh
+++ b/tests/fate/source-check.sh
@@ -28,7 +28,7 @@ for f in `git ls-files | grep '\.h$'` ; do
         -e 's/_vaf_/_/' \
     | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
 
-    git grep -L "^#define $macro$" $f
+    git grep -L "^#define $macro\>" $f
 done
 
 echo "Use of av_clip() where av_clip_uintp2() could be used:"
-- 
ffmpeg-codebot

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

[FFmpeg-devel] [PATCH v2 3/3] tests/hevc: Fix concat input when running in MSYS2 shell

[softworkz]

From: softworkz <softworkz@hotmail.com>

MSYS2 considers the colon (:) as path separator (=separating multiple
paths) and thinks it needs to convert it to a Windows
path separator (;).

Setting the MSYS2_ARG_CONV_EXCL environment variable
keeps MSYS2 from doing this replacement.

NOTE: This makes it possible to run the test from an MSYS2 shell,
but it only works when using a relative path like

--samples=../fate-suite (in configure)

or

SAMPLES=../fate-suite (in make fate)

Reviewed-by: Zhao Zhili <zhilizhao@tencent.com>
Signed-off-by: softworkz <softworkz@hotmail.com>
---
 tests/fate/hevc.mak | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fate/hevc.mak b/tests/fate/hevc.mak
index e432345ef7..dee34e940d 100644
--- a/tests/fate/hevc.mak
+++ b/tests/fate/hevc.mak
@@ -283,7 +283,7 @@ $(TARGET_SAMPLES)/hevc-conformance/LS_A_Orange_2.bit|$\
 $(TARGET_SAMPLES)/hevc/mv_nuh_layer_id.bit|$\
 $(TARGET_SAMPLES)/hevc-conformance/NoOutPrior_B_Qualcomm_1.bit|$\
 $(TARGET_SAMPLES)/hevc-conformance/MVHEVCS_A.bit
-fate-hevc-mv-switch: CMD = framecrc -i "concat:$(INPUT)" -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags +accurate_rnd+bitexact
+fate-hevc-mv-switch: CMD = MSYS2_ARG_CONV_EXCL=concat: framecrc -i "concat:$(INPUT)" -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags +accurate_rnd+bitexact
 FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, SCALE_FILTER CONCAT_PROTOCOL) += fate-hevc-mv-switch
 
 # multiview stream, select view by position
-- 
ffmpeg-codebot
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH v2 0/3] tests/fate: Improvements for running FATE on Windows/MSYS2

[softworkz .]

> -----Original Message-----
> From: ffmpegagent <ffmpegagent@gmail.com>
> Sent: Dienstag, 13. Mai 2025 16:23
> To: ffmpeg-devel@ffmpeg.org
> Cc: softworkz <softworkz@hotmail.com>
> Subject: [PATCH v2 0/3] tests/fate: Improvements for running FATE on
> Windows/MSYS2
> 
> When setting up the new Patchword builders I noticed some issues when
> running FATE tests on Windows. Initially I had them suppressed on the
> builders, but this patchset should finally fix it.
> 
> Version V2
> 
>  * Clarified commit message in 3/3 regarding the requirement for a relative
>    path to the fate samples (thanks, Zhao)
> 
> .
> 
> softworkz (3):
>   tests/fate: Fix subtitle fate tests on Windows
>   tests/source-check: Fix make inclusion-guard check EOL-agnostic
>   tests/hevc: Fix concat input when running in MSYS2 shell



Hi,

would anybody be able to take a quick look at this patchset?

The third one has been confirmed by Zhao already and the first 
two are very short and simple as well.

This would allow me to change the Windows CI runners on Patchwork to
execute the full suite of FATE tests.

Thanks,
sw


_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH v2 2/3] tests/source-check: Fix make inclusion-guard check EOL-agnostic

[Andreas Rheinhardt]

softworkz:
> From: softworkz <softworkz@hotmail.com>
> 
> ..to make it work when checked out with autocrlf=on,
> which is Git default on Windows.
> 
> Signed-off-by: softworkz <softworkz@hotmail.com>
> ---
>  tests/fate/source-check.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/fate/source-check.sh b/tests/fate/source-check.sh
> index 4d7e175784..99e869e869 100755
> --- a/tests/fate/source-check.sh
> +++ b/tests/fate/source-check.sh
> @@ -28,7 +28,7 @@ for f in `git ls-files | grep '\.h$'` ; do
>          -e 's/_vaf_/_/' \
>      | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
>  
> -    git grep -L "^#define $macro$" $f
> +    git grep -L "^#define $macro\>" $f

This makes the test less strict. Why don't we instead just specify that
the repo should be checked out with lf only? Would this break something?

>  done
>  
>  echo "Use of av_clip() where av_clip_uintp2() could be used:"

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH v2 2/3] tests/source-check: Fix make inclusion-guard check EOL-agnostic

[softworkz .]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Andreas
> Rheinhardt
> Sent: Donnerstag, 22. Mai 2025 12:42
> To: ffmpeg-devel@ffmpeg.org
> Subject: Re: [FFmpeg-devel] [PATCH v2 2/3] tests/source-check: Fix make
> inclusion-guard check EOL-agnostic
> 
> softworkz:
> > From: softworkz <softworkz@hotmail.com>
> >
> > ..to make it work when checked out with autocrlf=on,
> > which is Git default on Windows.
> >
> > Signed-off-by: softworkz <softworkz@hotmail.com>
> > ---
> >  tests/fate/source-check.sh | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tests/fate/source-check.sh b/tests/fate/source-check.sh
> > index 4d7e175784..99e869e869 100755
> > --- a/tests/fate/source-check.sh
> > +++ b/tests/fate/source-check.sh
> > @@ -28,7 +28,7 @@ for f in `git ls-files | grep '\.h$'` ; do
> >          -e 's/_vaf_/_/' \
> >      | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
> >
> > -    git grep -L "^#define $macro$" $f
> > +    git grep -L "^#define $macro\>" $f
> 
> This makes the test less strict. 

Yea, that's correct, but does that defeat the intention of the test?
It might allow whitespace at the end of the but this is something
that can happen for any line in any file, not just the guard definitions
in header files. Eventually this is guarded against by the hooks of
the Git repo when pushing. 
It might also allow more text after some whitespace, but that would 
file compilation, I think.

Do you know some regex Kung-Fu to ignore EOL and still use an end 
marker? I had found a way but that requires switching to Perl matching
(-E), but from what I've read, we cannot assume this to be available
on all platforms.


> Why don't we instead just specify that
> the repo should be checked out with lf only? Would this break something?

From my experience it can cause a lot of trouble. The following 
discussions from last year may give you an idea of these pitfalls,
even though not everything might apply to FFmpeg:

https://github.com/ffmpeginteropx/FFmpegInteropX/pull/433
https://github.com/ffmpeginteropx/FFmpegInteropX/pull/431
https://github.com/ffmpeginteropx/FFmpegInteropX/pull/430

The risk is that it causes more trouble than the problems it might
solve.
What stands on the other side is that these two patches is all that
is needed to successfully run FATE tests on Windows.

When a new subtitle test is added, the entry in .gitattributes may
be forgotten, but with the new CI builds on Windows it would also
be discovered immediately.


Thanks a lot for looking at this,
sw





_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH v2 2/3] tests/source-check: Fix make inclusion-guard check EOL-agnostic

[softworkz .]

> -----Original Message-----
> From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of softworkz .
> Sent: Donnerstag, 22. Mai 2025 13:12
> To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH v2 2/3] tests/source-check: Fix make
> inclusion-guard check EOL-agnostic
> 
> 
> 
> > -----Original Message-----
> > From: ffmpeg-devel <ffmpeg-devel-bounces@ffmpeg.org> On Behalf Of Andreas
> > Rheinhardt
> > Sent: Donnerstag, 22. Mai 2025 12:42
> > To: ffmpeg-devel@ffmpeg.org
> > Subject: Re: [FFmpeg-devel] [PATCH v2 2/3] tests/source-check: Fix make
> > inclusion-guard check EOL-agnostic
> >
> > softworkz:
> > > From: softworkz <softworkz@hotmail.com>
> > >
> > > ..to make it work when checked out with autocrlf=on,
> > > which is Git default on Windows.
> > >
> > > Signed-off-by: softworkz <softworkz@hotmail.com>
> > > ---
> > >  tests/fate/source-check.sh | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/tests/fate/source-check.sh b/tests/fate/source-check.sh
> > > index 4d7e175784..99e869e869 100755
> > > --- a/tests/fate/source-check.sh
> > > +++ b/tests/fate/source-check.sh
> > > @@ -28,7 +28,7 @@ for f in `git ls-files | grep '\.h$'` ; do
> > >          -e 's/_vaf_/_/' \
> > >      | tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"
> > >
> > > -    git grep -L "^#define $macro$" $f
> > > +    git grep -L "^#define $macro\>" $f
> >
> > This makes the test less strict.
> 
> Yea, that's correct, but does that defeat the intention of the test?
> It might allow whitespace at the end of the but this is something
> that can happen for any line in any file, not just the guard definitions
> in header files. Eventually this is guarded against by the hooks of
> the Git repo when pushing.
> It might also allow more text after some whitespace, but that would
> file compilation, I think.
> 
> Do you know some regex Kung-Fu to ignore EOL and still use an end
> marker? I had found a way but that requires switching to Perl matching
> (-E), but from what I've read, we cannot assume this to be available
> on all platforms.
> 
> 
> > Why don't we instead just specify that
> > the repo should be checked out with lf only? Would this break something?
> 
> From my experience it can cause a lot of trouble. The following
> discussions from last year may give you an idea of these pitfalls,
> even though not everything might apply to FFmpeg:
> 
> https://github.com/ffmpeginteropx/FFmpegInteropX/pull/433
> https://github.com/ffmpeginteropx/FFmpegInteropX/pull/431
> https://github.com/ffmpeginteropx/FFmpegInteropX/pull/430
> 
> The risk is that it causes more trouble than the problems it might
> solve.
> What stands on the other side is that these two patches is all that
> is needed to successfully run FATE tests on Windows.
> 
> When a new subtitle test is added, the entry in .gitattributes may
> be forgotten, but with the new CI builds on Windows it would also
> be discovered immediately.
> _______________________________________________

Oh, and I totally forgot this: There are other tests which are 
failing when declaring EOL=LF in .gitattributes - even a few
subtitle tests, that's why I haven't added all of them.

sw


_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for running FATE on Windows/MSYS2

[Kacper Michajlow]

On Mon, 12 May 2025 at 12:00, ffmpegagent <ffmpegagent@gmail.com> wrote:
>
> When setting up the new Patchword builders I noticed some issues when
> running FATE tests on Windows. Initially I had them suppressed on the
> builders, but this patchset should finally fix it.
>
> softworkz (3):
>   tests/fate: Fix subtitle fate tests on Windows
>   tests/source-check: Fix make inclusion-guard check EOL-agnostic

I think ffmpeg repositories should always be checked out with LF line
endings, there is nothing that expects those sources to have CRLF. If
you like you can set attributes to all files to LF (not only subs),
but essentially this should already be done by the user when checking
the repository.

(autocrlf should be considered harmful, the was bad idea to make git
tooling smarter for its own good)

>   tests/hevc: Fix concat input when running in MSYS2 shell

This is more tricky, but frankly, I don't like injecting platform
specific workarounds into makefile files like that. Either maintain it
yourself or do it in a more generic way, not just in one hevc test,
because what if someone else adds a concat test? Do you expect them to
know that some MSYS2 specific handling is needed? It shouldn't be.

Also if you like to fix "fate paths", it should be done fully.
Currently only relative paths are working, because some tests are
doing things like "$(input)[bla]" which also trips patch conversion,
so full unix path doesn't work, because it won't get converted to
Windows one, Windows path doesn't work, because it would be mangled
because of not escaped `\`.

- Kacper
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for running FATE on Windows/MSYS2

[softworkz .]

> -----Original Message-----
> From: Kacper Michajlow <kasper93@gmail.com>
> Sent: Tuesday, June 17, 2025 12:44 AM
> To: FFmpeg development discussions and patches <ffmpeg-
> devel@ffmpeg.org>
> Cc: softworkz <softworkz@hotmail.com>
> Subject: Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for
> running FATE on Windows/MSYS2
> 
> On Mon, 12 May 2025 at 12:00, ffmpegagent <ffmpegagent@gmail.com>
> wrote:
> >
> > When setting up the new Patchword builders I noticed some issues when
> > running FATE tests on Windows. Initially I had them suppressed on the
> > builders, but this patchset should finally fix it.
> >
> > softworkz (3):
> >   tests/fate: Fix subtitle fate tests on Windows
> >   tests/source-check: Fix make inclusion-guard check EOL-agnostic
> 
> I think ffmpeg repositories should always be checked out with LF line endings,
> there is nothing that expects those sources to have CRLF. If you like you can set
> attributes to all files to LF (not only subs)

FATE already fails when setting LF for all subtitle ref files.



>, but essentially this should already
> be done by the user when checking the repository.
> 
> (autocrlf should be considered harmful, the was bad idea to make git tooling
> smarter for its own good)

While this might be true, autocrlf is on by default and it's harmful to switch
It off globally as that would screw things in many other projects.

Checking out only FFmpeg with autocrlf=off is non-trivial. Nobody knows how
to do this properly and even less people will know how to properly change it
after checking out, in a way that all files get changed as well.

I do know both, but I work with FFmpeg, having autocrlf=oni (the default on 
Windows) for more than 10 years, and I think it's more than valid to expect
That FATE tests are running successfully also under these conditions.

> >   tests/hevc: Fix concat input when running in MSYS2 shell
> 
> This is more tricky, but frankly, I don't like injecting platform specific
> workarounds into makefile files like that. Either maintain it yourself or do it in a
> more generic way, not just in one hevc test, because what if someone else
> adds a concat test? Do you expect them to know that some MSYS2 specific
> handling is needed? It shouldn't be. 
> Also if you like to fix "fate paths", it should be done fully.
> Currently only relative paths are working, because some tests are doing things
> like "$(input)[bla]" which also trips patch conversion, so full unix path doesn't
> work, because it won't get converted to Windows one, Windows path doesn't
> work, because it would be mangled because of not escaped `\`.

The fix I'm proposing is in fact working with relative paths only. If you know a 
Better way, that works in all cases, please feel free to tell.

It's clearly just a "better-than-nothing" fix - but it's still better than nothing. 😊 

Best regards
softworkz

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for running FATE on Windows/MSYS2

[Kacper Michajlow]

On Tue, 17 Jun 2025 at 01:05, softworkz . <softworkz@hotmail.com> wrote:
>
>
>
> > -----Original Message-----
> > From: Kacper Michajlow <kasper93@gmail.com>
> > Sent: Tuesday, June 17, 2025 12:44 AM
> > To: FFmpeg development discussions and patches <ffmpeg-
> > devel@ffmpeg.org>
> > Cc: softworkz <softworkz@hotmail.com>
> > Subject: Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for
> > running FATE on Windows/MSYS2
> >
> > On Mon, 12 May 2025 at 12:00, ffmpegagent <ffmpegagent@gmail.com>
> > wrote:
> > >
> > > When setting up the new Patchword builders I noticed some issues when
> > > running FATE tests on Windows. Initially I had them suppressed on the
> > > builders, but this patchset should finally fix it.
> > >
> > > softworkz (3):
> > >   tests/fate: Fix subtitle fate tests on Windows
> > >   tests/source-check: Fix make inclusion-guard check EOL-agnostic
> >
> > I think ffmpeg repositories should always be checked out with LF line endings,
> > there is nothing that expects those sources to have CRLF. If you like you can set
> > attributes to all files to LF (not only subs)
>
> FATE already fails when setting LF for all subtitle ref files.
>

What do you mean? Everything is LF based. I don't see any failures.

>
> >, but essentially this should already
> > be done by the user when checking the repository.
> >
> > (autocrlf should be considered harmful, the was bad idea to make git tooling
> > smarter for its own good)
>
> While this might be true, autocrlf is on by default and it's harmful to switch
> It off globally as that would screw things in many other projects.
>
> Checking out only FFmpeg with autocrlf=off is non-trivial. Nobody knows how
> to do this properly and even less people will know how to properly change it
> after checking out, in a way that all files get changed as well.
>
> I do know both, but I work with FFmpeg, having autocrlf=oni (the default on
> Windows) for more than 10 years, and I think it's more than valid to expect
> That FATE tests are running successfully also under these conditions.
>
> > >   tests/hevc: Fix concat input when running in MSYS2 shell
> >
> > This is more tricky, but frankly, I don't like injecting platform specific
> > workarounds into makefile files like that. Either maintain it yourself or do it in a
> > more generic way, not just in one hevc test, because what if someone else
> > adds a concat test? Do you expect them to know that some MSYS2 specific
> > handling is needed? It shouldn't be.
> > Also if you like to fix "fate paths", it should be done fully.
> > Currently only relative paths are working, because some tests are doing things
> > like "$(input)[bla]" which also trips patch conversion, so full unix path doesn't
> > work, because it won't get converted to Windows one, Windows path doesn't
> > work, because it would be mangled because of not escaped `\`.
>
> The fix I'm proposing is in fact working with relative paths only. If you know a
> Better way, that works in all cases, please feel free to tell.
>
> It's clearly just a "better-than-nothing" fix - but it's still better than nothing. 😊

I'm confused though, because concat tests input is not converted. What
exactly are we fixing here?

2025-06-16T23:27:19.8284085Z TEST    hevc-mv-switch
2025-06-16T23:27:19.8286651Z /c/a/FFmpeg/FFmpeg/tests/fate-run.sh
fate-hevc-mv-switch "../samples" ""
"/c/a/FFmpeg/FFmpeg/.github/fate/build" 'framecrc -i
"concat:../samples/hevc-conformance/LS_A_Orange_2.bit|../samples/hevc/mv_nuh_layer_id.bit|../samples/hevc-conformance/NoOutPrior_B_Qualcomm_1.bit|../samples/hevc-conformance/MVHEVCS_A.bit"
-fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags
+accurate_rnd+bitexact' '' '' '' '1' '' '' '' '' '' '' '' '' '' ''

It works fine as is, MSYS2 won't convert this because it's separated with |.

- Kacper

- Kacper
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for running FATE on Windows/MSYS2

[softworkz .]

> -----Original Message-----
> From: Kacper Michajlow <kasper93@gmail.com>
> Sent: Tuesday, June 17, 2025 3:00 AM
> To: softworkz . <softworkz@hotmail.com>
> Cc: FFmpeg development discussions and patches <ffmpeg-
> devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for running
> FATE on Windows/MSYS2
> 
> On Tue, 17 Jun 2025 at 01:05, softworkz . <softworkz@hotmail.com> wrote:
> >
> >
> >
> > > -----Original Message-----
> > > From: Kacper Michajlow <kasper93@gmail.com>
> > > Sent: Tuesday, June 17, 2025 12:44 AM
> > > To: FFmpeg development discussions and patches <ffmpeg-
> > > devel@ffmpeg.org>
> > > Cc: softworkz <softworkz@hotmail.com>
> > > Subject: Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for
> > > running FATE on Windows/MSYS2
> > >
> > > On Mon, 12 May 2025 at 12:00, ffmpegagent <ffmpegagent@gmail.com>
> > > wrote:
> > > >
> > > > When setting up the new Patchword builders I noticed some issues
> > > > when running FATE tests on Windows. Initially I had them
> > > > suppressed on the builders, but this patchset should finally fix it.
> > > >
> > > > softworkz (3):
> > > >   tests/fate: Fix subtitle fate tests on Windows
> > > >   tests/source-check: Fix make inclusion-guard check EOL-agnostic
> > >
> > > I think ffmpeg repositories should always be checked out with LF
> > > line endings, there is nothing that expects those sources to have
> > > CRLF. If you like you can set attributes to all files to LF (not
> > > only subs)
> >
> > FATE already fails when setting LF for all subtitle ref files.
> >
> 
> What do you mean? Everything is LF based. I don't see any failures.

Hi Kasper,

A common misconception is that autocrlf=off would mean that you are
dealing just with LF line endings in Git - but that's not the case, even 
the opposite is true: Disabling autocrlf is what actually enables check-in
of files with CRLF - often accidentally. But it's not always accidental. Some
of the FATE reference files for subtitle tests actually _do_ have CRLF line
endings. By specifying LF in .gitattributes, CRLF would get replaced by LF
and the tests will fail.
Setting LF in .gitattributes is something totally different from autocrlf=off.
The latter means "do not change line endings back-and-forth when checking
In and out", but what you set in .gitattributes trumps autocrlf - i.e. autocrlf
doesn't act on files with a .gitattributes entry about line endings.

The patch may look like as if I had forgotten some of the subtitle ref files, 
but no: I had to carefully choose the ones who need it and which must not
be changed.

> >
> > >, but essentially this should already  be done by the user when
> > >checking the repository.
> > >
> > > (autocrlf should be considered harmful, the was bad idea to make git
> > > tooling smarter for its own good)
> >
> > While this might be true, autocrlf is on by default and it's harmful
> > to switch It off globally as that would screw things in many other projects.
> >
> > Checking out only FFmpeg with autocrlf=off is non-trivial. Nobody
> > knows how to do this properly and even less people will know how to
> > properly change it after checking out, in a way that all files get changed as
> well.
> >
> > I do know both, but I work with FFmpeg, having autocrlf=oni (the
> > default on
> > Windows) for more than 10 years, and I think it's more than valid to
> > expect That FATE tests are running successfully also under these conditions.
> >
> > > >   tests/hevc: Fix concat input when running in MSYS2 shell
> > >
> > > This is more tricky, but frankly, I don't like injecting platform
> > > specific workarounds into makefile files like that. Either maintain
> > > it yourself or do it in a more generic way, not just in one hevc
> > > test, because what if someone else adds a concat test? Do you expect
> > > them to know that some MSYS2 specific handling is needed? It shouldn't
> be.
> > > Also if you like to fix "fate paths", it should be done fully.
> > > Currently only relative paths are working, because some tests are
> > > doing things like "$(input)[bla]" which also trips patch conversion,
> > > so full unix path doesn't work, because it won't get converted to
> > > Windows one, Windows path doesn't work, because it would be mangled
> because of not escaped `\`.
> >
> > The fix I'm proposing is in fact working with relative paths only. If
> > you know a Better way, that works in all cases, please feel free to tell.
> >
> > It's clearly just a "better-than-nothing" fix - but it's still better
> > than nothing. 😊
> 
> I'm confused though, because concat tests input is not converted. What
> exactly are we fixing here?

Please see here for background:

https://patchwork.ffmpeg.org/project/ffmpeg/patch/520f9af365f550aefc3e9abfacab83cfc8817b8e.1747043988.git.ffmpegagent@gmail.com/

https://patchwork.ffmpeg.org/project/ffmpeg/patch/c9e21574c0c8be252b3ff83133a004e3eef6803c.1747146207.git.ffmpegagent@gmail.com/

Zhao had reported this issue before and while I tried to get FATE tests working on MSYS2 I found a solution. Unfortunately, it only works when the FATE samples path is specified relative to the FFmpeg dir, but at least it opens up one way where it is working, after there wasn't any way before. It's the best I could find, unfortunately.



> 2025-06-16T23:27:19.8284085Z TEST    hevc-mv-switch
> 2025-06-16T23:27:19.8286651Z /c/a/FFmpeg/FFmpeg/tests/fate-run.sh
> fate-hevc-mv-switch "../samples" ""
> "/c/a/FFmpeg/FFmpeg/.github/fate/build" 'framecrc -i
> "concat:../samples/hevc-
> conformance/LS_A_Orange_2.bit|../samples/hevc/mv_nuh_layer_id.bit|../sa
> mples/hevc-conformance/NoOutPrior_B_Qualcomm_1.bit|../samples/hevc-
> conformance/MVHEVCS_A.bit"
> -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags
> +accurate_rnd+bitexact' '' '' '' '1' '' '' '' '' '' '' '' '' '' ''
> 
> It works fine as is, MSYS2 won't convert this because it's separated with |.

The fix is only needed when you are running make fate interactively from a 
command line in an MSYS2 shell. 

Best regards,
softworkz
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for running FATE on Windows/MSYS2

[Kacper Michajlow]

On Tue, 17 Jun 2025 at 03:46, softworkz . <softworkz@hotmail.com> wrote:
>
>
>
> > -----Original Message-----
> > From: Kacper Michajlow <kasper93@gmail.com>
> > Sent: Tuesday, June 17, 2025 3:00 AM
> > To: softworkz . <softworkz@hotmail.com>
> > Cc: FFmpeg development discussions and patches <ffmpeg-
> > devel@ffmpeg.org>
> > Subject: Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for running
> > FATE on Windows/MSYS2
> >
> > On Tue, 17 Jun 2025 at 01:05, softworkz . <softworkz@hotmail.com> wrote:
> > >
> > >
> > >
> > > > -----Original Message-----
> > > > From: Kacper Michajlow <kasper93@gmail.com>
> > > > Sent: Tuesday, June 17, 2025 12:44 AM
> > > > To: FFmpeg development discussions and patches <ffmpeg-
> > > > devel@ffmpeg.org>
> > > > Cc: softworkz <softworkz@hotmail.com>
> > > > Subject: Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for
> > > > running FATE on Windows/MSYS2
> > > >
> > > > On Mon, 12 May 2025 at 12:00, ffmpegagent <ffmpegagent@gmail.com>
> > > > wrote:
> > > > >
> > > > > When setting up the new Patchword builders I noticed some issues
> > > > > when running FATE tests on Windows. Initially I had them
> > > > > suppressed on the builders, but this patchset should finally fix it.
> > > > >
> > > > > softworkz (3):
> > > > >   tests/fate: Fix subtitle fate tests on Windows
> > > > >   tests/source-check: Fix make inclusion-guard check EOL-agnostic
> > > >
> > > > I think ffmpeg repositories should always be checked out with LF
> > > > line endings, there is nothing that expects those sources to have
> > > > CRLF. If you like you can set attributes to all files to LF (not
> > > > only subs)
> > >
> > > FATE already fails when setting LF for all subtitle ref files.
> > >
> >
> > What do you mean? Everything is LF based. I don't see any failures.
>
> Hi Kasper,
>
> A common misconception is that autocrlf=off would mean that you are
> dealing just with LF line endings in Git - but that's not the case, even
> the opposite is true: Disabling autocrlf is what actually enables check-in
> of files with CRLF - often accidentally. But it's not always accidental. Some
> of the FATE reference files for subtitle tests actually _do_ have CRLF line
> endings. By specifying LF in .gitattributes, CRLF would get replaced by LF
> and the tests will fail.
> Setting LF in .gitattributes is something totally different from autocrlf=off.
> The latter means "do not change line endings back-and-forth when checking
> In and out", but what you set in .gitattributes trumps autocrlf - i.e. autocrlf
> doesn't act on files with a .gitattributes entry about line endings.

I know how autocrlf works. I only said that imposing default logic
that "Windows always must use CRLF" and git implicitly will break your
committed line endings by default was a short sighted design decision.
It's good to have options to do the conversion IF the user wants that
or is configured as needed for a certain repository/platform.

> The patch may look like as if I had forgotten some of the subtitle ref files,
> but no: I had to carefully choose the ones who need it and which must not
> be changed.

Could you be more specific? Which ones? I think rcombs and astiob
changed all remaining CRLF sometime in last year or even earlier.

Either way, files are committed in the proper way in the repository,
so just make your git client not break that on checkout.

> > >
> > > >, but essentially this should already  be done by the user when
> > > >checking the repository.
> > > >
> > > > (autocrlf should be considered harmful, the was bad idea to make git
> > > > tooling smarter for its own good)
> > >
> > > While this might be true, autocrlf is on by default and it's harmful
> > > to switch It off globally as that would screw things in many other projects.
> > >
> > > Checking out only FFmpeg with autocrlf=off is non-trivial. Nobody
> > > knows how to do this properly and even less people will know how to
> > > properly change it after checking out, in a way that all files get changed as
> > well.
> > >
> > > I do know both, but I work with FFmpeg, having autocrlf=oni (the
> > > default on
> > > Windows) for more than 10 years, and I think it's more than valid to
> > > expect That FATE tests are running successfully also under these conditions.
> > >
> > > > >   tests/hevc: Fix concat input when running in MSYS2 shell
> > > >
> > > > This is more tricky, but frankly, I don't like injecting platform
> > > > specific workarounds into makefile files like that. Either maintain
> > > > it yourself or do it in a more generic way, not just in one hevc
> > > > test, because what if someone else adds a concat test? Do you expect
> > > > them to know that some MSYS2 specific handling is needed? It shouldn't
> > be.
> > > > Also if you like to fix "fate paths", it should be done fully.
> > > > Currently only relative paths are working, because some tests are
> > > > doing things like "$(input)[bla]" which also trips patch conversion,
> > > > so full unix path doesn't work, because it won't get converted to
> > > > Windows one, Windows path doesn't work, because it would be mangled
> > because of not escaped `\`.
> > >
> > > The fix I'm proposing is in fact working with relative paths only. If
> > > you know a Better way, that works in all cases, please feel free to tell.
> > >
> > > It's clearly just a "better-than-nothing" fix - but it's still better
> > > than nothing. 😊
> >
> > I'm confused though, because concat tests input is not converted. What
> > exactly are we fixing here?
>
> Please see here for background:
>
> https://patchwork.ffmpeg.org/project/ffmpeg/patch/520f9af365f550aefc3e9abfacab83cfc8817b8e.1747043988.git.ffmpegagent@gmail.com/
>
> https://patchwork.ffmpeg.org/project/ffmpeg/patch/c9e21574c0c8be252b3ff83133a004e3eef6803c.1747146207.git.ffmpegagent@gmail.com/
>
> Zhao had reported this issue before and while I tried to get FATE tests working on MSYS2 I found a solution. Unfortunately, it only works when the FATE samples path is specified relative to the FFmpeg dir, but at least it opens up one way where it is working, after there wasn't any way before. It's the best I could find, unfortunately.
>
>
>
> > 2025-06-16T23:27:19.8284085Z TEST    hevc-mv-switch
> > 2025-06-16T23:27:19.8286651Z /c/a/FFmpeg/FFmpeg/tests/fate-run.sh
> > fate-hevc-mv-switch "../samples" ""
> > "/c/a/FFmpeg/FFmpeg/.github/fate/build" 'framecrc -i
> > "concat:../samples/hevc-
> > conformance/LS_A_Orange_2.bit|../samples/hevc/mv_nuh_layer_id.bit|../sa
> > mples/hevc-conformance/NoOutPrior_B_Qualcomm_1.bit|../samples/hevc-
> > conformance/MVHEVCS_A.bit"
> > -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags
> > +accurate_rnd+bitexact' '' '' '' '1' '' '' '' '' '' '' '' '' '' ''
> >
> > It works fine as is, MSYS2 won't convert this because it's separated with |.
>
> The fix is only needed when you are running make fate interactively from a
> command line in an MSYS2 shell.

Hmm, I see.

- Kacper
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".

Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for running FATE on Windows/MSYS2

[softworkz .]

> -----Original Message-----
> From: Kacper Michajlow <kasper93@gmail.com>
> Sent: Tuesday, June 17, 2025 3:18 PM
> To: softworkz . <softworkz@hotmail.com>
> Cc: FFmpeg development discussions and patches <ffmpeg-
> devel@ffmpeg.org>
> Subject: Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for running
> FATE on Windows/MSYS2
> 
> On Tue, 17 Jun 2025 at 03:46, softworkz . <softworkz@hotmail.com> wrote:
> >
> >
> >
> > > -----Original Message-----
> > > From: Kacper Michajlow <kasper93@gmail.com>
> > > Sent: Tuesday, June 17, 2025 3:00 AM
> > > To: softworkz . <softworkz@hotmail.com>
> > > Cc: FFmpeg development discussions and patches <ffmpeg-
> > > devel@ffmpeg.org>
> > > Subject: Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements for
> > > running FATE on Windows/MSYS2
> > >
> > > On Tue, 17 Jun 2025 at 01:05, softworkz . <softworkz@hotmail.com>
> wrote:
> > > >
> > > >
> > > >
> > > > > -----Original Message-----
> > > > > From: Kacper Michajlow <kasper93@gmail.com>
> > > > > Sent: Tuesday, June 17, 2025 12:44 AM
> > > > > To: FFmpeg development discussions and patches <ffmpeg-
> > > > > devel@ffmpeg.org>
> > > > > Cc: softworkz <softworkz@hotmail.com>
> > > > > Subject: Re: [FFmpeg-devel] [PATCH 0/3] tests/fate: Improvements
> > > > > for running FATE on Windows/MSYS2
> > > > >
> > > > > On Mon, 12 May 2025 at 12:00, ffmpegagent
> > > > > <ffmpegagent@gmail.com>
> > > > > wrote:
> > > > > >
> > > > > > When setting up the new Patchword builders I noticed some
> > > > > > issues when running FATE tests on Windows. Initially I had
> > > > > > them suppressed on the builders, but this patchset should finally fix
> it.
> > > > > >
> > > > > > softworkz (3):
> > > > > >   tests/fate: Fix subtitle fate tests on Windows
> > > > > >   tests/source-check: Fix make inclusion-guard check
> > > > > > EOL-agnostic
> > > > >
> > > > > I think ffmpeg repositories should always be checked out with LF
> > > > > line endings, there is nothing that expects those sources to
> > > > > have CRLF. If you like you can set attributes to all files to LF
> > > > > (not only subs)
> > > >
> > > > FATE already fails when setting LF for all subtitle ref files.
> > > >
> > >
> > > What do you mean? Everything is LF based. I don't see any failures.
> >
> > Hi Kasper,
> >
> > A common misconception is that autocrlf=off would mean that you are
> > dealing just with LF line endings in Git - but that's not the case,
> > even the opposite is true: Disabling autocrlf is what actually enables
> > check-in of files with CRLF - often accidentally. But it's not always
> > accidental. Some of the FATE reference files for subtitle tests
> > actually _do_ have CRLF line endings. By specifying LF in
> > .gitattributes, CRLF would get replaced by LF and the tests will fail.
> > Setting LF in .gitattributes is something totally different from autocrlf=off.
> > The latter means "do not change line endings back-and-forth when
> > checking In and out", but what you set in .gitattributes trumps
> > autocrlf - i.e. autocrlf doesn't act on files with a .gitattributes entry about
> line endings.
> 
> I know how autocrlf works. I only said that imposing default logic that
> "Windows always must use CRLF" and git implicitly will break your committed
> line endings by default was a short sighted design decision.

I believe the original intention was simply to avoid that Windows users would
make commits with CRLF. I see it having both advantages as well as 
disadvantages. I never had major trouble with it, but I've experienced trouble
in several cases in the past, when Windows users had set autocrlf to off
(different projects, not FFmpeg).

> It's good to have options to do the conversion IF the user wants that or is
> configured as needed for a certain repository/platform.

Absolutely, yes!

> 
> > The patch may look like as if I had forgotten some of the subtitle ref
> > files, but no: I had to carefully choose the ones who need it and
> > which must not be changed.
> 
> Could you be more specific? Which ones? I think rcombs and astiob changed
> all remaining CRLF sometime in last year or even earlier.

I know, but that was about ASS primarily. 
Which ones? All the subtitle refs that I've not included in the patch in the
.gitattributes files. You can easily try be adding the remaining ones in the 
same way and running FATE.

> Either way, files are committed in the proper way in the repository, so just
> make your git client not break that on checkout.

It's not about myself.

It's that autocrlf is on by default on Windows and we cannot change that.
In this regard, I also do not accept the narrative that this would be an 
"improper" way. It is not - it is a common work pattern on Windows and
nothing is wrong about it. It's working fine and only those few FATE tests
are causing errors. It is in our best interest that people are running 
FATE before submitting patches and when FATE is failing already even 
without any changes, then it discourages people to even deal with FATE.

The fix for this is easy and simple, that's why I don't think it makes sense
to argue about what people should do and how they should work when
the reality is different. Especially, when people are getting to the point 
when they see FATE failing, it's already too late because they already
have their working setup.

> > > It works fine as is, MSYS2 won't convert this because it's separated with |.
> >
> > The fix is only needed when you are running make fate interactively
> > from a command line in an MSYS2 shell.
> 
> Hmm, I see.

Normally, I don't run FATE on MSYS2 like this myself. I came across that
issue when preparing the CI builds where I tested the script commands
locally.  It's safe in a way that it doesn't affect any other environments.

Thanks and best regards,
sw


_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel

To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".