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
0319a2dd
Commit
0319a2dd
authored
Mar 25, 2019
by
Nikolay Sivov
Committed by
Alexandre Julliard
Mar 25, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mfreadwrite: Use single helper for source reader creation functions.
Signed-off-by:
Nikolay Sivov
<
nsivov@codeweavers.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
493b375f
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
32 additions
and
31 deletions
+32
-31
main.c
dlls/mfreadwrite/main.c
+32
-31
No files found.
dlls/mfreadwrite/main.c
View file @
0319a2dd
...
...
@@ -838,6 +838,35 @@ HRESULT WINAPI MFCreateSinkWriterFromMediaSink(IMFMediaSink *sink, IMFAttributes
return
create_sink_writer_from_sink
(
sink
,
attributes
,
&
IID_IMFSinkWriter
,
(
void
**
)
writer
);
}
static
HRESULT
create_source_reader_from_object
(
IUnknown
*
unk
,
IMFAttributes
*
attributes
,
REFIID
riid
,
void
**
out
)
{
IMFMediaSource
*
source
=
NULL
;
IMFByteStream
*
stream
=
NULL
;
HRESULT
hr
;
hr
=
IUnknown_QueryInterface
(
unk
,
&
IID_IMFMediaSource
,
(
void
**
)
&
source
);
if
(
FAILED
(
hr
))
hr
=
IUnknown_QueryInterface
(
unk
,
&
IID_IMFByteStream
,
(
void
**
)
&
stream
);
if
(
source
)
{
UINT32
disconnect
=
0
;
if
(
attributes
)
IMFAttributes_GetUINT32
(
attributes
,
&
MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN
,
&
disconnect
);
hr
=
create_source_reader_from_source
(
source
,
attributes
,
!
disconnect
,
riid
,
out
);
}
else
if
(
stream
)
hr
=
create_source_reader_from_stream
(
stream
,
attributes
,
riid
,
out
);
if
(
source
)
IMFMediaSource_Release
(
source
);
if
(
stream
)
IMFByteStream_Release
(
stream
);
return
hr
;
}
/***********************************************************************
* MFCreateSourceReaderFromByteStream (mfreadwrite.@)
*/
...
...
@@ -846,7 +875,7 @@ HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttr
{
TRACE
(
"%p, %p, %p.
\n
"
,
stream
,
attributes
,
reader
);
return
create_source_reader_from_
stream
(
stream
,
attributes
,
&
IID_IMFSourceReader
,
(
void
**
)
reader
);
return
create_source_reader_from_
object
((
IUnknown
*
)
stream
,
attributes
,
&
IID_IMFSourceReader
,
(
void
**
)
reader
);
}
/***********************************************************************
...
...
@@ -855,14 +884,9 @@ HRESULT WINAPI MFCreateSourceReaderFromByteStream(IMFByteStream *stream, IMFAttr
HRESULT
WINAPI
MFCreateSourceReaderFromMediaSource
(
IMFMediaSource
*
source
,
IMFAttributes
*
attributes
,
IMFSourceReader
**
reader
)
{
UINT32
disconnect
=
0
;
TRACE
(
"%p, %p, %p.
\n
"
,
source
,
attributes
,
reader
);
if
(
attributes
)
IMFAttributes_GetUINT32
(
attributes
,
&
MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN
,
&
disconnect
);
return
create_source_reader_from_source
(
source
,
attributes
,
!
disconnect
,
&
IID_IMFSourceReader
,
(
void
**
)
reader
);
return
create_source_reader_from_object
((
IUnknown
*
)
source
,
attributes
,
&
IID_IMFSourceReader
,
(
void
**
)
reader
);
}
/***********************************************************************
...
...
@@ -924,30 +948,7 @@ static HRESULT WINAPI readwrite_factory_CreateInstanceFromObject(IMFReadWriteCla
if
(
IsEqualGUID
(
clsid
,
&
CLSID_MFSourceReader
))
{
IMFMediaSource
*
source
=
NULL
;
IMFByteStream
*
stream
=
NULL
;
hr
=
IUnknown_QueryInterface
(
unk
,
&
IID_IMFByteStream
,
(
void
**
)
&
stream
);
if
(
FAILED
(
hr
))
hr
=
IUnknown_QueryInterface
(
unk
,
&
IID_IMFMediaSource
,
(
void
**
)
&
source
);
if
(
stream
)
hr
=
create_source_reader_from_stream
(
stream
,
attributes
,
riid
,
out
);
else
if
(
source
)
{
UINT32
disconnect
=
0
;
if
(
attributes
)
IMFAttributes_GetUINT32
(
attributes
,
&
MF_SOURCE_READER_DISCONNECT_MEDIASOURCE_ON_SHUTDOWN
,
&
disconnect
);
hr
=
create_source_reader_from_source
(
source
,
attributes
,
!
disconnect
,
riid
,
out
);
}
if
(
source
)
IMFMediaSource_Release
(
source
);
if
(
stream
)
IMFByteStream_Release
(
stream
);
return
hr
;
return
create_source_reader_from_object
(
unk
,
attributes
,
riid
,
out
);
}
else
if
(
IsEqualGUID
(
clsid
,
&
CLSID_MFSinkWriter
))
{
...
...
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