summaryrefslogtreecommitdiffstats
path: root/src/plugins/wmf/player/mfplayersession.h
diff options
context:
space:
mode:
authorYoann Lopes <yoann.lopes@theqtcompany.com>2015-11-07 18:07:34 +0100
committerYoann Lopes <yoann.lopes@theqtcompany.com>2015-12-04 11:41:52 +0000
commit2b7c617e090f495bbf62c1257c822f5849c21742 (patch)
treed0cc7fe70bdc9c86cfca16cd1d3b811c1cc3fe73 /src/plugins/wmf/player/mfplayersession.h
parent8ed8f33c18764735cc065203d8d21ad7a2862e82 (diff)
WMF: correctly handle media with multiple streams.
Only use the default streams and make sure only one stream of each kind (audio/video) is added to the topology. Change-Id: Ied37174fa722068b4cd1b5f91b60e0cef5c1d7b3 Reviewed-by: Christian Stromme <christian.stromme@theqtcompany.com>
Diffstat (limited to 'src/plugins/wmf/player/mfplayersession.h')
-rw-r--r--src/plugins/wmf/player/mfplayersession.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/wmf/player/mfplayersession.h b/src/plugins/wmf/player/mfplayersession.h
index 1d136ba55..5bbf8e212 100644
--- a/src/plugins/wmf/player/mfplayersession.h
+++ b/src/plugins/wmf/player/mfplayersession.h
@@ -215,9 +215,10 @@ private:
void createSession();
void setupPlaybackTopology(IMFMediaSource *source, IMFPresentationDescriptor *sourcePD);
+ MediaType getStreamType(IMFStreamDescriptor *stream) const;
IMFTopologyNode* addSourceNode(IMFTopology* topology, IMFMediaSource* source,
IMFPresentationDescriptor* presentationDesc, IMFStreamDescriptor *streamDesc);
- IMFTopologyNode* addOutputNode(IMFStreamDescriptor *streamDesc, MediaType& mediaType, IMFTopology* topology, DWORD sinkID);
+ IMFTopologyNode* addOutputNode(MediaType mediaType, IMFTopology* topology, DWORD sinkID);
bool addAudioSampleGrabberNode(IMFTopology* topology);
bool setupAudioSampleGrabber(IMFTopology *topology, IMFTopologyNode *sourceNode, IMFTopologyNode *outputNode);