[PATCH v8 0/1] MR1522: mfmediaengine: Volume change.

[Bernhard Kölbl]

--
  v8: mfmediaengine: Pass volume changes to media session.
 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1522

[PATCH v8 1/1] mfmediaengine: Pass volume changes to media session.

[Bernhard Kölbl]

From: Bernhard Kölbl <besentv(a)gmail.com>

---
 dlls/mfmediaengine/main.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/dlls/mfmediaengine/main.c b/dlls/mfmediaengine/main.c
index b2ddc376db8..69e9ed59229 100644
--- a/dlls/mfmediaengine/main.c
+++ b/dlls/mfmediaengine/main.c
@@ -835,6 +835,24 @@ static void media_engine_get_frame_size(struct media_engine *engine, IMFTopology
     IMFMediaType_Release(media_type);
 }
 
+static HRESULT media_engine_apply_volume(struct media_engine *engine)
+{
+    IMFSimpleAudioVolume *sa_volume;
+    HRESULT hr;
+
+    if (!engine->session)
+        return E_FAIL;
+
+    if (FAILED(hr = MFGetService((IUnknown *)engine->session, &MR_POLICY_VOLUME_SERVICE, &IID_IMFSimpleAudioVolume, (void **)&sa_volume)))
+        return hr;
+
+    hr = IMFSimpleAudioVolume_SetMasterVolume(sa_volume, (float)engine->volume);
+
+    IMFSimpleAudioVolume_Release(sa_volume);
+
+    return hr;
+}
+
 static HRESULT WINAPI media_engine_callback_QueryInterface(IMFAsyncCallback *iface, REFIID riid, void **obj)
 {
     if (IsEqualIID(riid, &IID_IMFAsyncCallback) ||
@@ -918,6 +936,8 @@ static HRESULT WINAPI media_engine_session_events_Invoke(IMFAsyncCallback *iface
 
             EnterCriticalSection(&engine->cs);
 
+            media_engine_apply_volume(engine);
+
             engine->ready_state = MF_MEDIA_ENGINE_READY_HAVE_METADATA;
 
             media_engine_get_frame_size(engine, topology);
@@ -2009,6 +2029,7 @@ static HRESULT WINAPI media_engine_SetVolume(IMFMediaEngineEx *iface, double vol
     else if (volume != engine->volume)
     {
         engine->volume = volume;
+        media_engine_apply_volume(engine);
         IMFMediaEngineNotify_EventNotify(engine->callback, MF_MEDIA_ENGINE_EVENT_VOLUMECHANGE, 0, 0);
     }
     LeaveCriticalSection(&engine->cs);
-- 
GitLab

https://gitlab.winehq.org/wine/wine/-/merge_requests/1522

[Nikolay Sivov (＠nsivov)]

Thank you, this looks good to me. Please push attached change, and let's get this in.

[fixup.diff](/uploads/4e95cfc93bcaa07b02d06c1fbdeec0f0/fixup.diff)

-- 
https://gitlab.winehq.org/wine/wine/-/merge_requests/1522#note_17809