[FFmpeg-devel] [FFmpeg-cvslog] lavf/assenc: normalize line endings to \n

[Martin Storsjö]

On Mon, 12 Feb 2024, rcombs wrote:

> ffmpeg | branch: master | rcombs <rcombs at rcombs.me> | Sun Jan 28 14:27:17 2024 -0800| [7bf1b9b35769b37684dd2f18a54f01d852a540c8] | committer: rcombs
>
> lavf/assenc: normalize line endings to \n
>
> Previously, we produced output with either \r\n or mixed line endings.
> This was undesirable unto itself, but also made working with patches affecting
> FATE output particularly challenging, especially via the mailing list.
>
> Everything that consumes the SSA/ASS format is line-ending-agnostic,
> so \n is selected to simplify git/ML usage in FATE.
>
> Extra \r characters at the end of a packet are dropped. These are always
> ignored by the renderer anyway.
>
>> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7bf1b9b35769b37684dd2f18a54f01d852a540c8
> ---
>
> .gitattributes                          |   1 -
> libavformat/assenc.c                    |  22 ++--
> tests/ref/fate/sub-aqtitle              |  94 ++++++++--------
> tests/ref/fate/sub-ass-to-ass-transcode | 124 ++++++++++-----------
> tests/ref/fate/sub-cc                   |  32 +++---
> tests/ref/fate/sub-cc-realtime          |  44 ++++----
> tests/ref/fate/sub-cc-scte20            |  34 +++---
> tests/ref/fate/sub-charenc              | 128 +++++++++++-----------
> tests/ref/fate/sub-jacosub              |  50 ++++-----
> tests/ref/fate/sub-microdvd             |  48 ++++-----
> tests/ref/fate/sub-movtext              |  34 +++---
> tests/ref/fate/sub-mpl2                 |  36 +++----
> tests/ref/fate/sub-mpsub                |  70 ++++++------
> tests/ref/fate/sub-mpsub-frames         |  32 +++---
> tests/ref/fate/sub-pjs                  |  34 +++---
> tests/ref/fate/sub-realtext             |  38 +++----
> tests/ref/fate/sub-sami                 |  46 ++++----
> tests/ref/fate/sub-sami2                | 186 ++++++++++++++++----------------
> tests/ref/fate/sub-srt                  | 102 +++++++++---------
> tests/ref/fate/sub-srt-badsyntax        |  48 ++++-----
> tests/ref/fate/sub-ssa-to-ass-remux     | 168 ++++++++++++++---------------
> tests/ref/fate/sub-stl                  |  62 +++++------
> tests/ref/fate/sub-subviewer            |  34 +++---
> tests/ref/fate/sub-subviewer1           |  48 ++++-----
> tests/ref/fate/sub-vplayer              |  34 +++---
> tests/ref/fate/sub-webvtt               |  58 +++++-----
> tests/ref/fate/sub-webvtt2              |  52 ++++-----
> 27 files changed, 831 insertions(+), 828 deletions(-)
>
> diff --git a/.gitattributes b/.gitattributes
> index 5a19b963b6..a900528e47 100644
> --- a/.gitattributes
> +++ b/.gitattributes
> @@ -1,2 +1 @@
> *.pnm -diff -text
> -tests/ref/fate/sub-scc eol=crlf

This change seems to have had a tricky effect on the 
tests/ref/fate/sub-scc file. Previously, when checked out, users got the 
file with CRLF newlines. When updating to this git commit, or past it, 
that file remains untouched, with CRLF still present, and the 
fate-sub-scc test fails. If one does "rm tests/ref/fate/sub-scc; git 
checkout tests/ref/fate/sub-scc", then the file does get restored with LR 
newlines, and the test passes.

It's easy to do this change manually in the source checkout of a fate 
runner, but I'm not sure how easily we get all fate instances fixed that 
way - currently this test is failing in most of them.

// Martin