Re: [FFmpeg-devel] [PATCH] fate: add SCC test

[Paul B Mahol]

On 1/26/17, Michael Niedermayer  wrote:
> On Wed, Jan 25, 2017 at 10:30:06PM +0100, Paul B Mahol wrote:
>> Signed-off-by: Paul B Mahol 
>> ---
>>  tests/fate/subtitles.mak |   3 +
>>  tests/ref/fate/sub-scc   | 519
>> +++
>>  2 files changed, 522 insertions(+)
>>  create mode 100644 tests/ref/fate/sub-scc
>
> Tested on linux32/64 x86, mingw32/64, mips/arm qemu linux
>
> [...]
> --
> Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> Republics decline into democracies and democracies degenerate into
> despotisms. -- Aristotle
>

I can not push this because it aborts:

remote: -Info-  Update is fast-forward
remote: -Deny-  In c0cad837f922bcf2eb6220fd129c02188d26002b:
remote: -Deny-  Trailing whitespace found in tests/ref/fate/sub-scc.
remote: -Deny-  Commit aborted, fix the issue and try again.
remote: error: hook declined to update refs/heads/master
To source.ffmpeg.org:ffmpeg.git
 ! [remote rejected] scc -> master (hook declined)
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] fate: add SCC test

[Michael Niedermayer]

On Wed, Jan 25, 2017 at 10:30:06PM +0100, Paul B Mahol wrote:
> Signed-off-by: Paul B Mahol 
> ---
>  tests/fate/subtitles.mak |   3 +
>  tests/ref/fate/sub-scc   | 519 
> +++
>  2 files changed, 522 insertions(+)
>  create mode 100644 tests/ref/fate/sub-scc

Tested on linux32/64 x86, mingw32/64, mips/arm qemu linux

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Republics decline into democracies and democracies degenerate into
despotisms. -- Aristotle


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] fate: add SCC test

[Paul B Mahol]

Signed-off-by: Paul B Mahol 
---
 tests/fate/subtitles.mak |   3 +
 tests/ref/fate/sub-scc   | 519 +++
 2 files changed, 522 insertions(+)
 create mode 100644 tests/ref/fate/sub-scc

diff --git a/tests/fate/subtitles.mak b/tests/fate/subtitles.mak
index 8aa0279..cc9d77c 100644
--- a/tests/fate/subtitles.mak
+++ b/tests/fate/subtitles.mak
@@ -94,6 +94,9 @@ fate-sub-textenc: CMD = fmtstdout srt -i 
$(TARGET_SAMPLES)/sub/SubRip_capability
 FATE_SUBTITLES_ASS-$(call ALLYES, MICRODVD_DEMUXER MICRODVD_DECODER ICONV) += 
fate-sub-charenc
 fate-sub-charenc: CMD = fmtstdout ass -sub_charenc cp1251 -i 
$(TARGET_SAMPLES)/sub/cp1251-subtitles.sub
 
+FATE_SUBTITLES-$(call ALLYES, SCC_DEMUXER CCAPTION_DECODER SUBRIP_ENCODER 
SRT_MUXER) += fate-sub-scc
+fate-sub-scc: CMD = fmtstdout srt -i $(TARGET_SAMPLES)/sub/witch.scc
+
 FATE_SUBTITLES-$(call ENCMUX, ASS, ASS) += $(FATE_SUBTITLES_ASS-yes)
 FATE_SUBTITLES += $(FATE_SUBTITLES-yes)
 
