[FFmpeg-devel] [PATCH 2/2] Support playing SMV files.

Ash Hughes ashes-iontach at hotmail.com
Fri May 24 01:39:39 CEST 2013


Hi,

Here's a fate test, I hope it's acceptable. Also, if it's suitable, please add apple.smv from http://multimedia.cx/samples/smv/ to fate $(SAMPLES)/smv/


Thanks,

Ash

---
>From f1ca7c5d2a2cd22e665ca362f0915b219d1aa123 Mon Sep 17 00:00:00 2001
From: Ash Hughes <ashes-iontach at hotmail.com>
Date: Fri, 24 May 2013 00:24:38 +0100
Subject: [PATCH] add wav demux/SMV fate test

---
 tests/fate/demux.mak     |   3 +
 tests/ref/fate/wav-demux | 182 +++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 185 insertions(+)
 create mode 100644 tests/ref/fate/wav-demux

diff --git a/tests/fate/demux.mak b/tests/fate/demux.mak
index ce54f8f..b68a0a9 100644
--- a/tests/fate/demux.mak
+++ b/tests/fate/demux.mak
@@ -91,6 +91,9 @@ fate-siff-demux: CMD = framecrc -i $(SAMPLES)/SIFF/INTRO_B.VB -c copy
 FATE_SAMPLES_DEMUX-$(CONFIG_SMJPEG_DEMUXER) += fate-smjpeg-demux
 fate-smjpeg-demux: CMD = framecrc -i $(SAMPLES)/smjpeg/scenwin.mjpg -c copy
 
+FATE_SAMPLES_DEMUX-$(CONFIG_WAV_DEMUXER) += fate-wav-demux
+fate-wav-demux: CMD = framecrc -i $(SAMPLES)/smv/apple.smv -c copy
+
 FATE_SAMPLES_DEMUX-$(CONFIG_WSAUD_DEMUXER) += fate-westwood-aud
 fate-westwood-aud: CMD = framecrc -i $(SAMPLES)/westwood-aud/excellent.aud -c copy
 
