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

mf/evr: Do not use IMFVideoMediaType when setting mixer types. 

Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-10-13 15:26:44 +03:00 committed by Alexandre Julliard
parent c6671ac1c7
commit 4bdaeaeb48
1 changed files with 2 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
dlls/mf/evr.c
View File

@ -362,35 +362,10 @@ static ULONG WINAPI video_stream_typehandler_Release(IMFMediaTypeHandler *iface)
return IMFStreamSink_Release(&stream->IMFStreamSink_iface);
}
/* Mixer expects special video media type instance. */
static HRESULT video_renderer_create_video_type(IMFMediaType *media_type, IMFVideoMediaType **video_type)
{
GUID subtype;
HRESULT hr;
*video_type = NULL;
if (FAILED(hr = IMFMediaType_GetGUID(media_type, &MF_MT_SUBTYPE, &subtype)))
return hr;
if (FAILED(hr = MFCreateVideoMediaTypeFromSubtype(&subtype, video_type)))
return hr;
hr = IMFMediaType_CopyAllItems(media_type, (IMFAttributes *)*video_type);
if (FAILED(hr))
{
IMFVideoMediaType_Release(*video_type);
*video_type = NULL;
}
return hr;
}
static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaTypeHandler *iface,
IMFMediaType *in_type, IMFMediaType **out_type)
{
struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface);
IMFVideoMediaType *video_type;
HRESULT hr;
TRACE("%p, %p, %p.\n", iface, in_type, out_type);
@ -401,17 +376,12 @@ static HRESULT WINAPI video_stream_typehandler_IsMediaTypeSupported(IMFMediaType
if (!stream->parent)
return MF_E_INVALIDMEDIATYPE;
if (FAILED(hr = video_renderer_create_video_type(in_type, &video_type)))
return hr;
if (SUCCEEDED(hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type,
if (SUCCEEDED(hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, in_type,
MFT_SET_TYPE_TEST_ONLY)))
{
if (out_type) *out_type = NULL;
}
IMFVideoMediaType_Release(video_type);
return hr;
}
@ -438,7 +408,6 @@ static HRESULT WINAPI video_stream_typehandler_GetMediaTypeByIndex(IMFMediaTypeH
static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeHandler *iface, IMFMediaType *type)
{
struct video_stream *stream = impl_from_IMFMediaTypeHandler(iface);
IMFVideoMediaType *video_type;
HRESULT hr;
TRACE("%p, %p.\n", iface, type);
@ -449,11 +418,7 @@ static HRESULT WINAPI video_stream_typehandler_SetCurrentMediaType(IMFMediaTypeH
if (!stream->parent)
return MF_E_STREAMSINK_REMOVED;
if (FAILED(hr = video_renderer_create_video_type(type, &video_type)))
return hr;
hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, (IMFMediaType *)video_type, 0);
IMFVideoMediaType_Release(video_type);
hr = IMFTransform_SetInputType(stream->parent->mixer, stream->id, type, 0);
return hr;
}