From efef66c892ce1d0f384022a76730347bb017b347 Mon Sep 17 00:00:00 2001 From: Alexander Kojevnikov Date: Fri, 29 Mar 2013 09:16:42 -0700 Subject: [PATCH] tests: WMA demuxing/decoding --- src/spek-audio.cc | 4 +++- tests/samples/2ch-44100Hz-v1.wma | Bin 0 -> 3704 bytes tests/samples/2ch-44100Hz-v2.wma | Bin 0 -> 3744 bytes tests/test-audio.cc | 4 ++++ 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 tests/samples/2ch-44100Hz-v1.wma create mode 100644 tests/samples/2ch-44100Hz-v2.wma diff --git a/src/spek-audio.cc b/src/spek-audio.cc index 5c1615f..2c68165 100644 --- a/src/spek-audio.cc +++ b/src/spek-audio.cc @@ -137,7 +137,9 @@ std::unique_ptr Audio::open(const std::string& file_name) bits_per_sample = codec_context->bits_per_coded_sample; } if (codec_context->codec_id == AV_CODEC_ID_AAC || - codec_context->codec_id == AV_CODEC_ID_MUSEPACK8) { + codec_context->codec_id == AV_CODEC_ID_MUSEPACK8 || + codec_context->codec_id == AV_CODEC_ID_WMAV1 || + codec_context->codec_id == AV_CODEC_ID_WMAV2) { // These decoders set both bps and bitrate. bits_per_sample = 0; } diff --git a/tests/samples/2ch-44100Hz-v1.wma b/tests/samples/2ch-44100Hz-v1.wma new file mode 100644 index 0000000000000000000000000000000000000000..023b6f94eb913ddd7cbb68a81e6fe9af5438234a GIT binary patch literal 3704 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 J5%_;c;GfXXg_8gP literal 0 HcmV?d00001 diff --git a/tests/samples/2ch-44100Hz-v2.wma b/tests/samples/2ch-44100Hz-v2.wma new file mode 100644 index 0000000000000000000000000000000000000000..aeab50287935f8a9dfec1ceac77d7a1f88a47bb4 GIT binary patch literal 3744 zcmeHHdpMNq7JrRRa*4UPgkq-IGLrV}q#io~=tsAfl*5P5Q<%{0>#4Ref` ziU>QDk=#PkP&qX+lnKw|Qm)ldiM_SYIfKsg^z8HB*?*jW_WGW8ed}HC?|awxTWh`V zcUIN$83($cB`?5rz>r40Qv=JQq0(xQ!ol)$?!RaBUbh+SYx;hFxOqdK~%34mAy2;M>TL;{qB!;OL0b5;@GXg094jf-nir+ zTk&fy`(2Bl%2tiapu!nY@MvEdHR20e4OoL9-~+Y*GB^Ul!BG$am@4Za2mp~FPW7zJ zVwdsez#D{tdx98mz1PD)O-}FZy__9?WeSj9@+pt`l^;3O|3CB?`U%=9&6J-%1bk(Jac7I~%L zzp|C<_TpS#73lHFTzC5LyHobX<&Os)Z{513R15sc_XzV%`J0k$uS0C=7rMSb^-JS| z`Ayujh+ED_Q&OOYj?<+g%3B9Rp3##`Y5uqdY&Wj z;N!APgpB&UPzn`i)IuUdjrU?Eg5e?}W8_Vc^ced6hN;n>vs9tu!|W%Pb>-YxQ7E@9 zw~>|9i6UX9&8)OUo@laSyn=$f4MRnXH}*+wvOE|VMsQEhl-nljaa{f@va!#H)bUaU zX$(c8Pq1ZC#LzJ~&oDj7h}AxYIXTMfMzaTuadJM+BWjZ@UET~!4m%*!l(12kYXW3x zUSq1G1@Eo zbuY*4hB5UK>|Dvt;BUpWVPE9*ky@L7RH38&_WS;MQ5|2EEcdM8nt~}$bS%6~S_mkn$!|7mZ{EnsJKAi4s>H`^e&bqemwRlK zE43Hy+QXGxo)@DuE@9|8u%SLew_R-?;l)t!z4u#i?q;mGwtW%;*#%>P>cX8e4W(l! zANV-`_Q4YT+>J@Cf@`b_4XiOAdgXyJCwwTRxS>0N6FzM)GHZueg^%Tjj2h79G-!l( zITvVaY>Yhvh*N6`N=OsjAlqPp_UtwhN>JhmVFyjJN5j`d#jP*Anw85B_1*r&s?(G= zctv54XR+eXqZc!{Eq0}CLbw=~%%TyE5kZRdOOt+N14?0gk2fu7Pk%%U#-oR4Sl5m2 zKbcZE8Bg}O))GHk(+TscY}X0htsrsIu0WdU7P!GJ`+)Bb!LF+IG76f=Wd*KU zZJp}QVSV?8u^3FZr#5&37S> z`1+sIYSY&%5!Zw_=J1G2(L_L5xJM~}mv3$TB4Rz62j!KcxFy*qrw>n~oX-`|%ItrILsV9g};58|=1BhuwR}uSA7sT_ayJ4F~qUb|G z+?Ee{OkIp&cvG_MXw&GVdt$#qh?H#58F%MQ>upxa)5a^N;lo~|bi$McL=jt2gd!uu zr#b!$`7G_dgvhN=>^seT^aKcj?n%0FV&kt;p4f@jn@?$>COR}2YL%Y1dQM_n<+eR| z#_l`Oi^awjlE-Nzs<_5qurDDK>qPyYjol{5ZOmgFa-75#Vs#4`%<)Xf6xo`_*k;HQ z!z`~8Sxy{`2eZVkj32rapK$4nb@4yr1$ycHL~F6NGaTwp+SaW%%PlO;D7`n7XwpL; z5AaT%{j_nf-&#NCXn02_L;?IE;-Kny}WRJ+)JUD&yVcLvU zRsX^@twY|Fn#Nweunv<8?E;d9HL3W0H414IW^(3Zr@qDGGr#$LjyKJ!w(5DTj!?f} zsaM>eIy`D)7+}e^5q-zak#2Chez2@k*EL4@z0`3|=YKx{OSk=B@>d4_%E13S1OEn4 CU4iZZ literal 0 HcmV?d00001 diff --git a/tests/test-audio.cc b/tests/test-audio.cc index b3c3f6b..97d80a5 100644 --- a/tests/test-audio.cc +++ b/tests/test-audio.cc @@ -115,6 +115,10 @@ void test_audio() {AudioError::OK, "ATSC A/52", 192000, 44100, 0, 2, AC3_T, 9 * 1024}}, {"2ch-44100Hz-std.mpc", {AudioError::OK, "Musepack", 0, 44100, 0, 2, 0.0, 11 * 1024 + 256}}, + {"2ch-44100Hz-v1.wma", + {AudioError::OK, "Windows Media Audio 1", 128000, 44100, 0, 2, 0.138, 12 * 1024}}, + {"2ch-44100Hz-v2.wma", + {AudioError::OK, "Windows Media Audio 2", 128000, 44100, 0, 2, 0.138, 12 * 1024}}, }; Audio audio;