[PATCH 2/8] mfplay: Create video output branches.
Nikolay Sivov
nsivov at codeweavers.com
Wed Apr 21 04:29:43 CDT 2021
Signed-off-by: Nikolay Sivov <nsivov at codeweavers.com>
---
dlls/mfplay/player.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/dlls/mfplay/player.c b/dlls/mfplay/player.c
index 87ddf613288..6a6f3b6cddc 100644
--- a/dlls/mfplay/player.c
+++ b/dlls/mfplay/player.c
@@ -1043,29 +1043,23 @@ static HRESULT media_item_create_sink_node(IUnknown *sink, IMFTopologyNode **nod
static HRESULT media_item_create_topology(struct media_player *player, struct media_item *item, IMFTopology **out)
{
IMFTopologyNode *src_node, *sink_node;
+ BOOL selected, video_added = FALSE;
IMFStreamDescriptor *sd;
IMFTopology *topology;
unsigned int idx;
IUnknown *sink;
- BOOL selected;
HRESULT hr;
GUID major;
if (FAILED(hr = MFCreateTopology(&topology)))
return hr;
- /* Use first stream if none selected. */
- if (player->output_window)
- {
- FIXME("Video streams are not handled.\n");
- }
-
/* Set up branches for all selected streams. */
idx = 0;
while (SUCCEEDED(IMFPresentationDescriptor_GetStreamDescriptorByIndex(item->pd, idx++, &selected, &sd)))
{
- if (!selected)
+ if (!selected || FAILED(media_item_get_stream_type(sd, &major)))
{
IMFStreamDescriptor_Release(sd);
continue;
@@ -1077,11 +1071,17 @@ static HRESULT media_item_create_topology(struct media_player *player, struct me
{
/* User sink is attached as-is. */
}
- else if (SUCCEEDED(media_item_get_stream_type(sd, &major)) && IsEqualGUID(&major, &MFMediaType_Audio))
+ else if (IsEqualGUID(&major, &MFMediaType_Audio))
{
if (FAILED(hr = MFCreateAudioRendererActivate((IMFActivate **)&sink)))
WARN("Failed to create SAR activation object, hr %#x.\n", hr);
}
+ else if (IsEqualGUID(&major, &MFMediaType_Video) && player->output_window && !video_added)
+ {
+ if (FAILED(hr = MFCreateVideoRendererActivate(player->output_window, (IMFActivate **)&sink)))
+ WARN("Failed to create EVR activation object, hr %#x.\n", hr);
+ video_added = SUCCEEDED(hr);
+ }
if (sink)
{
--
2.30.2
More information about the wine-devel
mailing list