Nikolay Sivov : mfplay: Implement HasVideo()/HasAudio().

Alexandre Julliard julliard at winehq.org
Wed Apr 21 15:57:54 CDT 2021


Module: wine
Branch: master
Commit: 7ce6ff3cb492efbac7e9c4243a07f1f64fef0e42
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=7ce6ff3cb492efbac7e9c4243a07f1f64fef0e42

Author: Nikolay Sivov <nsivov at codeweavers.com>
Date:   Wed Apr 21 12:29:44 2021 +0300

mfplay: Implement HasVideo()/HasAudio().

Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 dlls/mfplay/player.c | 66 ++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 48 insertions(+), 18 deletions(-)

diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c
index 6a6f3b6cddc..831e9fa9781 100644
--- a/dlls/mfplay/player.c
+++ b/dlls/mfplay/player.c
@@ -435,18 +435,62 @@ static HRESULT WINAPI media_item_SetStartStopPosition(IMFPMediaItem *iface, cons
     return E_NOTIMPL;
 }
 
+static HRESULT media_item_get_stream_type(IMFStreamDescriptor *sd, GUID *major)
+{
+    IMFMediaTypeHandler *handler;
+    HRESULT hr;
+
+    if (SUCCEEDED(hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler)))
+    {
+        hr = IMFMediaTypeHandler_GetMajorType(handler, major);
+        IMFMediaTypeHandler_Release(handler);
+    }
+
+    return hr;
+}
+
+static HRESULT media_item_has_stream(struct media_item *item, const GUID *major, BOOL *has_stream, BOOL *is_selected)
+{
+    IMFStreamDescriptor *sd;
+    unsigned int idx = 0;
+    BOOL selected;
+    GUID guid;
+
+    *has_stream = *is_selected = FALSE;
+
+    while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, idx++, &selected, &sd)))
+    {
+        if (SUCCEEDED(media_item_get_stream_type(sd, &guid)) && IsEqualGUID(&guid, major))
+        {
+            *has_stream = TRUE;
+            *is_selected = selected;
+        }
+
+        IMFStreamDescriptor_Release(sd);
+
+        if (*has_stream && *is_selected)
+            break;
+    }
+
+    return S_OK;
+}
+
 static HRESULT WINAPI media_item_HasVideo(IMFPMediaItem *iface, BOOL *has_video, BOOL *selected)
 {
-    FIXME("%p, %p, %p.\n", iface, has_video, selected);
+    struct media_item *item = impl_from_IMFPMediaItem(iface);
 
-    return E_NOTIMPL;
+    TRACE("%p, %p, %p.\n", iface, has_video, selected);
+
+    return media_item_has_stream(item, &MFMediaType_Video, has_video, selected);
 }
 
 static HRESULT WINAPI media_item_HasAudio(IMFPMediaItem *iface, BOOL *has_audio, BOOL *selected)
 {
-    FIXME("%p, %p, %p.\n", iface, has_audio, selected);
+    struct media_item *item = impl_from_IMFPMediaItem(iface);
 
-    return E_NOTIMPL;
+    TRACE("%p, %p, %p.\n", iface, has_audio, selected);
+
+    return media_item_has_stream(item, &MFMediaType_Audio, has_audio, selected);
 }
 
 static HRESULT WINAPI media_item_IsProtected(IMFPMediaItem *iface, BOOL *protected)
@@ -1001,20 +1045,6 @@ static HRESULT WINAPI media_player_CreateMediaItemFromObject(IMFPMediaPlayer *if
     return hr;
 }
 
-static HRESULT media_item_get_stream_type(IMFStreamDescriptor *sd, GUID *major)
-{
-    IMFMediaTypeHandler *handler;
-    HRESULT hr;
-
-    if (SUCCEEDED(hr = IMFStreamDescriptor_GetMediaTypeHandler(sd, &handler)))
-    {
-        hr = IMFMediaTypeHandler_GetMajorType(handler, major);
-        IMFMediaTypeHandler_Release(handler);
-    }
-
-    return hr;
-}
-
 static HRESULT media_item_create_source_node(struct media_item *item, IMFStreamDescriptor *sd,
         IMFTopologyNode **node)
 {




More information about the wine-cvs mailing list