ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mfreadwrite: Support source configuration with MF_SOURCE_READER_MEDIASOURCE_CONFIG. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2019-03-20 08:35:38 +03:00 committed by Alexandre Julliard
parent 999abe0f85
commit a35ddb13b7
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
dlls/mfreadwrite/main.c
View File

@ -545,6 +545,7 @@ failed:
static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttributes *attributes, static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttributes *attributes,
REFIID riid, void **out) REFIID riid, void **out)
{ {
IPropertyStore *props = NULL;
IMFSourceResolver *resolver; IMFSourceResolver *resolver;
MF_OBJECT_TYPE obj_type; MF_OBJECT_TYPE obj_type;
IMFMediaSource *source; IMFMediaSource *source;
@ -553,9 +554,15 @@ static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttrib
if (FAILED(hr = MFCreateSourceResolver(&resolver))) if (FAILED(hr = MFCreateSourceResolver(&resolver)))
return hr; return hr;
hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, NULL, if (attributes)
IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_MEDIASOURCE_CONFIG, &IID_IPropertyStore,
(void **)&props);
hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, stream, NULL, MF_RESOLUTION_MEDIASOURCE, props,
&obj_type, (IUnknown **)&source); &obj_type, (IUnknown **)&source);
IMFSourceResolver_Release(resolver); IMFSourceResolver_Release(resolver);
if (props)
IPropertyStore_Release(props);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;
@ -566,6 +573,7 @@ static HRESULT create_source_reader_from_stream(IMFByteStream *stream, IMFAttrib
static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *attributes, REFIID riid, void **out) static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *attributes, REFIID riid, void **out)
{ {
IPropertyStore *props = NULL;
IMFSourceResolver *resolver; IMFSourceResolver *resolver;
IUnknown *object = NULL; IUnknown *object = NULL;
MF_OBJECT_TYPE obj_type; MF_OBJECT_TYPE obj_type;
@ -575,7 +583,11 @@ static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *at
if (FAILED(hr = MFCreateSourceResolver(&resolver))) if (FAILED(hr = MFCreateSourceResolver(&resolver)))
return hr; return hr;
hr = IMFSourceResolver_CreateObjectFromURL(resolver, url, MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, if (attributes)
IMFAttributes_GetUnknown(attributes, &MF_SOURCE_READER_MEDIASOURCE_CONFIG, &IID_IPropertyStore,
(void **)&props);
hr = IMFSourceResolver_CreateObjectFromURL(resolver, url, MF_RESOLUTION_MEDIASOURCE, props, &obj_type,
&object); &object);
if (SUCCEEDED(hr)) if (SUCCEEDED(hr))
{ {
@ -583,7 +595,7 @@ static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *at
{ {
case MF_OBJECT_BYTESTREAM: case MF_OBJECT_BYTESTREAM:
hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, (IMFByteStream *)object, NULL, hr = IMFSourceResolver_CreateObjectFromByteStream(resolver, (IMFByteStream *)object, NULL,
MF_RESOLUTION_MEDIASOURCE, NULL, &obj_type, (IUnknown **)&source); MF_RESOLUTION_MEDIASOURCE, props, &obj_type, (IUnknown **)&source);
break; break;
case MF_OBJECT_MEDIASOURCE: case MF_OBJECT_MEDIASOURCE:
source = (IMFMediaSource *)object; source = (IMFMediaSource *)object;
@ -597,6 +609,8 @@ static HRESULT create_source_reader_from_url(const WCHAR *url, IMFAttributes *at
} }
IMFSourceResolver_Release(resolver); IMFSourceResolver_Release(resolver);
if (props)
IPropertyStore_Release(props);
if (FAILED(hr)) if (FAILED(hr))
return hr; return hr;