Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-winehq
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wine
wine-winehq
Commits
3e1cfb3d
Commit
3e1cfb3d
authored
Mar 10, 2020
by
Nikolay Sivov
Committed by
Alexandre Julliard
Mar 10, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mfplat: Implement IsMediaTypeSupported() for stream descriptor.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
d6e828d5
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
162 additions
and
3 deletions
+162
-3
mediatype.c
dlls/mfplat/mediatype.c
+37
-2
mfplat.c
dlls/mfplat/tests/mfplat.c
+125
-1
No files found.
dlls/mfplat/mediatype.c
View file @
3e1cfb3d
...
@@ -1038,12 +1038,47 @@ static ULONG WINAPI mediatype_handler_Release(IMFMediaTypeHandler *iface)
...
@@ -1038,12 +1038,47 @@ static ULONG WINAPI mediatype_handler_Release(IMFMediaTypeHandler *iface)
return
IMFStreamDescriptor_Release
(
&
stream_desc
->
IMFStreamDescriptor_iface
);
return
IMFStreamDescriptor_Release
(
&
stream_desc
->
IMFStreamDescriptor_iface
);
}
}
static
BOOL
stream_descriptor_is_mediatype_supported
(
IMFMediaType
*
media_type
,
IMFMediaType
*
candidate
)
{
DWORD
flags
=
0
;
if
(
FAILED
(
IMFMediaType_IsEqual
(
media_type
,
candidate
,
&
flags
)))
return
FALSE
;
return
(
flags
&
(
MF_MEDIATYPE_EQUAL_MAJOR_TYPES
|
MF_MEDIATYPE_EQUAL_FORMAT_TYPES
))
==
(
MF_MEDIATYPE_EQUAL_MAJOR_TYPES
|
MF_MEDIATYPE_EQUAL_FORMAT_TYPES
);
}
static
HRESULT
WINAPI
mediatype_handler_IsMediaTypeSupported
(
IMFMediaTypeHandler
*
iface
,
IMFMediaType
*
in_type
,
static
HRESULT
WINAPI
mediatype_handler_IsMediaTypeSupported
(
IMFMediaTypeHandler
*
iface
,
IMFMediaType
*
in_type
,
IMFMediaType
**
out_type
)
IMFMediaType
**
out_type
)
{
{
FIXME
(
"%p, %p, %p.
\n
"
,
iface
,
in_type
,
out_type
);
struct
stream_desc
*
stream_desc
=
impl_from_IMFMediaTypeHandler
(
iface
);
BOOL
supported
=
FALSE
;
unsigned
int
i
;
return
E_NOTIMPL
;
TRACE
(
"%p, %p, %p.
\n
"
,
iface
,
in_type
,
out_type
);
if
(
!
in_type
)
return
E_POINTER
;
if
(
out_type
)
*
out_type
=
NULL
;
EnterCriticalSection
(
&
stream_desc
->
attributes
.
cs
);
supported
=
stream_desc
->
current_type
&&
stream_descriptor_is_mediatype_supported
(
stream_desc
->
current_type
,
in_type
);
if
(
!
supported
)
{
for
(
i
=
0
;
i
<
stream_desc
->
media_types_count
;
++
i
)
{
if
((
supported
=
stream_descriptor_is_mediatype_supported
(
stream_desc
->
media_types
[
i
],
in_type
)))
break
;
}
}
LeaveCriticalSection
(
&
stream_desc
->
attributes
.
cs
);
return
supported
?
S_OK
:
MF_E_INVALIDMEDIATYPE
;
}
}
static
HRESULT
WINAPI
mediatype_handler_GetMediaTypeCount
(
IMFMediaTypeHandler
*
iface
,
DWORD
*
count
)
static
HRESULT
WINAPI
mediatype_handler_GetMediaTypeCount
(
IMFMediaTypeHandler
*
iface
,
DWORD
*
count
)
...
...
dlls/mfplat/tests/mfplat.c
View file @
3e1cfb3d
...
@@ -3164,7 +3164,7 @@ static void test_MFInvokeCallback(void)
...
@@ -3164,7 +3164,7 @@ static void test_MFInvokeCallback(void)
static
void
test_stream_descriptor
(
void
)
static
void
test_stream_descriptor
(
void
)
{
{
IMFMediaType
*
media_types
[
2
],
*
media_type
;
IMFMediaType
*
media_types
[
2
],
*
media_type
,
*
media_type2
,
*
media_type3
;
IMFMediaTypeHandler
*
type_handler
;
IMFMediaTypeHandler
*
type_handler
;
IMFStreamDescriptor
*
stream_desc
;
IMFStreamDescriptor
*
stream_desc
;
GUID
major_type
;
GUID
major_type
;
...
@@ -3217,12 +3217,36 @@ static void test_stream_descriptor(void)
...
@@ -3217,12 +3217,36 @@ static void test_stream_descriptor(void)
hr
=
IMFMediaTypeHandler_GetMediaTypeByIndex
(
type_handler
,
2
,
&
media_type
);
hr
=
IMFMediaTypeHandler_GetMediaTypeByIndex
(
type_handler
,
2
,
&
media_type
);
ok
(
hr
==
MF_E_NO_MORE_TYPES
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
hr
==
MF_E_NO_MORE_TYPES
,
"Unexpected hr %#x.
\n
"
,
hr
);
/* IsMediaTypeSupported() */
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
NULL
,
NULL
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
NULL
,
&
media_type2
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
MFCreateMediaType
(
&
media_type
);
hr
=
MFCreateMediaType
(
&
media_type
);
ok
(
hr
==
S_OK
,
"Failed to create media type, hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Failed to create media type, hr %#x.
\n
"
,
hr
);
hr
=
MFCreateMediaType
(
&
media_type3
);
ok
(
hr
==
S_OK
,
"Failed to create media type, hr %#x.
\n
"
,
hr
);
media_type2
=
(
void
*
)
0xdeadbeef
;
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
media_type
,
&
media_type2
);
ok
(
hr
==
MF_E_INVALIDMEDIATYPE
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
media_type2
,
"Unexpected pointer.
\n
"
);
hr
=
IMFMediaTypeHandler_SetCurrentMediaType
(
type_handler
,
NULL
);
ok
(
hr
==
E_POINTER
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFMediaTypeHandler_SetCurrentMediaType
(
type_handler
,
media_type
);
hr
=
IMFMediaTypeHandler_SetCurrentMediaType
(
type_handler
,
media_type
);
ok
(
hr
==
S_OK
,
"Failed to set current type, hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Failed to set current type, hr %#x.
\n
"
,
hr
);
media_type2
=
(
void
*
)
0xdeadbeef
;
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
media_type
,
&
media_type2
);
ok
(
hr
==
MF_E_INVALIDMEDIATYPE
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
media_type2
,
"Unexpected pointer.
\n
"
);
hr
=
IMFMediaTypeHandler_GetMajorType
(
type_handler
,
&
major_type
);
hr
=
IMFMediaTypeHandler_GetMajorType
(
type_handler
,
&
major_type
);
ok
(
hr
==
MF_E_ATTRIBUTENOTFOUND
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
hr
==
MF_E_ATTRIBUTENOTFOUND
,
"Unexpected hr %#x.
\n
"
,
hr
);
...
@@ -3233,11 +3257,111 @@ static void test_stream_descriptor(void)
...
@@ -3233,11 +3257,111 @@ static void test_stream_descriptor(void)
ok
(
hr
==
S_OK
,
"Failed to get major type, hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Failed to get major type, hr %#x.
\n
"
,
hr
);
ok
(
IsEqualGUID
(
&
major_type
,
&
MFMediaType_Audio
),
"Unexpected major type.
\n
"
);
ok
(
IsEqualGUID
(
&
major_type
,
&
MFMediaType_Audio
),
"Unexpected major type.
\n
"
);
/* Mismatching major types. */
hr
=
IMFMediaType_SetGUID
(
media_type3
,
&
MF_MT_MAJOR_TYPE
,
&
MFMediaType_Video
);
ok
(
hr
==
S_OK
,
"Failed to set major type, hr %#x.
\n
"
,
hr
);
media_type2
=
(
void
*
)
0xdeadbeef
;
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
media_type3
,
&
media_type2
);
ok
(
hr
==
MF_E_INVALIDMEDIATYPE
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
media_type2
,
"Unexpected pointer.
\n
"
);
/* Subtype missing. */
hr
=
IMFMediaType_SetGUID
(
media_type3
,
&
MF_MT_MAJOR_TYPE
,
&
MFMediaType_Audio
);
ok
(
hr
==
S_OK
,
"Failed to set attribute, hr %#x.
\n
"
,
hr
);
hr
=
IMFMediaType_SetGUID
(
media_type
,
&
MF_MT_SUBTYPE
,
&
MFAudioFormat_PCM
);
ok
(
hr
==
S_OK
,
"Failed to set attribute, hr %#x.
\n
"
,
hr
);
media_type2
=
(
void
*
)
0xdeadbeef
;
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
media_type3
,
&
media_type2
);
ok
(
hr
==
MF_E_INVALIDMEDIATYPE
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
media_type2
,
"Unexpected pointer.
\n
"
);
hr
=
IMFMediaType_SetGUID
(
media_type3
,
&
MF_MT_SUBTYPE
,
&
MFAudioFormat_PCM
);
ok
(
hr
==
S_OK
,
"Failed to set attribute, hr %#x.
\n
"
,
hr
);
media_type2
=
(
void
*
)
0xdeadbeef
;
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
media_type3
,
&
media_type2
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
media_type2
,
"Unexpected pointer.
\n
"
);
/* Mismatching subtype. */
hr
=
IMFMediaType_SetGUID
(
media_type3
,
&
MF_MT_SUBTYPE
,
&
MFAudioFormat_MP3
);
ok
(
hr
==
S_OK
,
"Failed to set attribute, hr %#x.
\n
"
,
hr
);
media_type2
=
(
void
*
)
0xdeadbeef
;
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
media_type3
,
&
media_type2
);
ok
(
hr
==
MF_E_INVALIDMEDIATYPE
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
media_type2
,
"Unexpected pointer.
\n
"
);
hr
=
IMFMediaTypeHandler_GetMediaTypeCount
(
type_handler
,
&
count
);
hr
=
IMFMediaTypeHandler_GetMediaTypeCount
(
type_handler
,
&
count
);
ok
(
hr
==
S_OK
,
"Failed to get type count, hr %#x.
\n
"
,
hr
);
ok
(
hr
==
S_OK
,
"Failed to get type count, hr %#x.
\n
"
,
hr
);
ok
(
count
==
ARRAY_SIZE
(
media_types
),
"Unexpected type count.
\n
"
);
ok
(
count
==
ARRAY_SIZE
(
media_types
),
"Unexpected type count.
\n
"
);
IMFMediaTypeHandler_Release
(
type_handler
);
IMFStreamDescriptor_Release
(
stream_desc
);
/* IsMediaTypeSupported() for unset current type. */
hr
=
MFCreateStreamDescriptor
(
123
,
ARRAY_SIZE
(
media_types
),
media_types
,
&
stream_desc
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
hr
=
IMFStreamDescriptor_GetMediaTypeHandler
(
stream_desc
,
&
type_handler
);
ok
(
hr
==
S_OK
,
"Failed to get type handler, hr %#x.
\n
"
,
hr
);
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
media_type3
,
NULL
);
ok
(
hr
==
MF_E_INVALIDMEDIATYPE
,
"Unexpected hr %#x.
\n
"
,
hr
);
/* Initialize one from initial type set. */
hr
=
IMFMediaType_CopyAllItems
(
media_type3
,
(
IMFAttributes
*
)
media_types
[
0
]);
ok
(
hr
==
S_OK
,
"Failed to copy attributes, hr %#x.
\n
"
,
hr
);
media_type2
=
(
void
*
)
0xdeadbeef
;
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
media_type3
,
&
media_type2
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
media_type2
,
"Unexpected pointer.
\n
"
);
hr
=
IMFMediaType_SetGUID
(
media_type3
,
&
MF_MT_SUBTYPE
,
&
MFAudioFormat_PCM
);
ok
(
hr
==
S_OK
,
"Failed to copy attributes, hr %#x.
\n
"
,
hr
);
media_type2
=
(
void
*
)
0xdeadbeef
;
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
media_type3
,
&
media_type2
);
ok
(
hr
==
MF_E_INVALIDMEDIATYPE
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
media_type2
,
"Unexpected pointer.
\n
"
);
hr
=
IMFMediaType_SetGUID
(
media_type3
,
&
MF_MT_SUBTYPE
,
&
MFAudioFormat_MP3
);
ok
(
hr
==
S_OK
,
"Failed to copy attributes, hr %#x.
\n
"
,
hr
);
media_type2
=
(
void
*
)
0xdeadbeef
;
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
media_type3
,
&
media_type2
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
media_type2
,
"Unexpected pointer.
\n
"
);
/* Now set current type that's not compatible. */
hr
=
IMFMediaType_SetGUID
(
media_type3
,
&
MF_MT_MAJOR_TYPE
,
&
MFMediaType_Video
);
ok
(
hr
==
S_OK
,
"Failed to copy attributes, hr %#x.
\n
"
,
hr
);
hr
=
IMFMediaType_SetGUID
(
media_type3
,
&
MF_MT_SUBTYPE
,
&
MFVideoFormat_RGB8
);
ok
(
hr
==
S_OK
,
"Failed to copy attributes, hr %#x.
\n
"
,
hr
);
hr
=
IMFMediaTypeHandler_SetCurrentMediaType
(
type_handler
,
media_type3
);
ok
(
hr
==
S_OK
,
"Failed to set current type, hr %#x.
\n
"
,
hr
);
media_type2
=
(
void
*
)
0xdeadbeef
;
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
media_type3
,
&
media_type2
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
media_type2
,
"Unexpected pointer.
\n
"
);
hr
=
IMFMediaType_CopyAllItems
(
media_types
[
0
],
(
IMFAttributes
*
)
media_type
);
ok
(
hr
==
S_OK
,
"Failed to copy attributes, hr %#x.
\n
"
,
hr
);
media_type2
=
(
void
*
)
0xdeadbeef
;
hr
=
IMFMediaTypeHandler_IsMediaTypeSupported
(
type_handler
,
media_type
,
&
media_type2
);
ok
(
hr
==
S_OK
,
"Unexpected hr %#x.
\n
"
,
hr
);
ok
(
!
media_type2
,
"Unexpected pointer.
\n
"
);
IMFMediaType_Release
(
media_type
);
IMFMediaType_Release
(
media_type
);
IMFMediaType_Release
(
media_type3
);
IMFMediaTypeHandler_Release
(
type_handler
);
IMFMediaTypeHandler_Release
(
type_handler
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment