[PATCH v2 0/3] MR9454: Revert "winmm: Use AUTOCONVERTPCM when initializing the audio client."
This reverts commit 21fb3555ed1f26e46d4c82cb2ec8fc29f730a0e9, which inadvertently removed support for converting audio formats not directly supported by mmdevapi. I'll work on a better solution over the next few days. -- v2: Revert "winmm: Use AUTOCONVERTPCM when initializing the audio client." https://gitlab.winehq.org/wine/wine/-/merge_requests/9454
From: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winmm/tests/wave.c | 60 +++++++++++++++++++++++++++++++++++------ 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index cb68ee315da..51d6c80aeda 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1754,7 +1754,8 @@ static void test_reentrant_callback(void) CloseHandle(hevent); } -static void create_wav_file(char *temp_file) +static void create_wav_file(char *temp_file, WORD format_tag, unsigned int channels, + unsigned int bits_per_sample, unsigned int samples_per_sec) { WAVEFORMATEX format; HMMIO h; @@ -1764,13 +1765,13 @@ static void create_wav_file(char *temp_file) DWORD length; char *buffer; - format.wFormatTag=WAVE_FORMAT_PCM; + format.wFormatTag = format_tag; format.cbSize = 0; - format.nChannels=1; - format.wBitsPerSample=8; - format.nSamplesPerSec=8000; - format.nBlockAlign=format.nChannels*format.wBitsPerSample/8; - format.nAvgBytesPerSec=format.nSamplesPerSec*format.nBlockAlign; + format.nChannels = channels; + format.wBitsPerSample = bits_per_sample; + format.nSamplesPerSec = samples_per_sec; + format.nBlockAlign = format.nChannels * format.wBitsPerSample / 8; + format.nAvgBytesPerSec = format.nSamplesPerSec * format.nBlockAlign; h = mmioOpenA(temp_file, NULL, MMIO_ALLOCBUF | MMIO_WRITE | MMIO_CREATE); ok(h != NULL, "Can't open temp_file\n"); @@ -1806,6 +1807,11 @@ static void create_wav_file(char *temp_file) ok(rc == MMSYSERR_NOERROR, "mmioClose failed, got %u\n", rc); } +static const unsigned int sampling_rates[] = { 8000, 44100, 96000 }; +static const unsigned int channel_counts[] = { 1, 2 }; +static const unsigned int sample_formats[][2] = { {WAVE_FORMAT_PCM, 8}, {WAVE_FORMAT_PCM, 16}, + {WAVE_FORMAT_PCM, 32}, {WAVE_FORMAT_IEEE_FLOAT, 32} }; + static void test_PlaySound(void) { BOOL br; @@ -1824,7 +1830,10 @@ static void test_PlaySound(void) GetTempPathA(sizeof(test_file), test_file); strcat(test_file, "mysound.wav"); - create_wav_file(test_file); + + /* Test some filename quirks. */ + + create_wav_file(test_file, WAVE_FORMAT_PCM, 1, 8, 8000); br = PlaySoundA(test_file, NULL, SND_FILENAME | SND_NODEFAULT); ok(br, "PlaySound failed, got %d\n", br); @@ -1847,6 +1856,41 @@ static void test_PlaySound(void) ok(!br || broken(br), "PlaySound succeeded, got %d\n", br); DeleteFileA(test_file); + + /* Test many different formats. */ + for (unsigned int i = 0; i < ARRAY_SIZE(sampling_rates); ++i) + { + winetest_push_context("rate %u", sampling_rates[i]); + + for (unsigned int j = 0; j < ARRAY_SIZE(channel_counts); ++j) + { + winetest_push_context("channel count %u", channel_counts[j]); + + for (unsigned int k = 0; k < ARRAY_SIZE(sample_formats); ++k) + { + winetest_push_context("type %s, depth %u", sample_formats[k][0] == WAVE_FORMAT_PCM ? "PCM" : "float", + sample_formats[k][1]); + + create_wav_file(test_file, sample_formats[k][0], channel_counts[j], + sample_formats[k][1], sampling_rates[i]); + + br = PlaySoundA(test_file, NULL, SND_FILENAME | SND_NODEFAULT); + ok(br, "PlaySound failed, got %d\n", br); + + /* SND_ALIAS fallbacks to SND_FILENAME */ + br = PlaySoundA(test_file, NULL, SND_ALIAS | SND_NODEFAULT); + ok(br, "PlaySound failed, got %d\n", br); + + DeleteFileA(test_file); + + winetest_pop_context(); + } + + winetest_pop_context(); + } + + winetest_pop_context(); + } } START_TEST(wave) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9454
From: Giovanni Mascellani <gmascellani(a)codeweavers.com> --- dlls/winmm/tests/rsrc.rc | 30 ++++++++++++++++++++++++ dlls/winmm/tests/test_adpcm_ima_wav.wav | Bin 0 -> 3166 bytes dlls/winmm/tests/test_adpcm_ms.wav | Bin 0 -> 3196 bytes dlls/winmm/tests/test_alaw.wav | Bin 0 -> 4502 bytes dlls/winmm/tests/test_gsm_ms.wav | Bin 0 -> 290 bytes dlls/winmm/tests/test_mp2.wav | Bin 0 -> 5130 bytes dlls/winmm/tests/test_mp3.wav | Bin 0 -> 1148 bytes dlls/winmm/tests/test_mulaw.wav | Bin 0 -> 4502 bytes dlls/winmm/tests/wave.c | 28 ++++++++++++++++++++++ 9 files changed, 58 insertions(+) create mode 100644 dlls/winmm/tests/test_adpcm_ima_wav.wav create mode 100644 dlls/winmm/tests/test_adpcm_ms.wav create mode 100644 dlls/winmm/tests/test_alaw.wav create mode 100644 dlls/winmm/tests/test_gsm_ms.wav create mode 100644 dlls/winmm/tests/test_mp2.wav create mode 100644 dlls/winmm/tests/test_mp3.wav create mode 100644 dlls/winmm/tests/test_mulaw.wav diff --git a/dlls/winmm/tests/rsrc.rc b/dlls/winmm/tests/rsrc.rc index b5fde1c39ba..b36fa3c407d 100644 --- a/dlls/winmm/tests/rsrc.rc +++ b/dlls/winmm/tests/rsrc.rc @@ -23,3 +23,33 @@ /* ffmpeg -f lavfi -i smptebars -f lavfi -i "sine=frequency=1000" -t 0.16 -r 25 -f mpeg -vcodec mpeg1video -vf scale=32x24 -acodec mp2 test.mpg */ /* @makedep: test.mpg */ test.mpg RCDATA "test.mpg" + +/* ffmpeg -f lavfi -i "sine=frequency=1000" -t 0.1 -c:a pcm_alaw test_alaw.wav */ +/* @makedep: test_alaw.wav */ +test_alaw.wav WAVE "test_alaw.wav" + +/* ffmpeg -f lavfi -i "sine=frequency=1000" -t 0.1 -c:a pcm_mulaw test_mulaw.wav */ +/* @makedep: test_mulaw.wav */ +test_mulaw.wav WAVE "test_mulaw.wav" + +/* ffmpeg -f lavfi -i "sine=frequency=1000" -t 0.1 -c:a adpcm_ms test_adpcm_ms.wav */ +/* @makedep: test_adpcm_ms.wav */ +test_adpcm_ms.wav WAVE "test_adpcm_ms.wav" + +/* ffmpeg -f lavfi -i "sine=frequency=1000" -t 0.1 -c:a adpcm_ima_wav test_adpcm_ima_wav.wav */ +/* @makedep: test_adpcm_ima_wav.wav */ +test_adpcm_ima_wav.wav WAVE "test_adpcm_ima_wav.wav" + +/* ffmpeg -f lavfi -i "sine=frequency=1000" -ar 8000 -t 0.1 -c:a gsm_ms test_gsm_ms.wav */ +/* @makedep: test_gsm_ms.wav */ +test_gsm_ms.wav WAVE "test_gsm_ms.wav" + +/* ffmpeg -f lavfi -i "sine=frequency=1000" -t 0.1 -c:a mp2 test_mp2.wav +/* @makedep: test_mp2.wav */ +test_mp2.wav WAVE "test_mp2.wav" + +/* ffmpeg -f lavfi -i "sine=frequency=1000" -t 0.1 -c:a mp3 test_mp3.wav + * But that generates a file with zero nAvgBytesPerSec, which crashes in mpegl3.c. + * So I manually set it 11480 (the file size divided by 0.1 seconds). */ +/* @makedep: test_mp3.wav */ +test_mp3.wav WAVE "test_mp3.wav" diff --git a/dlls/winmm/tests/test_adpcm_ima_wav.wav b/dlls/winmm/tests/test_adpcm_ima_wav.wav new file mode 100644 index 0000000000000000000000000000000000000000..ba657f4856a35189d4c9934e56511e96749b5a11 GIT binary patch literal 3166 zcmWIYbaM;iVPFV%40BD(Em06*U|<krU}SJv!@$sB$H2hA!otAB(a)RL0)F}Z|=fq}tF zkb%L+GdM(wfq}u(&&}U6*e!&Yfq}s%u`JEZP|sY?(7=F!AtkXSk%5N+49d&P%^Mgx zXYM+EdiS1Pt7dU1g#<f0I~y4p2{x?Udln|D2og0mF;Wt0+<E5Ao;{~`@7^_wL(w(Z z#KhUy*hr{x=bb%!Z?9gndey8BMH4d<7b6vAB_W2Dx6j<(z323<RVz6ZOk9JFO`MJ3 zqPy3up4B0U5M6Qm%xRFhyH|B8x|q5+8=EK_3pK8|z4y%N-FsH=p4BPnl5A}1Z0xM0 z$S~vdnLTHAty#T#Rfj;ZiK&T+in6j2!;I5s!6vL(*&*QMVq#+AtgNggF!R>!J$v?m z)OHFuhd7&nOb}w6aq7(N)4TWV-Zi^RAlN0?+1SKbS($Oh>9b(b)vG%tf=yhZq7zP^ zy}f(wnq8|_bxIhSxqwVC5(a)MXN>+GJrr$N5xVsHvJF?BXpQC5P9p56sg>uTa+Y+`Jz z%rxQDnKNtl>;{Q)7`X<km>4(a)7DG7G$y0hoZ?mfGA(a)1Duw<l^G2qGF`1#MH3s&h67{ z*6dons*A(W)YVzV87#UJBzk(+>Q%EO6kQ=vq$Jd^3K2zy(a)F>C_aSWpo=WOge8gYmm zw~=3+Vb$Kfdr$8^y?WJ51|!#CXA>tQP{KTU8<8+WoI!cqNLjF9*V!|OglQIRY+|gU z#MrR%%$d`tPw(2bY8Hc`izz6<t0)OJ>^!q)@1E1USMQ$5Vd!dNYT|6HY%JKg>&}_e zr+2T}y=oT6Xo)gfqQEK$P$4>670|sZc=}VHVfF4=GX<PXO-)Rkjg*C%W}G^62BWGI zoU!ZdncZi0tywi|rhuWTtFfxHk&%#K2dn~I)hXc!t^l2llo%U!oduU2r)SM%P%<?I kRoKc(f*q8UC=Cq_93TiGI5;>Oz(a)TFkjE2By2#_BF098e&uK)l5 literal 0 HcmV?d00001 diff --git a/dlls/winmm/tests/test_adpcm_ms.wav b/dlls/winmm/tests/test_adpcm_ms.wav new file mode 100644 index 0000000000000000000000000000000000000000..d906bee88eab0dcdb4f98ab02ffda7920454c4b9 GIT binary patch literal 3196 zcmWIYbaN}=VPFV%40BD(Em1IHU|?WkU}SJv!@$sB$H2hA!or}y(a)P(b7fq(a)Y$^`C)( zf#Cpy1H%Uf28J_?2LC%4CH|)+CYP`<FfdpNGBEgf28T#7Ffe%fx%qnryM^#FFfjNe zmZg~)>Y3{q8W=Dzq$HLkGVm}kFbFWXGBGfemkJ6B(a)c+HL=kC6{ciz4GFK7}RY^tJc zWUQpXcl*rQGk4G4dHenWld7qSv$Kh(a)vXLN2bno4>=kDG6FKFTl7ByB<1c{!xbN9~M zcmEkpT!KxUO^l6|1^I8^y1V!8zPoSVy=OED4t92SHa0d=<iCC9%$+-T?%lojk4Yss z*x5zd$w*0&|IL}Rd+*$Nd-v@>MiW<4V`pa*WhFs*i0IvWci%Ir1P8kqJ3ARGDayY& zbLP(3J9qEieFqW^axzgiR#M{s0}?%V=iR;kABBU1gPfd<m5r46|J=HB_UzfaXWza5 zC>&yHVq&7~q$I(a)f?#vmG=$&`(7?gs8T}+Ifjg6ET{;mayp1XVR{RgEG=U@{PV-qDs zfxl<YoZWZ#?Av?qJ}A372RoY>J1Z$M{5yT;%-yqR(a)4kKaLD<y=<YQ+gC4s-U&Yrn* z2NaYH%%(1;#wJe2MoI!8wRi5kJ@@wC2O(4EU}tAzXJti&e`n5|xx4S~-MjZbFuR&M zn<|6V(a)_}qSclYkO_y2`dLAHTJ75<-rL<T5|Or1edq-?At`2WnA+js7sy?gH62PRNt znBs^yBV$O!?K^kpEjWsTgH4S=UKZpBMKU<z9x$q!P$%Myos8fSclRy15yt?E`m>;* ze9xfl66|6e1d2|Ew|l@*f9~EtSi~tCD+;{bbLRG&x99HNd;dY$)zmoH*u>aaQQ$8~ z?b*BM?!99W3U)Pi0r}Wa;P2kGx9{G5d+#17;y?+)*w|PJr1tFDvuEGleg8no)zrkq z$wXO6N#Ng^Gq>-aJ$Lus{RhG>!Qcd;tSAT(J$v`wy$?dJrY6oNCdx)iAW=|$xqJ8C z10h#aQx$M(a)LLv?n_3!@+nwpxbK=RiAvunZ0<lejgg5U(<WTK>~zz0g#ckbRj_YR)p zjFlAlZ`}dqm$!G{{by2j0p$#1CnZ7tJ7><^etYNM-FNSqOhQaejGax4loa^i>^*b# z&YipW?!9L;32}A-iz(a)QpT?5Vo=iWVFFb;7JHg-`qW(a)u)3!uOI_km2o~J7>?lJ$LWj zdq(9D7f}8H<<U2L_ntj__RiaP{}`3QIYHUjNKqax`kqn56r|S3*vOFK?wZ?o_no_U z_ul)D${{Y!CeEM$<$t^8_MLO*?%uuoo<TX8aP-|d3yP(a)sA3(X$ILO%8NJ;+hp0j(w zITsRrK~BcTMuq|i(GS9qWC4!8(`O(i-2Wit;sVLfMgo6NLri%4{=cvpII5kD6b1Os zt_4NZn|JR&FqvXRA1L3MgqS#+I2kJ|3I4l%=FHtQpgj6t$R#)!Bx+<N04nbGodf0a z|4g6))5sZ=8$qIH?w&pO_T2|iac8Ow5>@;U%3+XVlo3>nnkpMZ3e4M}a^l{*2VhZW z6JsNA(Fhg=7nsmu6eN1<F1ToX_nuKD!~|!7IhyZ=K)wUjbbHU7J$vrXyZfLVX9}uh zjEsc%-<&yf_V!zFelZCSF%AONX^ISQ&VUNGyLaCG|EL7Y<t~Vt?#|tFkUGsc$jJzl zJO7+HyO-z!lfjfBpJy*`FC^C>=Q~hg3KJD}p;EEwWP~U--;z;mDt-h3etAX^HHt?= KU^E0M3jqM_pN$Ow literal 0 HcmV?d00001 diff --git a/dlls/winmm/tests/test_alaw.wav b/dlls/winmm/tests/test_alaw.wav new file mode 100644 index 0000000000000000000000000000000000000000..84bb68db9e722ef5eb03380f81e5c9c2a4fd9b7c GIT binary patch literal 4502 zcmWIYbaU$yWMBw)40BD(Em06+U|?WlU}SJv!vMyN3>*v$3~7nUB`gdK3|4{+3_hO0 zAyNzs44!^&{+_{ZA-oI>3_givX=a9c=6Z$(1`G(a)-i6x03l~=z%c|T?1-1#$R&zd!B z_KbORCro+&{M(h1lzb6ES$RomDJdyw2{~B-k-YT6u&+<vOr1Ds{!E10ch5dv(a)Jh`Q z6%;~JE1sEF5Om_{TU52vUq1YN$FC|Eu2xDyPDVgHBe5v%%<s3ara{e}HDlhK$<tpv z_<Pf-A}LD(a)YA#5vuy{s7P4t1Ek6uliJO}Ish}zc={vUO$OwJM$mI1q0N<vabSS&la z&i(km$FD(ZXUqb5ZswfH(_TIPdC;{!AzNHnMovNs<T;SqtfUI(+kYOsm_B*VJeb-^ z(_TILaVWAjAp=RRypWh^Zne+-PY+*Cp8!`of6~OMZ-1SODNf837m$USD=#D{nw#oz z>BF;^(<jWG2MOSrAhmCvo(?EX%M$^q1qZMsNNr9^>9udq-%UYLJLUb8FX3hB`3SWV z^0I;=`RV1O5ho)oHX3n|+&P-#q@<+5xo9-UjTV)%auVQTb+o92)kUL4B_u(}$qI}X tm7_)FXsdFxRXKaKI{@xOLHc~7{kU1P!F{vQejKDzJ=y_>BnaFcZ~)g+$5j9T literal 0 HcmV?d00001 diff --git a/dlls/winmm/tests/test_gsm_ms.wav b/dlls/winmm/tests/test_gsm_ms.wav new file mode 100644 index 0000000000000000000000000000000000000000..b7b5c172573a4b3262bb0713f31d70514de9b5f4 GIT binary patch literal 290 zcmWIYbaRtpWMBw)40BD(Em06*U|=w0U}SKRXJCkAV_<M(U|?Wka9~VJOfF$zU|>*S zW?=B~3=WZEU|{g{bMyBMb_?NUU|{e`EK4&p)HByJG%#RbNJ%V7Jj}qrFtI*XtX1j5 zjlg3usm#g`#Dwo<EloPinLjOJ`J=-})1)PT&P?<z=bF}jbb7l5|D%^$$!j%O1D<u6 zE)HNmw5(-md*FP(a)Yb@6tQmi7^bnR|<oL2gpBidnA#6%@l6NjB)AypDzXQukTU_3PS zwoBd$W-Y(F+xj-Jx=nntBk%^ZTj7%(g(a)N-UueH=Ss2rcD+#cPavOQOY(>~#e#Uzn- t>4rOMc`BSuC5gUI8;gqWSQKe+^z<s9?A2iKC{pn((qQnIq~bn_0RZF}W+4Co literal 0 HcmV?d00001 diff --git a/dlls/winmm/tests/test_mp2.wav b/dlls/winmm/tests/test_mp2.wav new file mode 100644 index 0000000000000000000000000000000000000000..f57f7ea028a27fcd34b01bceac333f7c56559377 GIT binary patch literal 5130 zcmWIYbaP`8VPFV%40BD(Em6>5U|<MfU}SJv!@$t6n}OjO3j>1~0}}(o9aaVo1_lO3 z1_1^bNJ~sEVPRlkuo7fo(a)bL@|kz!zA(a)bq)@_Y8Im;bmZ8(a)JTF7Gc(jP*E2LQU|>i| zEJ>U$%)s#f?}H<6&g?yX=KTNve(a)-wkHyHo_|NqjGqigPVe<|mSJ)cojZ(a)c)KZ0aT3 z^mDQ4=W^8d^{QW*yZq8R`QHb4>u3G{{_lVkg8*;C?f>-?1pn7B&|qk2|5fk*^XCEn z$AA7OsPNYp(a)cwu3VEMN|^?_u9kNo_5|L(a)yB5K+)j=(#U{fBt>>d*@}h&v~=Z{!#qn z`wyiQP9{pp&%bYf(a)BY2-+itVk-dQr){NsVSuRknpv<aE7V_evO#OI&m<$G>Nm<!Ku z{M0ztgHw8;h*<qZ)&D!$m;5UDJLmO5#{VM!#s9Ot<+vzv;^)7o{~rE(dggh`-TN~C z<^HSv=Mt9QF1F^|zpwvZ{Cl=@+vQ!hpH{qZsEvztPSp3YI_-CC^69hvf~_;^_6fAv zvVYqsv6bWFk2cK(`ObyThWg*H>m`a*PS#uhZ~2G%UrhWfQmY<)|B(Kd|H}czv|k6# znE#*uRsB!V`<TOWs{J3(a)f4=`Tz1YNEs7a8+Y*&L@&5=jSw^`F`8RCs6JhZ!L%OFrJ zsC<W|Y=QdG?>k<w3fwOds-O7v_nr`^M7ySg_FMn&w?7)SchRAkUG<0d(a)2TH*-~RvZ ze2(a)S8{~y_Z%*R&CC1Y3pf&F{-(a)6ylRI^F(;>Z|z=V>M!JzB6lhUuG=2?EJ&_eEYxp z>3=^R(a)I1VafBOsmWS>O^v-0mBn<CUaEiQFh>Qwu`@_*<5J!>>0>F=-of9C(S|8xGY z{vZASDndoxi}^l2-(3~3&@A)%+IFs&yd@|4)%ToRcP#GPag7fW-un&DY`J#s{=qLb z|L^~`KNfDZT>58i{HArOv+O?=N+z{Vda}>cFSFa`!2dV(a)U;lrXInOiB)BpeL|BwH_ zs((`d<o}o0(a)-FlDw?u4a#?18G>|+t=RM_!us*~8>pd%N5*B-Pef9Bfz=3VOMJtzLj zSHJyd|MaiPp5rt2AAbFRV&wV1|CddjtD!UX(a)ut%=Q_mQ>|JVN?{{NHL%+&pL>i?(z z&;M`!U;DrM|1*Y%R_(8QcW<6e_BBBTX_Lf5*|+ne*CtQh(a)Weq>H2>(Hi~rxJ_pF^~ zbnw&f|NdY8%fH~A<$vv8eg0$Z|2=Ci{$F6#^m@&-#O_&1=Z*IN-2bco(a)9(eEqGu)S z|MmZ${g3~@<bTEgJ*l$s$dhSTw>q_ae0aKRZ}Ix*q(a)N0_{k6WkI?Y?Cp2;DjQ4qdL zdWG?^`ugX8|M&m;pVrhQDgW{3|5MjWPDNgSGslZfT12x=S!e%#?*BLcpZ)(>XJwmZ z>ec_J|6l!ofI;~Gng8F<r@!CisNQd9vu$l(OmJHF^?0e9l3ufdnz&-!y95o_R!N&I zRApXQ|NP(o`se(a)u$NxE{&Q`g<|MnNQ%_|!&&y1Ej>B{M7blT|j#uNAdo&R_Kf9iA} z!_?{W|K$Jq|KtDX|IhvZY5lst6^k_j7dqeF^Z(y$ll3v1re%x8eA{=2{qHGr2i7Sn z3spI;&;PZTfq{Xk{{6rDC%YLVFaN5S-|SRymTgAv%$R8(Z|c84ZgS$Za{br(kM-Y8 zP9=7KfA;@t{ipiR_MhxO{{J(<`>6CJ|9;KK=iWY#+a9-hy2Q~<E_3g7ONV=<%x7`Z zuy8zF@%*1x<H3LR_kaGc|NEb3u~sJk_0Rv4eU=+N^E`BJQ}EI2mdkRAicTN?zxe;; z|Cf1;eQu^6|9}1e{Qr~xPy9dm|NZ(a)O8u#~miP-<YXS3|A>1*xltV<_t`TzIPkvC`0 zo&gnde+3wr7Oh&fYSn7vm~ZEEi?8RJUiUTL&$IP*9M4G!|Gm3Rb5Ez#{(p0+*xP>f z(a)A~PV|IL4_ZLqRo|KlJ3(q}F?_5b?c{rkU|9Zm~7R%{kotg|k&Ijy5${r~U%My+B# zUH{+z|MdTb0M~W(RkQwossB~~DX}avcV5nA1qGMK&egB4UoJcR-QXcF(}n$u8orzC zToQl!Z~Xhe_3OVJOr8EN{^+0mQaKlArT_jn|Nfr<{m91u&$xBAo1BX*`g-N&lA9|Z zACKD}x2gW?|DW|=*;unDFRI-C%l^;*Ke3h5A`Ld&cHv+*Ilav+Yt6$oH=CF3U&1!! zdHt{RVioo8{+)mS*Z%tN(a)0(6e&42tae%W-R^x1#@|372)aqElIb<aXlC;$JGI{E*v zy+t{f`9v1FwQ}44vj1KGYfk2?MP^t2|C|5s|DV5KlY0#gT3j|cl{xF#4YjFk+*WBe zHPf;;IqzI(a)UN5u$`~ULq|LuSONsZtA|L~W8=T9DDHa`Ei{`jXahf`Tnmq|+*ol2cH zBT2*8EMsq(hTlS`lau2A%Kw(a)F=k|-tx#_d@|KI;N|DTVZWU_di(MgjtbFvI$F8tV> z=FxF?&*422te!>u{~(b5yZ-vG`u^AdlXEuzp80#f_|L{!I*<Ov-~W|knYY`({<qdy z<Bca%r>&1U+_FA4V8P**^)c`N>;LQjmp-d%#ev5D|I7c!|BrZd^LfOhS?N9ov(k$8 z*4JsCUFtSdt-1c~p?8_}zh|ZY{r~&F{ra!}Q>VZC|N3A2?yqxG1El}!fBdIm`gqz| z`9G)r{aGflzs|W;P$B!;ih%5E^K3xnj{W}x2ip)U_4WTR|3Cl#^@qva%Os(a)IjnDFK zVF*tb3`{V~ny#UyYkE!Pa%58K)PM4y|Lwp3^Z%yP-=8-ByZ`jJ3GbRq_TNAL*ARVK zwQ1wDzxVg&6h)>sx5?~SeZ4&2UoInH^8elcH~*jcY=MJb=i~pc|6l$8==C*=N3Yv% zDLC*N-`!jmf4@$_u8Cpg(fjYLn4d*#KKWn%^Z)wyf9v1m{{D3Ezy6OunY~7Z_3!`v zUt!eX62IN(|7D+_sXtS16tta{`a1RX+^Sn&C;z|y|K<O)`+E0HcwO}W)BkV(-)y(a)7 z|M~l6kujGgmpL1s^DO*)l#`t|ZiC70&{-je>VNHD{B!^I&;RG&|94vd?)(PUf9Z?0 zP2ykvx9^?#=>MCwQ+;hVeVi8O>F}^~v+L`PPQ}M3I_3O-@&DETHymu08&aqK|MCAr z{par&PK&FwJPtX`@;ID-o-2RcCKuJN|INZoanGjzU-Qxa{NMlgfBm=ra?nSzHU8p{ z`emF;XECt-i$52&cTcs{-~HeJ|4M8(Ibsng#By_0E9c|WYTosq|9`IkoWD4KVey{* zfA;^k|B>32*!lbU|L-P;3YTs(j6OKubanRfg!`RK*p><ZzjI0d#eeya|LnK_*4baJ zlmGtD{WY%=X2t*hU;n9LuPf(N$zqn%y3=B(MaOMC-C6b4sd;^@Q?vb_`XBp$Zoed( zx&2!Fzx)5<|NQ-uI`yQ&Wh)kj%NDnGoHclRWMfn>-^Q1xB#b>7-&{)nUf=)s-~P*g zf8XD8YW9zM|NFnr8K3<7fB8=bGq=<K&&avWNS+pdQe$t)(<6J!Dn7>TTId-6ul{fS zUnYjH0q4!*|NH-!|L3EZI_>XICPtI9Cg;!Y35;OCEaldLO1a$4&vT2;+kCxk^X1&@ zt=Drc%XQ>;i72ow^#9HNfBC=qpa1Q@{`-IZcl{ZSQ#USgoz-mGAO8Bk{Qd8B|F8b6 z(a)7c5N@A?1R|L_05`2Xtv>;HdB4bg}+692#Y|Mve&+*bx^@ZU6wv$^vtGWDlwn#7q+ z`~Oew4c*+P_f*T)!fRsS!tZBK*B(a)Z`|MUO*AOHIw|Fu7}_V(a)l@nF{Ow$#4H&cmCzC z|LLFq?mx5K`0wWb|Nk%lfBFCE|F{2tTwJzxQOni;2mfFFf2LxR@`Z=R?K(5H!&bJL zS=vmRpul--TIF`j!|ZRnuBc0!ZunTVcvt<)|NVdJkN>Y<{`24dZ)SfVYo)49xwQV` z(a)BjJl{>3+N{OAA7YH)`8|I7bB|G)VE_Wz6jzeG&AM7e~(?3aR1y>f0&^O<pR^YJN% zc`jSabS}$WmhAI&R(OpT^A`=%*S~mXF);oA{(t$O{g?m#zx?CB{`dE(6Q}abIdv}n z{h#@}zy3de(a)ppaw_xDqeh5i5b|L6ZN_228i)&F$re0<WW<NuHPkN>}PeAyW0Qmy9g zH*<I8w20IC?+*y5n;grWwN$U8vFj7}r>UOzpRafj|L6bdfAe4cTmSQK{rNwK&Zz$n zp0PFE{cGL*+kfo)Km47)`TM`K%KG;I>i_=#@&D)lU-kdXzI=S@)U^Na{~!B*Jw0%= z%B5zZyH)LE^+`dQ^Ct!5E(a)EN+|NGi6NyeE<JHz`~?`~Xk?fSp{FaO7Xu4n)L(a)Bj1v z-;0j^?&6#(>HG74{g;39*Z=sp{_OAnn>K6x|7ZWN{?Glt(a)qgz3Tj&(9=;Xxx|Lp(% z|0|*CP-~X8zwY^^yZa4}rB40-*W}E3)AX5&IWOFbA8ZU`fA}Hf`J2oC<A43%{j+}g zzxw^}|DD#^bXq`a&ZMV*<JbTFcmMvM`t?u${k<9f(a)Bjb$|Mmao|BL(a)O|9`;3fQ11I z`v3L+`~R;;<Zw$ncl>^%)Tpf+Pi{PUT5nbw2>#cTl%BVDfknv;ABLj#kN@@m)Sv$w zfBSF!aZrK%e&f27t;YiE&Y%DNzy0gq{nx+!pP{U4kp6%F|M~y@|NH;9|Gz0^Q_6~f z(a)c;7v%l~_eIx^T*Z+W(a)u>WYA6694`b`$Rrdmy$}q^=^OLOvCDu+uN7+O><=XKmXtV z_y6tR|F?hs=l?Qpo&A+lqAp0=FMs*>|K{)i{9pgwzf4$jmizzf|M&l2|9|oS>Hqit zzh|@hy8i$9|Cj&Yq&)Yxiu>8ym!94<s;^6v_;h;N%*{T_X6{|yktmjP{JflX*AFdD zulno%=Klq?d-Naw-G6`ocemh~Z5}uOZ~s!a|MB1Y{MY~F*SwrML-GIP|M&l2{D1NP z_5aWNb!M8ao%{d#|Fi!u9gP&cem>VK?d{XmWtKXd-rt{~AXYi8a&qKh1J|w%4=+AC zy8oxOi2c|9>;M1f|H0t@?VtUd%?9i5GM>Nw(a)BjIq_VeHVk6-=i-~4Bx2LG=9|MCCR z|L6Z7{(tfRE0>grdB5KOkN=<jf0?vW(a)MY4rxn@4o=32{4*4h64u+L+kXO#<fXK&Fu z>!y8vKXYnbb>00>|JVQh|NQ^|<v$qmKWnE>e^(N1bE^Nt-}~FY)$M=zYrp%KLo<qY z{Qp`1{r~6xU+TZq|2{sem1CjF|8Mo*{(qKJmQ%5ad3fgGsjDleMSp*DSS)kOWuwBS z%MC6GfJ-(a)OhxIQ917m}LXx6;!l)Yc`eP7&;EW0-6_3fx_*Y0lF9c_Btd&_?5_2*+M zPWu_{-DO?y<>7CB$yI54nOoNfI-02+{=2{aHK(a)H(KlxX^{rm?E_49xJ`+xnze;>8r znLV3sJXt0YzRt2ReBGv$($||(Jo*z4WnYWg5pU})Ix}_7q(iH&|L^~Q{=d2u?-q5b zb=o(a)4qB_$R4wf3p2`|zTGE1>gJ94Aw{ICD}-~akQ|9hSP*}rx5=O6#wzx~7i`LF*^ ztp7M|M$(LAgCkQF%`#k?o!TFt{QpnG*K6WzLnT`!+nR5GfBpSc<Yf=a7=JS7WX?4? z7xd|2`1(k%DL+5$-1LOI{%6(wf9r!2I{bhC`B(q^|Nh5+_Vd5}@$dfh|9|6;|E-_@ zE$r0I(a)c-XUj{pDk^-(a)Ut|34X5t6r<QuMd+^b}Mr!NmybLrMLU2^d!If-~WHtf8pSq z7F4+QM4pqY<+Zh&QWNg-N*4w6|CcuA_3g;5zyJT$|M$QCr+(a)tOzy0;kfB&EVu8)8C zfB!R{1OH#P*-Tp5#&(v)gYmF>zrI|FMxs;XW^p}9!RvYg4>NW>i_G&h{QvR)+y94i zc|OPgzpt|Ph|;0(a)YU3pBZM$vTGJQ6l)%wbNMJk4+ShLw+XTtvbU;i7qMOK?c9^87J zqfNT*Gs~&^|Dg6(;-S*lf(lbKj`eOz30l%G+a>JA<t=KGz9;a|s;ASJ|DXQ9|9{#{ zhX!>i>x>g?AMU7oq2XLoe_dH}X=>}dnzX$dlB+e(+_*V)8RNh8um7Za?`-z{f0@(a z|K*fZ%Osml>lvL)pSeC_Z|U`Q6`vM5Ep&K#^!hpxm6g8hBPYryPuh5_d)@zk`~S=T zF}rATCUfq_k{5T4JQO$?HyoHe-JN&KY00H0<A48m2oSk6!<gG(;?Mf{*S1r=Z-%fv z^S;&+zFG7CGoHh;eeVCiSOji%t$H4}mrMNrmz&FSj-GDm_+k+(a)Rr>quNnTST|NpH2 zU;p8@<FfMq-;Z{0&Y2m;ExdHnq_4{trB0lhHu-<}f`{q#_kShquUGDW^Jo5=2a5B3 zbXJ{n&aKi2=KgN9f4^p%nWex(zZe$}EfJlWIx}S~!u3R7PdXY=Fr#3(a)s^#yOzhC+P z?f=*RFZ*1p>^!#OhP6<=D^ulvv)@min6m$OVEljn6_b7V!Ebd7r-><?QnnN4`F|k) zPki-<zf0}5UuRRCVmHrbo=v}OUQ9(nMM2G_o=t5LQ#8`f1TAsn^5}PN-4nRKZl}up z|HuC?|6ldB{(qNncBskLA5R!11Ou}l{@S{L>HqP6cIj=u9(XYRZrS18vb~TePWssU zgN1eKJHNL*od1WXEx<@b_5a`he-F1_UwgRq|398h5fA_W3s_k6aH*?Vrjp%Kaq+mn zzyANL|9AiI`pBY(UK91Jw_N|2KPRzO)SLH)c>U%taS2~<J3nlc|8a|1Y2uwbE!M^U zd-TN*e%sIf(E4?}!7m<<9Sbc2rt^vOiOHy&Wf+|}t$9*SMx9R_R8uD`cB}sW`lwuF z_5Z*1-~WH-6R`;C__j(a)uJ1RRaMq)yUY2TN#OFK9P4{EV=?K1gc!kw)Yzh_z_SG-l- zF2CaQKh_r<a9rxMt~<#f;nvsv^@>i;%kIg(a)o9vl1b)EP1h=SIx2(a)b4X(|X?4+3z>a Z{r>;`|G)olZe~0zV-fn)+KYjK0RZ!Rsty1E literal 0 HcmV?d00001 diff --git a/dlls/winmm/tests/test_mp3.wav b/dlls/winmm/tests/test_mp3.wav new file mode 100644 index 0000000000000000000000000000000000000000..142edd91559486fee8d93d2724ca27307d7b4c32 GIT binary patch literal 1148 zcmWIYbaN|VVPFV%40BD(Em4qTU|<MkU}SJv!@zJuhk>Dig(a)J*GfsuiU0mNoxC}d4b zOa^IS=oV#Q(a)bL@|kz!zA(a)bq)@_Y8Im;bmZ8(a)JTF7Gc(jP*E2LQU|>i|EJ+k$VPN?G zJKzWd16NA0k?HgX#*C?Hhb;vd<h!TEY<fCfXJ>}pt~*<q^^~(Xb*{I(-12_Q%buGy zGLa?;y3H4yxEn7lNU8f9w?2IH{{E_<ekCS$g&%f*9CuHD$x|TxrAewG{Y#S!TfIl} z^zS82j%|WG`SqK{Ch|lCUTnA^mta)+aS5Bgf<)au4-UKR3r8MI5IpcOoPkMxL+bj& z%6uN1T(kc<w_BukPSXBAL0C!0wa0t^zgQ!E(a)rf?Sf0&4}y14JZ#?{f!Hno94rZjB- z{v8b(Tt007e+M05Yv2me6}5fCz?jaN7&`wY7o*6*0KqeS4L%1JNS`rmeR5(#&zWwk zEsq-Ic)||x9P;2h!`J9(a)U;-0E7wgPmx9fcu-S*AW{99H3>i_#+wtxR}U%ox%<;yY# z2K$JVcIOkqEXjt&rHAi7W=vo&W_ly6%<Wk(a)xxB&RG3yQP&)+4k3rq2A3YfBN!*|p5 z|L^VJ|7-hFo8SvCVi!%E9eht~ewNOcJm=2ekJIYwi(?;c-1gt!m+Sw%uBM&~8#0|) zdd(a)7e$m3y85IrLhV9H~cqU;Cq5FZ1NK`;kzokpX6>!QN-FCF?G%;QlwAa{nlfTNjV zDI-G}(;s2SUlX+6{F=)emb2%t^UeDfp8K8Uj(5+FuTs&yY-Y(k`?5&rDOa=J8<~2! z8>`;Ddu-Ryz`)?~w&eTwr9xpPTncP44+I}{FZti2m|(=4?!b7oNkuqKP=Lpm<@F)% z9hTcNmS%pAIlt=HrS%Kf?Y=Q-mDAk|OSbQynKym^+v|Tt4=^w&FjlX>7{YMG;RwUQ zf=dS&BRUuH%bvN}`XJ}vz6=4$W&viy!&7E{0C`B1iCaLISNDGwV*u--WqT(uZ0zrx zA>mmdZj+dM_K5mLkK0dI%~%|g9XI!G_WF0b^4>4MUvk`GQ%L(2-_UwzyAKl9S-a0a zF5_b?W(d$XaAq>#;F=-E(Ad0Tj>KiIi(OyO$UT#eY*E-KQO5kSg~5uKso~*q!J}KU zxNiN*xO(im@%oC-|6gAJe!ceA>fO8l1g+b0V_z$;1()o8^)nSZVx24u{GU!q2naWw zt2yAuc%<!cJkKt*sBnI%>Le4b2$9SQ4E6>)j4B#72Ana7Favo=ra^GY$MBsy83gXN zJv={S0)vH4qekCC*0~oFHZ(a)2Tsm04Y>J(MlFV2x*XxX}exj^9IIhn^o(a)1HoN9k=Q1 zImn_G<f*lPa*ND-b9Dhn74M~&l|G97-?!y1i=>E;i(}w^J$V*}at5YJF&8zwgnH(s zO!9SRad?@=tbRm5sfLw7!F!s^b+*Q}b3~u^Yk#$k|KoaUZX9pq|Ns9wwfZ%E9DQAl KLD(a)c(H~;_#bK-9R literal 0 HcmV?d00001 diff --git a/dlls/winmm/tests/test_mulaw.wav b/dlls/winmm/tests/test_mulaw.wav new file mode 100644 index 0000000000000000000000000000000000000000..62a348180d0a6c33ce77d56c4fe8fe4545cf2076 GIT binary patch literal 4502 zcmWIYbaU$yWMBw)40BD(Em06+U|?WpU}SJv!vMyN3>*v$3~7nUB`gdK3|4{+3_hO0 zAyNzs44!^&{+_{ZA-oI>3_givX=a9c=6Z$(1`G(a)-i6x03mH%&^KD>9=wk;bstY5!= z!^X|qcJ4iN`o`}lA7@)DGZRAteSLicLt`^bTPN(a)E^4n*Q?Ax_{%O)hXr>=d8(a)pZAY zGB+`TtF>|T3N5&M_9&{_JqJ%-eHZ8FimcYu(#F9vB<KFQqx*Iv%-y<U&w&${UnTgt z*;^ybHMOvD(a)CeFyc>dV_-8;6z+^}`Wp8Y2-K2HvCx3{)11-n7tz{u3X+TJ}N_34G< zV6_|9gFLrs>yF*~k6(D49_Rs5YYg!mSgo6X;>$}X4(!>nbu%O&Hf`Cyd;hWX53+(i z9BeF1VQNjxt?gX>;@@03d0@{@B(=Nt9X)q1FVxe~#?lO-*2>P+H}=D|QwR6#+=eiB z*S;fX(a)05gjIoYDBb@7S*asBk6y>PV~w`|+B_wbop)e+uEY7I(a)ytZbdVBS#|+6v?9z z2hN?NIZj{Sz{tdWG{=F9>(QbTQWuRDm7{gsXyatGaRP4Hj<zZx&Gyk&<!E<cv>!Lx UkAt)nM?2u45e{(Ify53t0Fc#-K>z>% literal 0 HcmV?d00001 diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 51d6c80aeda..86bddc8673e 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1891,6 +1891,34 @@ static void test_PlaySound(void) winetest_pop_context(); } + + /* Test a few more exotic formats. */ + br = PlaySoundA("test_alaw.wav", GetModuleHandleA(NULL), SND_RESOURCE | SND_NODEFAULT); + ok(br, "PlaySound failed, got %d\n", br); + + br = PlaySoundA("test_mulaw.wav", GetModuleHandleA(NULL), SND_RESOURCE | SND_NODEFAULT); + ok(br, "PlaySound failed, got %d\n", br); + + br = PlaySoundA("test_adpcm_ms.wav", GetModuleHandleA(NULL), SND_RESOURCE | SND_NODEFAULT); + todo_wine + ok(br, "PlaySound failed, got %d\n", br); + + br = PlaySoundA("test_adpcm_ima_wav.wav", GetModuleHandleA(NULL), SND_RESOURCE | SND_NODEFAULT); + todo_wine + ok(br, "PlaySound failed, got %d\n", br); + + br = PlaySoundA("test_gsm_ms.wav", GetModuleHandleA(NULL), SND_RESOURCE | SND_NODEFAULT); + todo_wine + ok(br, "PlaySound failed, got %d\n", br); + + br = PlaySoundA("test_mp2.wav", GetModuleHandleA(NULL), SND_RESOURCE | SND_NODEFAULT); + /* I'm not sure of what is the problem, maybe some Windows versions just don't support MP2 any more. */ + todo_wine + ok(br || broken(!br), "PlaySound failed, got %d\n", br); + + br = PlaySoundA("test_mp3.wav", GetModuleHandleA(NULL), SND_RESOURCE | SND_NODEFAULT); + todo_wine + ok(br, "PlaySound failed, got %d\n", br); } START_TEST(wave) -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9454
From: Giovanni Mascellani <gmascellani(a)codeweavers.com> This reverts commit 21fb3555ed1f26e46d4c82cb2ec8fc29f730a0e9, which inadvertently removed support for converting audio formats not directly supported by mmdevapi. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=58949 --- dlls/winmm/tests/wave.c | 5 - dlls/winmm/waveform.c | 205 +++++++++++++++++++++++++++++++++++++++- 2 files changed, 200 insertions(+), 10 deletions(-) diff --git a/dlls/winmm/tests/wave.c b/dlls/winmm/tests/wave.c index 86bddc8673e..b2f3dd31c16 100644 --- a/dlls/winmm/tests/wave.c +++ b/dlls/winmm/tests/wave.c @@ -1900,24 +1900,19 @@ static void test_PlaySound(void) ok(br, "PlaySound failed, got %d\n", br); br = PlaySoundA("test_adpcm_ms.wav", GetModuleHandleA(NULL), SND_RESOURCE | SND_NODEFAULT); - todo_wine ok(br, "PlaySound failed, got %d\n", br); br = PlaySoundA("test_adpcm_ima_wav.wav", GetModuleHandleA(NULL), SND_RESOURCE | SND_NODEFAULT); - todo_wine ok(br, "PlaySound failed, got %d\n", br); br = PlaySoundA("test_gsm_ms.wav", GetModuleHandleA(NULL), SND_RESOURCE | SND_NODEFAULT); - todo_wine ok(br, "PlaySound failed, got %d\n", br); br = PlaySoundA("test_mp2.wav", GetModuleHandleA(NULL), SND_RESOURCE | SND_NODEFAULT); /* I'm not sure of what is the problem, maybe some Windows versions just don't support MP2 any more. */ - todo_wine ok(br || broken(!br), "PlaySound failed, got %d\n", br); br = PlaySoundA("test_mp3.wav", GetModuleHandleA(NULL), SND_RESOURCE | SND_NODEFAULT); - todo_wine ok(br, "PlaySound failed, got %d\n", br); } diff --git a/dlls/winmm/waveform.c b/dlls/winmm/waveform.c index b0634c75011..fa1c446ff91 100644 --- a/dlls/winmm/waveform.c +++ b/dlls/winmm/waveform.c @@ -878,6 +878,187 @@ static inline BOOL WINMM_IsMapper(UINT device) return (device == WAVE_MAPPER || device == (UINT16)WAVE_MAPPER); } +static MMRESULT WINMM_TryDeviceMapping(WINMM_Device *device, WAVEFORMATEX *fmt, + WORD channels, DWORD freq, DWORD bits_per_samp, BOOL is_query, BOOL is_out) +{ + WAVEFORMATEX target, *closer_fmt = NULL; + HRESULT hr; + MMRESULT mr; + + TRACE("format: %u, channels: %u, sample rate: %lu, bit depth: %lu\n", + WAVE_FORMAT_PCM, channels, freq, bits_per_samp); + + target.wFormatTag = WAVE_FORMAT_PCM; + target.nChannels = channels; + target.nSamplesPerSec = freq; + target.wBitsPerSample = bits_per_samp; + target.nBlockAlign = (target.nChannels * target.wBitsPerSample) / 8; + target.nAvgBytesPerSec = target.nSamplesPerSec * target.nBlockAlign; + target.cbSize = 0; + + hr = IAudioClient_IsFormatSupported(device->client, + AUDCLNT_SHAREMODE_SHARED, &target, &closer_fmt); + CoTaskMemFree(closer_fmt); + if(hr != S_OK) + return WAVERR_BADFORMAT; + + /* device supports our target format, so see if MSACM can + * do the conversion */ + if(is_out) + mr = acmStreamOpen(&device->acm_handle, NULL, fmt, &target, NULL, + 0, 0, 0); + else + mr = acmStreamOpen(&device->acm_handle, NULL, &target, fmt, NULL, + 0, 0, 0); + if(mr != MMSYSERR_NOERROR) + return mr; + + /* yes it can. initialize the audioclient and return success */ + if(is_query){ + acmStreamClose(device->acm_handle, 0); + device->acm_handle = NULL; + return MMSYSERR_NOERROR; + } + + hr = IAudioClient_Initialize(device->client, AUDCLNT_SHAREMODE_SHARED, + AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, + AC_BUFLEN, 0, &target, &device->parent->session); + if(hr != S_OK){ + WARN("Initialize failed: %08lx\n", hr); + acmStreamClose(device->acm_handle, 0); + device->acm_handle = NULL; + return MMSYSERR_ERROR; + } + + device->bytes_per_frame = target.nBlockAlign; + device->samples_per_sec = target.nSamplesPerSec; + + TRACE("Success!\n"); + + return MMSYSERR_NOERROR; +} + +static MMRESULT WINMM_MapDevice(WINMM_Device *device, BOOL is_query, BOOL is_out) +{ + MMRESULT mr; + WAVEFORMATEXTENSIBLE *fmtex = (WAVEFORMATEXTENSIBLE*)device->orig_fmt; + + TRACE("(%p, %u)\n", device, is_out); + + /* set up the ACM stream */ + if(device->orig_fmt->wFormatTag != WAVE_FORMAT_PCM && + !(device->orig_fmt->wFormatTag == WAVE_FORMAT_EXTENSIBLE && + IsEqualGUID(&fmtex->SubFormat, &KSDATAFORMAT_SUBTYPE_PCM))){ + /* convert to PCM format if it's not already */ + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, + device->orig_fmt->nChannels, device->orig_fmt->nSamplesPerSec, + 16, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, + device->orig_fmt->nChannels, device->orig_fmt->nSamplesPerSec, + 8, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + }else{ + WORD channels; + + /* first try just changing bit depth and channels */ + channels = device->orig_fmt->nChannels; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, + device->orig_fmt->nSamplesPerSec, 16, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, + device->orig_fmt->nSamplesPerSec, 8, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + + channels = (channels == 2) ? 1 : 2; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, + device->orig_fmt->nSamplesPerSec, 16, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, + device->orig_fmt->nSamplesPerSec, 8, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + + /* that didn't work, so now try different sample rates */ + channels = device->orig_fmt->nChannels; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 16, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 16, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 16, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 16, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 16, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + + channels = (channels == 2) ? 1 : 2; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 16, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 16, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 16, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 16, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 16, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + + channels = device->orig_fmt->nChannels; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 8, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 8, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 8, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 8, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 8, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + + channels = (channels == 2) ? 1 : 2; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 96000, 8, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 48000, 8, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 44100, 8, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 22050, 8, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + mr = WINMM_TryDeviceMapping(device, device->orig_fmt, channels, 11025, 8, is_query, is_out); + if(mr == MMSYSERR_NOERROR) + return mr; + } + + WARN("Unable to find compatible device!\n"); + return WAVERR_BADFORMAT; +} + static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, BOOL is_out) { @@ -938,17 +1119,31 @@ static LRESULT WINMM_OpenDevice(WINMM_Device *device, WINMM_OpenInfo *info, } if(info->flags & WAVE_FORMAT_QUERY){ - ret = MMSYSERR_NOERROR; + WAVEFORMATEX *closer_fmt = NULL; + + hr = IAudioClient_IsFormatSupported(device->client, + AUDCLNT_SHAREMODE_SHARED, device->orig_fmt, &closer_fmt); + CoTaskMemFree(closer_fmt); + if((hr == S_FALSE || hr == AUDCLNT_E_UNSUPPORTED_FORMAT) && !(info->flags & WAVE_FORMAT_DIRECT)) + ret = WINMM_MapDevice(device, TRUE, is_out); + else + ret = hr == S_FALSE ? WAVERR_BADFORMAT : hr2mmr(hr); goto error; } hr = IAudioClient_Initialize(device->client, AUDCLNT_SHAREMODE_SHARED, - AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST | AUDCLNT_STREAMFLAGS_AUTOCONVERTPCM, + AUDCLNT_STREAMFLAGS_EVENTCALLBACK | AUDCLNT_STREAMFLAGS_NOPERSIST, AC_BUFLEN, 0, device->orig_fmt, &device->parent->session); if(FAILED(hr)){ - WARN("Initialize failed: %08lx\n", hr); - ret = hr2mmr(hr); - goto error; + if(hr == AUDCLNT_E_UNSUPPORTED_FORMAT && !(info->flags & WAVE_FORMAT_DIRECT)){ + ret = WINMM_MapDevice(device, FALSE, is_out); + if(ret != MMSYSERR_NOERROR || info->flags & WAVE_FORMAT_QUERY) + goto error; + }else{ + WARN("Initialize failed: %08lx\n", hr); + ret = hr2mmr(hr); + goto error; + } }else{ device->bytes_per_frame = device->orig_fmt->nBlockAlign; device->samples_per_sec = device->orig_fmt->nSamplesPerSec; -- GitLab https://gitlab.winehq.org/wine/wine/-/merge_requests/9454
This merge request was approved by Huw Davies. -- https://gitlab.winehq.org/wine/wine/-/merge_requests/9454
participants (3)
-
Giovanni Mascellani -
Giovanni Mascellani (＠giomasce)
-
Huw Davies (＠huw)