From 09ae6e28850d87e30bd71ac79c40cd22d5c1ea51 Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Sun, 29 Jun 2014 20:46:40 -0300 Subject: [PATCH] Add unit tests for ffmpeg2theora ogg recognition bug Change-Id: I2e6944ccff3882b9f9ee1ac5ab6f5fea1de9d353 Follow-up: 629169ce9bd7 --- tests/phpunit/data/media/README | 4 ++++ tests/phpunit/data/media/say-test.ogg | Bin 0 -> 5132 bytes tests/phpunit/includes/MimeMagicTest.php | 9 +++++++++ 3 files changed, 13 insertions(+) create mode 100644 tests/phpunit/data/media/say-test.ogg diff --git a/tests/phpunit/data/media/README b/tests/phpunit/data/media/README index ca132a441d..9913f685ff 100644 --- a/tests/phpunit/data/media/README +++ b/tests/phpunit/data/media/README @@ -55,3 +55,7 @@ Bishzilla_blink.gif https://commons.wikimedia.org/wiki/File:Bishzilla_blink.gif Public domain Bishonen + +say-test.ogg +Public domain +Brian Wolff diff --git a/tests/phpunit/data/media/say-test.ogg b/tests/phpunit/data/media/say-test.ogg new file mode 100644 index 0000000000000000000000000000000000000000..5d814fb2620d82d4a1f37c0d451a4451edf23aa1 GIT binary patch literal 5132 zcmcI|c~lcw({~4u9Sj%&5in8EghdIDtRu)y(m}wEY(YS>u%oO#g5of;xJ5+_2#UxS zG=U&QgBX>^0SO2gS;Hu}k8DB3aYRSw)%ON{=A7@G@87pi`gT?Qy6RTls=9qo0^{PS zkP`Ic+B|L$tspV&$VQYIYVV$OdP0UmfO21>ctB9K$M$aCk#@KSWzmxp7+B_>l$eCw#sKmO@Cx+y zL0n^FQ&L%RcA4?4J?Swvwj1pn%>YUb3`V?sq64WU4=Tyk&X(!GU^vAPnND_&4h%cg zvhUvNdwPX{U{H`Yg27p=qQVUIQUoC^Gi3xt_?a?BoqcgkH1!C16?cE2Woa1PtA~UU zd`zkSRB|a&1}FxGO2ScPL{?1(hEhb;yZetAhR}w$0Cm19yg}SZ3>Ji3BRhxWV{xQO~Q%YMhrGl z(*1&pKQveztnd?ZS3xcLtO-G#LE1js^Av!)DwGFde9|yIX(oOp=KV@bued{seB)0( z$Cs=lmoUT2Sm9+2*=3h+@Hc&F-Y9Q=Jtx*JC~8uHdLhWD2zU4id7zkDOkPh29&lE# z`Jn6k3d0;mB;|DWc4;wHo4AZvG)O2!j|Mn%wb!b9kuET$Sc>b+Gy1d>+E}<2Is#^6 zd$4hm;tXwA6_7;=IukB%{9(M{S{Yfxrc}0ex{?zBujgJfK>F)BGEb{z5TxP+ z?lASjq9%2y7J|_E#R!RTmqQOA9_An?2|dNgfOB_wI-59y-7!GyH7Otwx{WddoTso% zZObW>0&P1*4t2q8;8}ySQp$5eLHXth=eP;A@d@YfISrTjwRk@NRd&N{MFT&lmd9`4 zi<^1;=H%?E1O-|};PU~S#OKS8@e}(S8XvXI^4sS7gu8DFn<)$!M z-fTS~{ym#NSJ5EPX_yuB<&T7OV&QAR9^+e0G|2me^1e1fpRhRzptX&Unt|@?K80@6 zmj?M<+gzWxxlj0JqOJLhP@r{lM%>oi*WBDFY?2FYUKtcg%o_(xXc$HMUIxsR#A5ss0ep{y{tEbFN( zmsOs1!Bz|$YMYnyt>qofa*3^6Y}+JG`MX)5)zv7Mv;yH|$En1Lj)l24;w|xRlbbE8 z|MU8bq?N}{Ip5qUZ?KY!ljR+I%PF=@)O* zzS+FGD{-Rp%_DK@fN-Ps^|w|%SG2sw+6teKWz{uKNcL!T4Lk1bfS^2-8mRIWeeVBF zu_{h|B?E0K!4{wqOsC8jk0224Osx8w68oI5H&B zreTz(U2_csCkQyhv_wMND3T0J*-h624LtW+2%JF3@P{SU^}3#x-1=ddEMQ5=_p0lL zok_gWs^sXp zSXShhzyw}t3DQ)4X4nI7k$S0I1iGAn>{kB2EZIVN{BJSqVK^F!md4<1C{k z!8WpCge?%2NBH094olLpSTY5?f(6|&nm{qRWou~(O`$8spH81At;>FEL8mZT|{^pgVcWkb9m6t9r1w6mrKv&@OET+an&6 zKHy9^fk>Sa5PaHtMWa!{K-m2wY4A-hwNmS%VMG9TbGUqq^;A zH%e0{Tm$k3tOVa}R3O1}jq(SL>M$VLTq9tLi(yDTdW|xq9)wkZ+F((D_9Sq@fah|+ z9;9gkHooLRPM8UBXeH{qLv(Fo5jGQXA?OwO!yCA#^=VoJRvCQELNY)*D!BU_NkdR5 zvrDp&4AXrDcf;tG5Ht@Qn!n?T-^{dtiq#-@g$GjSI5Zt>kGRe1M6mOK>Z?@5wh{np zxB{v3G$=;T>Bf(1i$ezAfY^q5hw>bOiG1F`@Af_Sb7f`h;WE*LJ?{h*X^3U*2Me?64`zw#uS*xmDx?3*O$;Jg0^yJHEz9(mMG{(d%~?E8IshR z1-|wIk&KpNQ_rC#*+^vcWD9N?Er|!(&7UVSh@dEB6hZfIbkJ4CTF|rIsZbuNC9SBm z{%YsYv!!~#p&%7I7%aS^j&R5^BFKY+@`j01-(>|LRf@6#6;-@cjQ}k`T!1VH)=;dt zB1?)IL|_dZpg?cR2Qno{$shU!b?DG`b)^D5bsz!t4}F3ll4jnKBk@z( zx@dijfswI^8FsDt68d9M`EmX<{mv`SpPvgH%S<4Yhj9Z*s6N%Z(@h=kH+bn>3zzL@?_=9CeBfB89xc#Xop?<>!|RC zmT^)*)KvemldYn~7mwl(7I{R+&eUz6A%2)kf}|CN0V#xC+bL;ZLTRrk5ev4Nq>!qu zW{$heHpVb6Jz0M}Yt7@~?dM)(ZtB0Qbv9IYdDhAcRga%r;+^!-)TG7t{tehq=HFz$ zJcT5*FVi$-jOG15W}k{IyVkzn&Bjgo&nCtdAB&0}wq9^`UudkWZ zc-6g^RtFBzuH+tRFa9^Gv*KO1)`}LqWa0wP;89Rk#JEeV4%=E!lz#?(_jgzCn;DDG zCwp?uWpCOJ&@P^qPDg~#mle-(uhb`I%hNI={Z8%Vouci9I?8=FjwxYzWjT}Ay{GaY zu4FasH`lqAe3p}XFEyUJqTi&5l|j|bSX@~;cQK^zDAMFQd4Bd>?d<~#$%E(3r^%AA zX!ddK3FVFo$@)TKb>l1I$@yd1$Qc`>u1Alquc)MxRTFwTqGrA7OmB{Vj=C28P5-ye z72&5sIs>`sgugf%d(q>!ve|cKr(ZmraL9zjt2(w>ttVL`l66OoN9;>+*7qmf8b?fq z)~)lD?AX6~zqR-5fJ?=#?babq{Dz$^f`K;J-rKG0)76}#VKZstPFkA42BoUe!#yGuFS<1G4FDG;tez3+wC}PzBl>Yzu)c% zj&2EL?@v$p5Dc{$bu@XZVH$T-NIRLf3!04ZO>au}$xy8hT@eQ5hmS@*Ml0jqbeyg_ zT>kI~9p~Z~;P%;lR5l#HJRu<8asRp1wL_`-b=|*)Z)r28grpeZp;09A^Odfa2G=NO zkuG`W?D^^_6>pm1!IgfddbMkg+#sACepB^HmzMoA``V>~iqgf9waW!TH>CTPe{8C? z^_$m$gsVGzW4AzeYD@SZ$|CxFLakS$DOnHR-FIc|D>nK4)pX>wiIex|tSqw zCZGB|_~l9Yz(ccldjl8SihlKepqi+E%VWXrMa;H}0gLd*QBTkp_B=n)H&OZGk1-cW zXzVtSg6f4@NTrz9eF^DrTpUW!cTc7ZF7sc(J4?+v?Io3(6LvetBh#Pevzw2n-S{(N z{MHdk12v%Q?O%h;a)w9nO+yfx8@p4*I+6F;)$#PMsd}>GL5GYEn)tV_drp0vZk;Rmds)tZyyo4_nmdv&S|Oh>N=(W z(?sh>y{*1~TdLfpFRYbWET;wo3oKiyN^9GiU=B|KNTHCWAjW!+zt z(>burHd-7;<@_mFI(`AL$(9Nn_*| zx&Dx_+6v?Htg+(dJ<9&N5bv&YwmPPwzqv;;N&{}F2<&)ode#qOOo}SrdD@`+?&hD7w*X#lTPO(ER#l=rhk|hxe z9aV_dJ;?8xsCtm4^A(?q!LI3k&{j}cS3NIzL-EdM`3l@UrI%i^7H`a|Z!JZ2G;*xh zEaVlDm3u6CTs@0RXUY~@*DDRJI8KWF5*A|@ZYxxA_e=dN`npr}pMNFC+-cq`SX1M2 z!dSn%+ApE^^8G;l+xzKzVO?c(~i-=ee^y7R&wiHw3$;LTMD!9*mt+ zdUz)2Ts!Bd0JHFCWAfwja}5Xb-EQv@e^s{QJrMpnboxH0Lvh zAL~=M`a(@Vb=Hrpf{ep_7@v2~&0{p4R8&@|NFLP8#UGC`kreg>56px!C+&!TWG?&d zOV2va<>$<~9G&8hlq2-qjqDlcfb{8kYDj@W(h8`J85Pr~CW>m*e{p_&w&awI9vrfCFe^0lGJ%|}+l#Em_5?WqozSnzqeMc&=@n{?a znHqWXW*gnk)buu{Y$$3O*f7}s=t(G6E&k+%{bOBsPt^~V4)J!?z4rM4|7(IS@7Xsq z`F9^}s?>h6`&pg_B#zdJ7(s1DhgSr@Z798cLjObql#IIg01uyE)?Pam3BRrFPcKgk zpKyg;oI*!1n%%ZcpDc6bFhAen5T3M7vC zg`MDv%0gR*O`IRO>S(BAsQI_(#fJm6|8ag=VOjjM?>^gz7a@rn&+=ZHkAHPiX<~=W>#w}Xn&{}8euCFmT4q@EWw_I~`J8*R5 z&$GP6Po2-+yBM9P_p2zEMd&?SHYtHfy+d}wti^$NBa}Nd8N0P3z<-;2nbsYt>r{U< WMj3iL{K-sZF}H1TzoSK3G4#J+8QXpU literal 0 HcmV?d00001 diff --git a/tests/phpunit/includes/MimeMagicTest.php b/tests/phpunit/includes/MimeMagicTest.php index 9582fe7f38..a164ff92ef 100644 --- a/tests/phpunit/includes/MimeMagicTest.php +++ b/tests/phpunit/includes/MimeMagicTest.php @@ -36,4 +36,13 @@ class MimeMagicTest extends MediaWikiTestCase { ); } + /** + * Test to make sure that encoder=ffmpeg2theora doesn't trigger + * MEDIATYPE_VIDEO (bug 63584) + */ + function testOggRecognize() { + $oggFile = __DIR__ . '/../data/media/say-test.ogg'; + $actualType = $this->mimeMagic->getMediaType( $oggFile, 'application/ogg' ); + $this->assertEquals( $actualType, MEDIATYPE_AUDIO ); + } } -- 2.20.1