[PATCH v15 1/3] wmp: Add seeking and duration
Anton Romanov
theli.ua at gmail.com
Wed Apr 18 01:00:39 CDT 2018
Signed-off-by: Anton Romanov <theli.ua at gmail.com>
---
Changed test.mp3 to be 10s cbr stereo. Looks like when gstreamer reports
duration as half is because it gets confused by 1 channel mp3
dlls/wmp/player.c | 65 +++++++++++++++++++++++++++++++++-------
dlls/wmp/tests/media.c | 38 +++++++++++++++++++++++
dlls/wmp/tests/rsrc.rc | 2 +-
dlls/wmp/tests/test.mp3 | Bin 240333 -> 40377 bytes
dlls/wmp/wmp_private.h | 3 ++
5 files changed, 97 insertions(+), 11 deletions(-)
diff --git a/dlls/wmp/player.c b/dlls/wmp/player.c
index f4ce62a447..8448916a80 100644
--- a/dlls/wmp/player.c
+++ b/dlls/wmp/player.c
@@ -1396,8 +1396,21 @@ static HRESULT WINAPI WMPControls_Invoke(IWMPControls *iface, DISPID dispIdMembe
static HRESULT WINAPI WMPControls_get_isAvailable(IWMPControls *iface, BSTR bstrItem, VARIANT_BOOL *pIsAvailable)
{
WindowsMediaPlayer *This = impl_from_IWMPControls(iface);
- FIXME("(%p)->(%s)\n", This, debugstr_w(bstrItem));
- return E_NOTIMPL;
+ static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0};
+ TRACE("(%p)->(%s %p)\n", This, debugstr_w(bstrItem), pIsAvailable);
+ if (!This->filter_graph) {
+ *pIsAvailable = VARIANT_FALSE;
+ } else if (strcmpW(currentPosition, bstrItem) == 0) {
+ DWORD capabilities;
+ IMediaSeeking_GetCapabilities(This->media_seeking, &capabilities);
+ *pIsAvailable = (capabilities & AM_SEEKING_CanSeekAbsolute) ?
+ VARIANT_TRUE : VARIANT_FALSE;
+ } else {
+ FIXME("%s not implemented\n", debugstr_w(bstrItem));
+ return E_NOTIMPL;
+ }
+
+ return S_OK;
}
static HRESULT WINAPI WMPControls_play(IWMPControls *iface)
@@ -1428,11 +1441,16 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface)
if (SUCCEEDED(hres))
hres = IGraphBuilder_RenderFile(This->filter_graph, media->url, NULL);
+ if (SUCCEEDED(hres))
+ update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen);
if (SUCCEEDED(hres))
hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaControl,
(void**)&This->media_control);
if (SUCCEEDED(hres))
- update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposMediaOpen);
+ hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaSeeking,
+ (void**)&This->media_seeking);
+ if (SUCCEEDED(hres))
+ hres = IMediaSeeking_SetTimeFormat(This->media_seeking, &TIME_FORMAT_MEDIA_TIME);
if (SUCCEEDED(hres))
hres = IGraphBuilder_QueryInterface(This->filter_graph, &IID_IMediaEvent,
(void**)&This->media_event);
@@ -1459,7 +1477,10 @@ static HRESULT WINAPI WMPControls_play(IWMPControls *iface)
}
if (SUCCEEDED(hres)) {
+ LONGLONG duration;
update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsPlaying);
+ if (SUCCEEDED(IMediaSeeking_GetDuration(This->media_seeking, &duration)))
+ media->duration = (DOUBLE)duration / 10000000.0f;
} else {
update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsUndefined);
}
@@ -1482,11 +1503,14 @@ static HRESULT WINAPI WMPControls_stop(IWMPControls *iface)
if (This->media_event) {
IMediaEvent_Release(This->media_event);
}
-
+ if (This->media_seeking) {
+ IMediaSeeking_Release(This->media_seeking);
+ }
IGraphBuilder_Release(This->filter_graph);
This->filter_graph = NULL;
This->media_control = NULL;
This->media_event = NULL;
+ This->media_seeking = NULL;
update_state(This, DISPID_WMPCOREEVENT_OPENSTATECHANGE, wmposPlaylistOpenNoMedia);
update_state(This, DISPID_WMPCOREEVENT_PLAYSTATECHANGE, wmppsStopped);
@@ -1517,15 +1541,33 @@ static HRESULT WINAPI WMPControls_fastReverse(IWMPControls *iface)
static HRESULT WINAPI WMPControls_get_currentPosition(IWMPControls *iface, DOUBLE *pdCurrentPosition)
{
WindowsMediaPlayer *This = impl_from_IWMPControls(iface);
- FIXME("(%p)->(%p)\n", This, pdCurrentPosition);
- return E_NOTIMPL;
+ HRESULT hres;
+ LONGLONG currentPosition;
+
+ TRACE("(%p)->(%p)\n", This, pdCurrentPosition);
+ if (!This->media_seeking)
+ return S_FALSE;
+
+ hres = IMediaSeeking_GetCurrentPosition(This->media_seeking, ¤tPosition);
+ *pdCurrentPosition = (DOUBLE) currentPosition / 10000000.0f;
+ TRACE("hres: %d, pos: %f\n", hres, *pdCurrentPosition);
+ return hres;
}
static HRESULT WINAPI WMPControls_put_currentPosition(IWMPControls *iface, DOUBLE dCurrentPosition)
{
+ LONGLONG Current;
+ HRESULT hres;
WindowsMediaPlayer *This = impl_from_IWMPControls(iface);
- FIXME("(%p)->(%f)\n", This, dCurrentPosition);
- return E_NOTIMPL;
+ TRACE("(%p)->(%f)\n", This, dCurrentPosition);
+ if (!This->media_seeking)
+ return S_FALSE;
+
+ Current = 10000000 * dCurrentPosition;
+ hres = IMediaSeeking_SetPositions(This->media_seeking, &Current,
+ AM_SEEKING_AbsolutePositioning, NULL, AM_SEEKING_NoPositioning);
+
+ return hres;
}
static HRESULT WINAPI WMPControls_get_currentPositionString(IWMPControls *iface, BSTR *pbstrCurrentPosition)
@@ -1762,9 +1804,12 @@ static HRESULT WINAPI WMPMedia_getMarkerName(IWMPMedia *iface, LONG MarkerNum, B
static HRESULT WINAPI WMPMedia_get_duration(IWMPMedia *iface, DOUBLE *pDuration)
{
+ /* MSDN: If this property is used with a media item other than the one
+ * specified in Player.currentMedia, it may not contain a valid value. */
WMPMedia *This = impl_from_IWMPMedia(iface);
- FIXME("(%p)->(%p)\n", This, pDuration);
- return E_NOTIMPL;
+ TRACE("(%p)->(%p)\n", This, pDuration);
+ *pDuration = This->duration;
+ return S_OK;
}
static HRESULT WINAPI WMPMedia_get_durationString(IWMPMedia *iface, BSTR *pbstrDuration)
diff --git a/dlls/wmp/tests/media.c b/dlls/wmp/tests/media.c
index c2cd1cf941..a74cccd714 100644
--- a/dlls/wmp/tests/media.c
+++ b/dlls/wmp/tests/media.c
@@ -303,6 +303,11 @@ static BOOL test_wmp(void)
static DWORD dw = 100;
IWMPSettings *settings;
BOOL test_ran = TRUE;
+ DOUBLE duration;
+ VARIANT_BOOL vbool;
+ IWMPMedia *media;
+ static const WCHAR currentPosition[] = {'c','u','r','r','e','n','t','P','o','s','i','t','i','o','n',0};
+ BSTR bstrcurrentPosition = SysAllocString(currentPosition);
hres = CoCreateInstance(&CLSID_WindowsMediaPlayer, NULL, CLSCTX_INPROC_SERVER, &IID_IOleObject, (void**)&oleobj);
if(hres == REGDB_E_CLASSNOTREG) {
@@ -338,6 +343,10 @@ static BOOL test_wmp(void)
ok(hres == S_OK, "get_controls failed: %08x\n", hres);
ok(controls != NULL, "controls = NULL\n");
+ hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool);
+ ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres);
+ ok(vbool == VARIANT_FALSE, "unexpected value\n");
+
hres = IWMPControls_play(controls);
ok(hres == NS_S_WMPCORE_COMMAND_NOT_AVAILABLE, "IWMPControls_play is available: %08x\n", hres);
@@ -380,6 +389,34 @@ static BOOL test_wmp(void)
/* MediaOpening happens only on xp, 2003 */
CLEAR_CALLED(OPENSTATE, wmposMediaOpening);
+ hres = IWMPControls_get_isAvailable(controls, bstrcurrentPosition, &vbool);
+ ok(hres == S_OK, "IWMPControls_get_isAvailable failed: %08x\n", hres);
+ ok(vbool == VARIANT_TRUE, "unexpected value\n");
+
+ duration = 0.0;
+ hres = IWMPControls_get_currentPosition(controls, &duration);
+ ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres);
+ ok((int)duration == 0, "unexpected value %f\n", duration);
+
+ duration = 5.0;
+ hres = IWMPControls_put_currentPosition(controls, duration);
+ ok(hres == S_OK, "IWMPControls_put_currentPosition failed: %08x\n", hres);
+
+ duration = 0.0;
+ hres = IWMPControls_get_currentPosition(controls, &duration);
+ ok(hres == S_OK, "IWMPControls_get_currentPosition failed: %08x\n", hres);
+ /* builtin quartz does not handle this currently and resets to 0.0, works
+ * with native quartz */
+ todo_wine ok((int)duration >= 5.0, "unexpected value %f\n", duration);
+
+ hres = IWMPPlayer4_get_currentMedia(player4, &media);
+ ok(hres == S_OK, "IWMPPlayer4_get_currentMedia failed: %08x\n", hres);
+ hres = IWMPMedia_get_duration(media, &duration);
+ ok(hres == S_OK, "IWMPMedia_get_duration failed: %08x\n", hres);
+ ok(round(duration) == 10, "unexpected value: %f\n", duration);
+ trace("AAAA %f\n", duration);
+ IWMPMedia_Release(media);
+
SET_EXPECT(PLAYSTATE, wmppsStopped);
/* The following happens on wine only since we close media on stop */
SET_EXPECT(OPENSTATE, wmposPlaylistOpenNoMedia);
@@ -414,6 +451,7 @@ playback_skip:
IOleObject_Release(oleobj);
DeleteFileW(filename);
SysFreeString(filename);
+ SysFreeString(bstrcurrentPosition);
return test_ran;
}
diff --git a/dlls/wmp/tests/rsrc.rc b/dlls/wmp/tests/rsrc.rc
index a92079e798..715399d524 100644
--- a/dlls/wmp/tests/rsrc.rc
+++ b/dlls/wmp/tests/rsrc.rc
@@ -18,7 +18,7 @@
#include "windef.h"
-/* ffmpeg -ar 48000 -t 60 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 output.mp3 */
+/* ffmpeg -f lavfi -i anullsrc -t 10 -acodec libmp3lame -b:a 8k dlls/wmp/tests/test.mp3 */
/* @makedep: test.mp3 */
test.mp3 RCDATA "test.mp3"
/* ffmpeg -ar 48000 -t 1 -f s16le -acodec pcm_s16le -ac 2 -i /dev/zero -acodec libmp3lame -aq 4 test1s.mp3 */
diff --git a/dlls/wmp/tests/test.mp3 b/dlls/wmp/tests/test.mp3
index 149a2cd346ee52ae179c46198ce290a5dd4d6251..b599b2dd3ba7befc42717f96e7ba629c658378b9 100644
GIT binary patch
literal 40377
zcmeI30c2HC7{^cEq@=b=jKr)G(b{ZT5t+7XTA9{MBC0(vCC$i)WJ#1ti9}3dBt;UD
z$V4PY5|Jj6h-5_K(d*u~d+)jD+;iT4p8Kxe^`GpX at 7#Ikp5Og_-#hobUT=4Mop66v
z?j0EDagOyuWcm(|<TrG-Y;137Yi%u^o%vNP^oJsIv-f0v$T{P@%$!jn#;%CW-1!R@
zEnd2;arug-=GAM~u3O*M(Ya~!maeVacI at 2UzbCu@z`;XDaz~G!7#cn`a{A2KbLTHy
zynOZgjhnY_kKMUDe((OnM~|O8efIpt#LHK&-%P%J_x{7jPoKYh{r3IG&*@*k{}leZ
zSK?grpmWV_;p-KvGL7yz_d2!@Pwbm%%iqO9Lr&CB3vtZpn<vD=Cg-Z1f8$Q*G&@Fx
zsO#(6)l=e-E%O8Zs90E%YX;+#d3AXTjFWXI)P1e|gygH0X at P;<3FQ+Qr!=8U36OIq
z^dNz8N)wt)fSfy_siY<}#R(a5X%;!eJ7nON1>j0KMCB?V$D&|@=JruJ!_vnFOX&yX
zsGLG86aa9nav at e~6Of~FDlQoTa8ypB(prEVmD6|yApl3^0#bSdkgGZ6z<eANYV3)X
z6ROghF}9+B?@&XI50ZM}abrNP=5m!2`rmVvcZhe$t3;sq#P;?;<)|E$6V{JDJvQYJ
zAX&Lmu;ByXSmkWsShiWVJvW#`RZ at Xv+g5$3T!qSEaNPehONYtDvyFwvN!=Za2OL)<
z71jg<j*DP(MR0mSvhoewMh<|ZayD>Oj#bWcgE>?s6<D at y)rZPax!F}8<`8qpBjA1?
zivPjGqys3Y%pnsrw-12h<3r`(Qn$Or37KU`Du<F92NeZYQ?m!GrpB+F+h8gEz-=n0
z&<X_r9N)l0tkfnTN99ypG6LYJoJ6Iy068kB at d`o!j>-k3^adbD<#b?v48T!2A5`QB
z$WgfnF|PxFqjENId}6KArzup<rX0>yZkL(aVRG?&%7Mp8-5rVt9IGj-DOV(dUnEoN
zHz=oE)ho0 at 0RYD(R*03_1mvikic3ZS9F>!(v=$&o<uqPF2*6RffRx?<<fxnu%#Q&$
zD(8cW9055h7a`_#0B}^!1}=4b3fP3y?JjXbX1lQp@$AbbHBRbsl at sEICf~rhp{bT{
zP)@lBR&mJ)fa4-qqS9J`9F@~}1t9=O<pNTA1CXO~Ixs&5;HaDrDslwms9c1Y*8#v$
zIU6`W;PC-3;T*!b%Iz|9x?*xkZI`9)4#fkG)s)pV;c80ds2r8!4z0Rk04oJPNUFGG
z1i<k at QlipYfE<<6cm*K<N96)idION7ayl?S2H>ci4=Qp5<fvSPnAZWoQ8^p9)IH!~
z6H>Rk#0i=0#wx_KFPGFfsmoPPh`URC1Ly9NTE0O!<sw+cB_jZii(rXLYXNdpPU97X
z034MINa+ngj>_r4{1||vaz3cY5s;&D5n^5k02iNfwhQq3W4l9O98L%UvYk)e9r_0>
CCH<lR
literal 240333
zcmeI%f23Xo0LJlCcd=qF8IkluD<ZR5KSsq;mzGVmT``eqrkEu$6EP~1m`IVNlq5-1
zBqA}9NQp$^ij2req${`gz5Vg*;oRHE``_o9?faaU<K1!gx#zyyedmr1!}ROw{rmPU
zO#Yl7hPgclj~%}8=B+z-Y~8+X+v=<T{<gBb|Ex8hyN at 1zWb(@7G#8#4=H7X2n7d%(
zMVsa?-h9cWmtAqymTRxOe(UxfH|@OTwq18D+;#Wfd+yzT-+}udIC$vrLr0E2`q;7K
zk3VtZ$)}%r_PLYKzwpw_ue|#D8*jb+?tAZl at X^PgeEQkvr at r{|tFOQL?)x8p{Auau
zUrzt}+nL}0`17y7r|)F)o*$gN=j~^|-(k!7yQZ&A-^a=|Pn}*_-h617KQjyuPmXOI
zhD}!v!+DcmZ%*bUZ#Xdw8}{73cVYGKy*To<?u(0y)AL{cALk!AYYv^m`EQ-^`47za
z{Ksc}{ugI_{tst-{%>b|{-u-a-~YK8N9r8zPv at VaIdbhLho(NbKCaLB-7z`p-`9pU
zug&xY*T?no{mb{4wUFQgANarrKCJoq##)zV^*BHI$xnW+g#;h?zz06?!SmI~J>c{0
z_5SnF=l?#x9XvmHe(?M-^1WmAke at I3zz06?!Os^X_kf=-{CqKTTjY at E2hR_lA3Q%q
zgf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9 at eBc8gT7@h=@PQ9}hzMPL
z-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g_z)4g_`nA~
z at S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzTbn$@?eBeW?
zki`c+ at PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJANatBRw0WI
zeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG at 10VRnhltR{2R`tD53NELANarr
zK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I at 10Pz2EI#mo4}6FS
zU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M10VPh5xV%m
z2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr at PQ9}Xce;fzz06?AtH3~fe(D(
zL#vR*2R`tD4-uh at 4}9PQA6kVhKJbALe255LeBc8g_|Ph3 at qrI~;6p^{;sYP}z=u{L
ziw}I at 10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn at PQAlLKYwR
zzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9 at eBc8gT7@h=@PQ9}
zhzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g_z)4g
z_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzTbn$@?
zeBeW?ki`c+ at PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJANatB
zRw0WIeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG at 10VRnhltR{2R`tD53NEL
zANarrK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I at 10Pz2EI#mo
z4}6FSU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M10VPh
z5xV%m2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr at PQ9}Xce;fzz06?AtH3~
zfe(D(L#vR*2R`tD4-uh at 4}9PQA6kVhKJbALe255LeBc8g_|Ph3 at qrI~;6p^{;sYP}
zz=u{Liw}I at 10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn at PQAl
zLKYwRzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9 at eBc8gT7@h=
z at PQ9}hzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1eBc8g
z_z)4g_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIUKJXzT
zbn$@?eBeW?ki`c+ at PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE724}9Q5MCjrJ
zANatBRw0WIeBc8gB0?7*_`nA~v<g{#-~%7{5D~igzz06?p;gG at 10VRnhltR{2R`tD
z53NELANarrK175rKJbALd}tN2_`nA~@F5~}@qrI~;6tmB#Rop{fe#U(iw}I at 10Pz2
zEI#mo4}6FSU3}mJANbHJWbuIyeBeVw=;8w(_`ru&A&U=u-~%5bLKh$Szz06G3R!&M
z10VPh5xV%m2R`tjRmkE4ANatBh|t9cKJbALtwI(b_`nA~M1(Fr at PQ9}Xce;fzz06?
zAtH3~fe(D(L#vR*2R`tD4-uh at 4}9PQA6kVhKJbALe255LeBc8g_|Ph3 at qrI~;6p^{
z;sYP}z=u{Liw}I at 10Nzn7a#b*2R^h4S$yCFANUXvy7<5cKJcMc$l?PZ_`rvV(8UKn
z at PQAlLKYwRzz04=gf2etfe(CW6|(ri2R`s2B6RVA4}9Q5tB}P9KJbAL5uu9 at eBc8g
zT7 at h=@PQ9}hzMPL-~%7{&?;o{fe(D(LqzD}10VRnhgKnr4}9PQA0k2*ANarrKC}v1
zeBc8g_z)4g_`nA~@S#=6;sYP}z=w#?#Rop{fe)=h79aS)2R=lEE<W&q4}549viQIU
zKJXzTbn$@?eBeW?ki`c+ at PQ8zp^FcE-~%68g)Bbsfe(C$2wi;O10VR%DrE725C6x9
d+)1Ogvb_1wlJk#Vo9RK<XU$8q`ogTQ&p*pvqh$a9
diff --git a/dlls/wmp/wmp_private.h b/dlls/wmp/wmp_private.h
index 3792e52abd..e8d534803f 100644
--- a/dlls/wmp/wmp_private.h
+++ b/dlls/wmp/wmp_private.h
@@ -42,6 +42,8 @@ typedef struct {
LONG ref;
WCHAR *url;
+
+ DOUBLE duration;
} WMPMedia;
struct WindowsMediaPlayer {
@@ -76,6 +78,7 @@ struct WindowsMediaPlayer {
IGraphBuilder* filter_graph;
IMediaControl* media_control;
IMediaEvent* media_event;
+ IMediaSeeking* media_seeking;
/* Async event notification */
HWND msg_window;
--
2.17.0
More information about the wine-devel
mailing list