diff --git a/tests/ref/fate/wav-demux b/tests/ref/fate/wav-demux
new file mode 100644
index 0000000..8a836be
--- /dev/null
+++ b/tests/ref/fate/wav-demux
@@ -0,0 +1,182 @@
+#tb 0: 1/23
+#tb 1: 1/22050
+1,          0,          0,     8136,     4096, 0x0a17e101
+1,       8136,       8136,     8136,     4096, 0x0c448199
+1,      16272,      16272,     8136,     4096, 0x8bcd743c
+1,      24408,      24408,     8136,     4096, 0x180559cd
+1,      32544,      32544,     8136,     4096, 0x5cb98b92
+1,      40680,      40680,     8136,     4096, 0x958b6f1a
+1,      48816,      48816,     8136,     4096, 0xf4f46fa3
+1,      56952,      56952,     8136,     4096, 0x488d6dc7
+1,      65088,      65088,     8136,     4096, 0x14dd64f7
+1,      73224,      73224,     8136,     4096, 0xf9b08083
+1,      81360,      81360,     8136,     4096, 0xf0805498
+1,      89496,      89496,     8136,     4096, 0xa76e79c8
+1,      97632,      97632,     8136,     4096, 0x935daa9f
+1,     105768,     105768,     8136,     4096, 0x44787940
+1,     113904,     113904,     8136,     4096, 0xe19a4771
+1,     122040,     122040,     8136,     4096, 0x6751c05a
+1,     130176,     130176,     8136,     4096, 0x7c1a41e1
+1,     138312,     138312,     8136,     4096, 0xf0e13be2
+1,     146448,     146448,     8136,     4096, 0x9f574f58
+1,     154584,     154584,     8136,     4096, 0x9b884a2e
+1,     162720,     162720,     8136,     4096, 0x19cb2b0a
+1,     170856,     170856,     8136,     4096, 0x964438a1
+1,     178992,     178992,     8136,     4096, 0xe8265953
+1,     187128,     187128,     8136,     4096, 0xfe0a77c7
+1,     195264,     195264,     8136,     4096, 0x786462cc
+1,     203400,     203400,     8136,     4096, 0xf2bfa4d4
+1,     211536,     211536,     8136,     4096, 0xbf898057
+1,     219672,     219672,     8136,     4096, 0x99b16e38
+1,     227808,     227808,     8136,     4096, 0x675761db
+1,     235944,     235944,     8136,     4096, 0x10d862d7
+1,     244080,     244080,     8136,     4096, 0x5e8b4711
+1,     252216,     252216,     8136,     4096, 0x88338926
+1,     260352,     260352,     8136,     4096, 0x147d5c03
+1,     268488,     268488,     8136,     4096, 0xe9d577f6
+1,     276624,     276624,     8136,     4096, 0xf2447922
+1,     284760,     284760,     8136,     4096, 0x4389b6b5
+1,     292896,     292896,     8136,     4096, 0x31ce474a
+1,     301032,     301032,     8136,     4096, 0xe9932001
+1,     309168,     309168,     8136,     4096, 0x3e78948d
+1,     317304,     317304,     8136,     4096, 0xa917ec79
+1,     325440,     325440,     8136,     4096, 0x1e301668
+1,     333576,     333576,     8136,     4096, 0xd8788706
+1,     341712,     341712,     8136,     4096, 0xfb6a1425
+1,     349848,     349848,     8136,     4096, 0x04d84d0f
+1,     357984,     357984,     8136,     4096, 0xdb7671a1
+1,     366120,     366120,     8136,     4096, 0xe599677b
+1,     374256,     374256,     8136,     4096, 0xf75d5d89
+1,     382392,     382392,     8136,     4096, 0xccda60e9
+1,     390528,     390528,     8136,     4096, 0x19b06d12
+1,     398664,     398664,     8136,     4096, 0x6cb47229
+1,     406800,     406800,     8136,     4096, 0x819349ae
+1,     414936,     414936,     8136,     4096, 0x4a8a2582
+1,     423072,     423072,     8136,     4096, 0xe9690571
+1,     431208,     431208,     8136,     4096, 0xd98de6c9
+1,     439344,     439344,     8136,     4096, 0x6231db28
+1,     447480,     447480,     8136,     4096, 0x4e4d2c01
+1,     455616,     455616,     8136,     4096, 0xb15828d2
+1,     463752,     463752,     8136,     4096, 0x1b72a45f
+1,     471888,     471888,     8136,     4096, 0x9a664f5f
+1,     480024,     480024,     8136,     4096, 0x361136b1
+1,     488160,     488160,     8136,     4096, 0xe6711ac1
+1,     496296,     496296,     8136,     4096, 0xfe394336
+1,     504432,     504432,     8136,     4096, 0xe0061070
+1,     512568,     512568,     8136,     4096, 0xbd6453ac
+1,     520704,     520704,     8136,     4096, 0x67aba86d
+1,     528840,     528840,     8136,     4096, 0x4d86b32f
+1,     536976,     536976,     8136,     4096, 0xe26053aa
+1,     545112,     545112,     8136,     4096, 0x139466de
+1,     553248,     553248,     8136,     4096, 0xfa0c96b7
+1,     561384,     561384,     8136,     4096, 0x46015f1a
+1,     569520,     569520,     8136,     4096, 0xafb87159
+1,     577656,     577656,     8136,     4096, 0xaa9563c1
+1,     585792,     585792,     8136,     4096, 0xa84367c6
+1,     593928,     593928,     8136,     4096, 0xbb4367d6
+1,     602064,     602064,     8136,     4096, 0x4d435587
+1,     610200,     610200,     8136,     4096, 0x66425b2a
+1,     618336,     618336,     8136,     4096, 0x72bc60c2
+1,     626472,     626472,     8136,     4096, 0xb8f2693a
+1,     634608,     634608,     8136,     4096, 0xf6d07010
+1,     642744,     642744,     8136,     4096, 0xaf675ee0
+1,     650880,     650880,     8136,     4096, 0xba5f5919
+1,     659016,     659016,     8136,     4096, 0x7ea8593a
+1,     667152,     667152,     8136,     4096, 0xe2144547
+1,     675288,     675288,     8136,     4096, 0x39a5645e
+1,     683424,     683424,     8136,     4096, 0xa4e65eac
+1,     691560,     691560,     8136,     4096, 0xc67760a8
+1,     699696,     699696,     8136,     4096, 0xe9a8fa02
+1,     707832,     707832,     8136,     4096, 0xff30e5da
+1,     715968,     715968,     8136,     4096, 0x18316fb1
+1,     724104,     724104,     8136,     4096, 0x85f93aeb
+1,     732240,     732240,     8136,     4096, 0xe37e9072
+1,     740376,     740376,     8136,     4096, 0xcb0415c1
+1,     748512,     748512,     8136,     4096, 0x14b8292b
+1,     756648,     756648,     8136,     4096, 0xbd102aad
+1,     764784,     764784,     8136,     4096, 0x0905b369
+1,     772920,     772920,     8136,     4096, 0x984e8240
+1,     781056,     781056,     8136,     4096, 0xc8769d1f
+1,     789192,     789192,     8136,     4096, 0x524b9927
+1,     797328,     797328,     8136,     4096, 0x4280549e
+1,     805464,     805464,     8136,     4096, 0x907b7564
+1,     813600,     813600,     8136,     4096, 0x5a4e57f0
+1,     821736,     821736,     8136,     4096, 0xdc0d6eec
+1,     829872,     829872,     8136,     4096, 0x408d5ecd
+1,     838008,     838008,     8136,     4096, 0x17a66492
+1,     846144,     846144,     8136,     4096, 0x377f6434
+1,     854280,     854280,     8136,     4096, 0x09935a3c
+1,     862416,     862416,     8136,     4096, 0x07f56a5c
+1,     870552,     870552,     8136,     4096, 0xffeb75ed
+1,     878688,     878688,     8136,     4096, 0xb09566b7
+1,     886824,     886824,     8136,     4096, 0xadf34d16
+1,     894960,     894960,     8136,     4096, 0xb4624d32
+1,     903096,     903096,     8136,     4096, 0x667a5f17
+1,     911232,     911232,     8136,     4096, 0x7cb55251
+1,     919368,     919368,     8136,     4096, 0xd00756e8
+1,     927504,     927504,     8136,     4096, 0xd5846478
+1,     935640,     935640,     8136,     4096, 0x92c08318
+1,     943776,     943776,     8136,     4096, 0x4e2d5342
+1,     951912,     951912,     8136,     4096, 0xc0a739ee
+1,     960048,     960048,     8136,     4096, 0x51176dc7
+1,     968184,     968184,     8136,     4096, 0xa2d531b4
+1,     976320,     976320,     8136,     4096, 0x68a4793f
+1,     984456,     984456,     8136,     4096, 0x81ec7eed
+1,     992592,     992592,     8136,     4096, 0xa7a74800
+1,    1000728,    1000728,     8136,     4096, 0x2388623a
+1,    1008864,    1008864,     8136,     4096, 0x4aba3a0c
+1,    1017000,    1017000,     8136,     4096, 0xa43f491e
+1,    1025136,    1025136,     8136,     4096, 0xfb506102
+1,    1033272,    1033272,     8136,     4096, 0x425b5873
+1,    1041408,    1041408,     8136,     4096, 0x10487cce
+1,    1049544,    1049544,     8136,     4096, 0x45946c56
+1,    1057680,    1057680,     8136,     4096, 0x861e587e
+1,    1065816,    1065816,     8136,     4096, 0xb3fa60bf
+1,    1073952,    1073952,     8136,     4096, 0x31ca5db4
+1,    1082088,    1082088,     8136,     4096, 0xc8db6230
+1,    1090224,    1090224,     8136,     4096, 0x9eab5927
+1,    1098360,    1098360,     8136,     4096, 0x7aec51c0
+1,    1106496,    1106496,     8136,     4096, 0xb04068d2
+1,    1114632,    1114632,     8136,     4096, 0x75905d55
+1,    1122768,    1122768,     8136,     4096, 0x63063b14
+1,    1130904,    1130904,     8136,     4096, 0xf2493413
+1,    1139040,    1139040,     8136,     4096, 0x00000000
+1,    1147176,    1147176,     8136,     4096, 0x00000000
+1,    1155312,    1155312,     8136,     4096, 0x34994ce0
+1,    1163448,    1163448,     8136,     4096, 0xbcc04c2b
+1,    1171584,    1171584,     8136,     4096, 0x00000000
+1,    1179720,    1179720,     8136,     4096, 0x00000000
+1,    1187856,    1187856,     8136,     4096, 0x00000000
+1,    1195992,    1195992,     8136,     4096, 0x00000000
+1,    1204128,    1204128,     8136,     4096, 0x00000000
+1,    1212264,    1212264,     8136,     4096, 0x00000000
+1,    1220400,    1220400,     8136,     4096, 0x4fa4bff9
+1,    1228536,    1228536,     8136,     4096, 0x00000000
+1,    1236672,    1236672,     8136,     4096, 0x55d1c393
+1,    1244808,    1244808,     8136,     4096, 0x3902bc42
+1,    1252944,    1252944,     8136,     4096, 0x25111404
+1,    1261080,    1261080,     8136,     4096, 0xae7f2774
+1,    1269216,    1269216,     8136,     4096, 0xc28b5b39
+1,    1277352,    1277352,     8136,     4096, 0x619dd7fe
+1,    1285488,    1285488,     8136,     4096, 0x00000000
+1,    1293624,    1293624,     8136,     4096, 0x00000000
+1,    1301760,    1301760,     8136,     4096, 0x00000000
+1,    1309896,    1309896,     8136,     4096, 0x00000000
+1,    1318032,    1318032,     8136,     4096, 0x00000000
+1,    1326168,    1326168,     8136,     4096, 0x00000000
+1,    1334304,    1334304,     8136,     4096, 0x00000000
+1,    1342440,    1342440,     8136,     4096, 0xe8337eba
+1,    1350576,    1350576,     8136,     4096, 0x5ad76305
+1,    1358712,    1358712,     8136,     4096, 0xbbdf5eae
+1,    1366848,    1366848,     8136,     4096, 0xadc67748
+1,    1374984,    1374984,     8136,     4096, 0x551d461e
+1,    1383120,    1383120,     8136,     4096, 0xa8d162c8
+1,    1391256,    1391256,     8136,     4096, 0x1ba2533f
+1,    1399392,    1399392,     8136,     4096, 0x709e4c9b
+1,    1407528,    1407528,     8136,     4096, 0x6d004a4c
+1,    1415664,    1415664,     8136,     4096, 0x3012eb1d
+1,    1423800,    1423800,     8136,     4096, 0x4e6dc3bc
+1,    1431936,    1431936,     8136,     4096, 0x64b36b64
+1,    1440072,    1440072,     8136,     4096, 0x2d1b7406
+1,    1448208,    1448208,     8136,     4096, 0x6ed8aad2
+1,    1456344,    1456344,     3051,     1536, 0x00000000
-- 
1.8.1.4


Date: Wed, 22 May 2013 15:37:34 +0200
From: michaelni at gmx.at
To: ffmpeg-devel at ffmpeg.org
Subject: Re: [FFmpeg-devel] [PATCH 2/2] Support playing SMV files.

On Wed, May 22, 2013 at 01:16:51AM +0000, Ash Hughes wrote:
> updated to use FF_CEIL_RSHIFT. The abs() was a throwback to testing, removing it changes the following '<' back to a '>'
 
patch applied
 
maybe you want to add a fate/regression test for it
 
Thanks
 
[...]
-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
 
Awnsering whenever a program halts or runs forever is
On a turing machine, in general impossible (turings halting problem).
On any real computer, always possible as a real computer has a finite number
of states N, and will either halt in less than N cycles or never halt.

_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel at ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel 		 	   		  


More information about the ffmpeg-devel mailing list