diff --git a/tests/ref/fate/sub-scc b/tests/ref/fate/sub-scc
new file mode 100644
index 000..1c3ec05
--- /dev/null
+++ b/tests/ref/fate/sub-scc
@@ -0,0 +1,519 @@
+1
+00:00:00,000 --> 00:00:09,297
+{\an7}♪ PIES IESU DOMINE, 
+\hDONNA EIS REQUIEM ♪
+\h\h\h\h\h\h\h\h\h\h\h\h\h\h\h\h[ Bangs head
+
+2
+00:00:10,561 --> 00:00:15,231
+{\an7}♪ PIES IESU DOMINE, ♪ [ 
+
+3
+00:00:22,627 --> 00:00:27,429
+{\an7}♪ PIES IESU DOMINE, ♪ [ 
+
+4
+00:00:28,231 --> 00:00:31,627
+{\an7}♪ DONNA EIS REQUIEM.♪ [ 
+
+5
+00:00:31,627 --> 00:00:36,594
+{\an7}[ Crowd Shouting ]
+A WITCH !  A WITCH !  A WITCH !
+♪ PIES IESU DOMINE, ♪ [ 
+
+6
+00:00:36,594 --> 00:00:39,363
+{\an7}A WITCH !  A WITCH !
+WE FOUND A WITCH !
+
+7
+00:00:39,363 --> 00:00:41,924
+{\an7}[ Crowd Continues
+\h\hShouting ]
+A WITCH !  A WITCH !
+
+8
+00:00:41,924 --> 00:00:45,660
+{\an7}WE’VE GOT A WITCH !
+A WITCH !  WE’VE GOT A WITCH !
+
+9
+00:00:45,660 --> 00:00:47,858
+{\an7}BURN HER !
+\hBURN HER !  BURN HER !
+
+10
+00:00:47,858 --> 00:00:50,891
+{\an7}WE’VE FOUND A WITCH !
+\hWE’VE FOUND A WITCH !
+
+11
+00:00:50,891 --> 00:00:54,528
+{\an7}A WITCH !
+\hA WITCH !  A WITCH !
+
+12
+00:00:54,528 --> 00:00:57,693
+{\an7}WE HAVE FOUND A WITCH !
+MAY WE BURN HER ?
+
+13
+00:00:57,693 --> 00:01:00,297
+{\an7}[ Crowd ]
+BURN HER !  BURN HER !
+
+14
+00:01:00,297 --> 00:01:04,066
+{\an7}HOW DO YOU KNOW
+SHE IS A WITCH ?
+SHE LOOKS LIKE ONE !
+
+15
+00:01:04,066 --> 00:01:06,264
+{\an7}[ Shouting
+\h\hAffirmations ]
+
+16
+00:01:06,264 --> 00:01:08,066
+{\an7}BRING HER FORWARD.
+
+17
+00:01:08,066 --> 00:01:11,264
+{\an7}I’M NOT A WITCH.
+\hI’M NOT A WITCH.
+
+18
+00:01:11,264 --> 00:01:13,033
+{\an7}BUT YOU ARE DRESSED
+AS ONE.
+
+19
+00:01:13,033 --> 00:01:16,033
+{\an7}THEY DRESSED ME UP
+LIKE THIS.
+\h\h\h\h\h\h\h\hNO !  WE DIDN’T !
+
+20
+00:01:16,033 --> 00:01:19,957
+{\an7}AND THIS ISN’T MY NOSE.
+IT’S A FALSE ONE.
+
+21
+00:01:22,297 --> 00:01:25,429
+{\an7}WELL ?
+\h\h\h\h\h\h\h\hWELL, WE DID
+\h\h\h\h\h\h\h\hDO THE NOSE.
+
+22
+00:01:25,429 --> 00:01:27,066
+{\an7}THE NOSE ?
+\h\h\h\h\h\h\h\hAND THE HAT.
+
+23
+00:01:27,066 --> 00:01:32,495
+{\an7}BUT SHE IS A WITCH.
+YEAH !  BURN HER !
+BURN HER !  BURN HER !
+
+24
+00:01:32,495 --> 00:01:35,462
+{\an7}- DID YOU DRESS HER UP
+\h\hLIKE THIS ?
+- NO !
+
+25
+00:01:35,462 --> 00:01:36,858
+{\an7}\h\h\h\h\h\h\h\hNO !
+NO !
+\h\h\h\hNO !
+
+26
+00:01:36,858 --> 00:01:38,627
+{\an7}YES.  YES.
+YEAH, A BIT.
+
+27
+00:01:38,627 --> 00:01:41,825
+{\an7}\h\h\h\h\h\h\h\hA BIT.
+\h\h\h\h\h\h\h\h\hA BIT.
+SHE HAS GOT A WART.
+
+28
+00:01:41,825 --> 00:01:44,033
+{\an7}WHAT MAKES YOU THINK
+SHE IS A WITCH ?
+
+29
+00:01:44,033 --> 00:01:46,528
+{\an7}WELL, SHE TURNED ME
+INTO A NEWT !
+
+30
+00:01:46,528 --> 00:01:49,297
+{\an7}A NEWT ?
+
+31
+00:01:52,462 --> 00:01:54,396
+{\an7}I GOT BETTER.
+
+32
+00:01:54,396 --> 00:01:55,891
+{\an7}BURN HER ANYWAY !
+
+33
+00:01:55,891 --> 00:01:58,033
+{\an7}BURN HER !
+\h\h\h\h\h\h\h\hBURN HER !
+\h\h\h\h\h\h\h\hCRACKLE, CRACKLE !
+
+34
+00:01:58,033 --> 00:02:01,000
+{\an7}\h\h\h\h[ Shouting
+\h\h\h\h\h\hContinues ]
+QUIET.  QUIET.
+
+35
+00:02:01,000 --> 00:02:02,429
+{\an7}QUIET !
+QUIET !
+
+36
+00:02:02,429 --> 00:02:06,132
+{\an7}THERE ARE WAYS OF TELLING
+WHETHER SHE IS A WITCH.
+
+37
+00:02:06,132 --> 00:02:07,957
+{\an7}ARE THERE ?
+WHAT ARE THEY ?
+
+38
+00:02:07,957 --> 00:02:10,297
+{\an7}TELL US !
+TELL US !
+\h\h\h\hDO THEY HURT ?
+
+39
+00:02:10,297 --> 00:02:13,231
+{\an7}TELL ME,
+WHAT DO YOU DO WITH WITCHES ?
+
+40
+00:02:13,231 --> 00:02:16,198
+{\an7}\h\h\h\h\h\h\h\h\h\h\h\hBURN THEM !
+\h\h\h\h\h\h\h\h\h\h\h\h\hBURN THEM UP !
+BURN !
+
+41
+00:02:16,198 --> 00:02:19,330
+{\an7}AND WHAT DO YOU BURN,
+APART FROM WITCHES ?
+
+42
+00:02:19,330 --> 00:02:21,594
+{\an7}MORE WITCHES !
+SHH !
+
+43
+00:02:21,594 --> 00:02:22,627
+{\an7}WOOD !
+
+44
+00:02:22,627 --> 00:02:26,330
+{\an7}SO,
+WHY DO WITCHES BURN ?
+
+45
+00:02:29,693 --> 00:02:32,033
+{\an7}B--
+
+46
+00:02:36,132