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
e02322ae
Commit
e02322ae
authored
Mar 19, 2008
by
Maarten Lankhorst
Committed by
Alexandre Julliard
Mar 20, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
quartz: Implement forwarding mediaseeking messages.
parent
734d6159
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
168 additions
and
2 deletions
+168
-2
control.c
dlls/quartz/control.c
+166
-1
pin.c
dlls/quartz/pin.c
+1
-1
quartz_private.h
dlls/quartz/quartz_private.h
+1
-0
No files found.
dlls/quartz/control.c
View file @
e02322ae
...
@@ -29,6 +29,72 @@
...
@@ -29,6 +29,72 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
quartz
);
WINE_DEFAULT_DEBUG_CHANNEL
(
quartz
);
typedef
HRESULT
(
*
SeekFunc
)(
IMediaSeeking
*
to
,
LPVOID
arg
);
static
HRESULT
ForwardCmdSeek
(
IBaseFilter
*
from
,
SeekFunc
fnSeek
,
LPVOID
arg
)
{
HRESULT
hr
=
S_OK
;
HRESULT
hr_return
=
S_OK
;
IEnumPins
*
enumpins
=
NULL
;
BOOL
foundend
=
FALSE
,
allnotimpl
=
TRUE
;
hr
=
IBaseFilter_EnumPins
(
from
,
&
enumpins
);
if
(
FAILED
(
hr
))
goto
out
;
hr
=
IEnumPins_Reset
(
enumpins
);
while
(
hr
==
S_OK
)
{
IPin
*
pin
=
NULL
;
hr
=
IEnumPins_Next
(
enumpins
,
1
,
&
pin
,
NULL
);
if
(
hr
==
VFW_E_ENUM_OUT_OF_SYNC
)
{
hr
=
IEnumPins_Reset
(
enumpins
);
continue
;
}
if
(
pin
)
{
PIN_DIRECTION
dir
;
IPin_QueryDirection
(
pin
,
&
dir
);
if
(
dir
==
PINDIR_INPUT
)
{
IPin
*
connected
=
NULL
;
IPin_ConnectedTo
(
pin
,
&
connected
);
if
(
connected
)
{
HRESULT
hr_local
;
IMediaSeeking
*
seek
=
NULL
;
hr_local
=
IPin_QueryInterface
(
connected
,
&
IID_IMediaSeeking
,
(
void
**
)
&
seek
);
if
(
!
hr_local
)
{
foundend
=
TRUE
;
hr_local
=
fnSeek
(
seek
,
arg
);
if
(
hr_local
!=
E_NOTIMPL
)
allnotimpl
=
FALSE
;
hr_return
=
updatehres
(
hr_return
,
hr_local
);
IMediaSeeking_Release
(
seek
);
}
IPin_Release
(
connected
);
}
}
IPin_Release
(
pin
);
}
}
while
(
hr
==
S_OK
);
if
(
foundend
&&
allnotimpl
)
hr
=
E_NOTIMPL
;
else
hr
=
hr_return
;
out:
FIXME
(
"Returning: %08x
\n
"
,
hr
);
return
hr
;
}
HRESULT
MediaSeekingImpl_Init
(
IBaseFilter
*
pUserData
,
CHANGEPROC
fnChangeStop
,
CHANGEPROC
fnChangeStart
,
CHANGEPROC
fnChangeRate
,
MediaSeekingImpl
*
pSeeking
,
PCRITICAL_SECTION
crit_sect
)
HRESULT
MediaSeekingImpl_Init
(
IBaseFilter
*
pUserData
,
CHANGEPROC
fnChangeStop
,
CHANGEPROC
fnChangeStart
,
CHANGEPROC
fnChangeRate
,
MediaSeekingImpl
*
pSeeking
,
PCRITICAL_SECTION
crit_sect
)
{
{
assert
(
fnChangeStop
&&
fnChangeStart
&&
fnChangeRate
);
assert
(
fnChangeStop
&&
fnChangeStart
&&
fnChangeRate
);
...
@@ -65,6 +131,12 @@ HRESULT WINAPI MediaSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * p
...
@@ -65,6 +131,12 @@ HRESULT WINAPI MediaSeekingImpl_GetCapabilities(IMediaSeeking * iface, DWORD * p
return
S_OK
;
return
S_OK
;
}
}
static
HRESULT
fwd_checkcaps
(
IMediaSeeking
*
iface
,
LPVOID
pcaps
)
{
DWORD
*
caps
=
pcaps
;
return
IMediaSeeking_CheckCapabilities
(
iface
,
caps
);
}
HRESULT
WINAPI
MediaSeekingImpl_CheckCapabilities
(
IMediaSeeking
*
iface
,
DWORD
*
pCapabilities
)
HRESULT
WINAPI
MediaSeekingImpl_CheckCapabilities
(
IMediaSeeking
*
iface
,
DWORD
*
pCapabilities
)
{
{
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
...
@@ -73,6 +145,13 @@ HRESULT WINAPI MediaSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD *
...
@@ -73,6 +145,13 @@ HRESULT WINAPI MediaSeekingImpl_CheckCapabilities(IMediaSeeking * iface, DWORD *
TRACE
(
"(%p)
\n
"
,
pCapabilities
);
TRACE
(
"(%p)
\n
"
,
pCapabilities
);
if
(
!
pCapabilities
)
return
E_POINTER
;
hr
=
ForwardCmdSeek
(
This
->
pUserData
,
fwd_checkcaps
,
pCapabilities
);
if
(
FAILED
(
hr
)
&&
hr
!=
E_NOTIMPL
)
return
hr
;
dwCommonCaps
=
*
pCapabilities
&
This
->
dwCapabilities
;
dwCommonCaps
=
*
pCapabilities
&
This
->
dwCapabilities
;
if
(
!
dwCommonCaps
)
if
(
!
dwCommonCaps
)
...
@@ -126,6 +205,39 @@ HRESULT WINAPI MediaSeekingImpl_IsUsingTimeFormat(IMediaSeeking * iface, const G
...
@@ -126,6 +205,39 @@ HRESULT WINAPI MediaSeekingImpl_IsUsingTimeFormat(IMediaSeeking * iface, const G
return
hr
;
return
hr
;
}
}
static
HRESULT
fwd_settimeformat
(
IMediaSeeking
*
iface
,
LPVOID
pformat
)
{
const
GUID
*
format
=
pformat
;
return
IMediaSeeking_SetTimeFormat
(
iface
,
format
);
}
HRESULT
WINAPI
MediaSeekingImpl_SetTimeFormat
(
IMediaSeeking
*
iface
,
const
GUID
*
pFormat
)
{
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
TRACE
(
"(%s)
\n
"
,
qzdebugstr_guid
(
pFormat
));
ForwardCmdSeek
(
This
->
pUserData
,
fwd_settimeformat
,
(
LPVOID
)
pFormat
);
return
(
IsEqualIID
(
pFormat
,
&
TIME_FORMAT_MEDIA_TIME
)
?
S_OK
:
S_FALSE
);
}
static
HRESULT
fwd_getduration
(
IMediaSeeking
*
iface
,
LPVOID
pdur
)
{
LONGLONG
*
duration
=
pdur
;
LONGLONG
mydur
=
*
duration
;
HRESULT
hr
;
hr
=
IMediaSeeking_GetDuration
(
iface
,
&
mydur
);
if
(
FAILED
(
hr
))
return
hr
;
if
((
mydur
<
*
duration
)
||
(
*
duration
<
0
&&
mydur
>
0
))
*
duration
=
mydur
;
return
hr
;
}
HRESULT
WINAPI
MediaSeekingImpl_GetDuration
(
IMediaSeeking
*
iface
,
LONGLONG
*
pDuration
)
HRESULT
WINAPI
MediaSeekingImpl_GetDuration
(
IMediaSeeking
*
iface
,
LONGLONG
*
pDuration
)
{
{
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
...
@@ -134,11 +246,28 @@ HRESULT WINAPI MediaSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pD
...
@@ -134,11 +246,28 @@ HRESULT WINAPI MediaSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pD
EnterCriticalSection
(
This
->
crst
);
EnterCriticalSection
(
This
->
crst
);
*
pDuration
=
This
->
llDuration
;
*
pDuration
=
This
->
llDuration
;
ForwardCmdSeek
(
This
->
pUserData
,
fwd_getduration
,
pDuration
);
LeaveCriticalSection
(
This
->
crst
);
LeaveCriticalSection
(
This
->
crst
);
return
S_OK
;
return
S_OK
;
}
}
static
HRESULT
fwd_getstopposition
(
IMediaSeeking
*
iface
,
LPVOID
pdur
)
{
LONGLONG
*
duration
=
pdur
;
LONGLONG
mydur
=
*
duration
;
HRESULT
hr
;
hr
=
IMediaSeeking_GetStopPosition
(
iface
,
&
mydur
);
if
(
FAILED
(
hr
))
return
hr
;
if
((
mydur
<
*
duration
)
||
(
*
duration
<
0
&&
mydur
>
0
))
*
duration
=
mydur
;
return
hr
;
}
HRESULT
WINAPI
MediaSeekingImpl_GetStopPosition
(
IMediaSeeking
*
iface
,
LONGLONG
*
pStop
)
HRESULT
WINAPI
MediaSeekingImpl_GetStopPosition
(
IMediaSeeking
*
iface
,
LONGLONG
*
pStop
)
{
{
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
...
@@ -147,11 +276,29 @@ HRESULT WINAPI MediaSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG
...
@@ -147,11 +276,29 @@ HRESULT WINAPI MediaSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG
EnterCriticalSection
(
This
->
crst
);
EnterCriticalSection
(
This
->
crst
);
*
pStop
=
This
->
llStop
;
*
pStop
=
This
->
llStop
;
ForwardCmdSeek
(
This
->
pUserData
,
fwd_getstopposition
,
pStop
);
LeaveCriticalSection
(
This
->
crst
);
LeaveCriticalSection
(
This
->
crst
);
return
S_OK
;
return
S_OK
;
}
}
static
HRESULT
fwd_getcurposition
(
IMediaSeeking
*
iface
,
LPVOID
pdur
)
{
LONGLONG
*
duration
=
pdur
;
LONGLONG
mydur
=
*
duration
;
HRESULT
hr
;
hr
=
IMediaSeeking_GetCurrentPosition
(
iface
,
&
mydur
);
if
(
FAILED
(
hr
))
return
hr
;
if
((
mydur
<
*
duration
)
||
(
*
duration
<
0
&&
mydur
>
0
))
*
duration
=
mydur
;
return
hr
;
}
/* FIXME: Make use of the info the filter should expose */
HRESULT
WINAPI
MediaSeekingImpl_GetCurrentPosition
(
IMediaSeeking
*
iface
,
LONGLONG
*
pCurrent
)
HRESULT
WINAPI
MediaSeekingImpl_GetCurrentPosition
(
IMediaSeeking
*
iface
,
LONGLONG
*
pCurrent
)
{
{
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
...
@@ -160,6 +307,7 @@ HRESULT WINAPI MediaSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLO
...
@@ -160,6 +307,7 @@ HRESULT WINAPI MediaSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLO
EnterCriticalSection
(
This
->
crst
);
EnterCriticalSection
(
This
->
crst
);
*
pCurrent
=
This
->
llStart
;
*
pCurrent
=
This
->
llStart
;
ForwardCmdSeek
(
This
->
pUserData
,
fwd_getcurposition
,
pCurrent
);
LeaveCriticalSection
(
This
->
crst
);
LeaveCriticalSection
(
This
->
crst
);
return
S_OK
;
return
S_OK
;
...
@@ -202,6 +350,7 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p
...
@@ -202,6 +350,7 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p
TRACE
(
"(%p, %x, %p, %x)
\n
"
,
pCurrent
,
dwCurrentFlags
,
pStop
,
dwStopFlags
);
TRACE
(
"(%p, %x, %p, %x)
\n
"
,
pCurrent
,
dwCurrentFlags
,
pStop
,
dwStopFlags
);
EnterCriticalSection
(
This
->
crst
);
EnterCriticalSection
(
This
->
crst
);
llNewStart
=
Adjust
(
This
->
llStart
,
pCurrent
,
dwCurrentFlags
);
llNewStart
=
Adjust
(
This
->
llStart
,
pCurrent
,
dwCurrentFlags
);
llNewStop
=
Adjust
(
This
->
llStop
,
pStop
,
dwStopFlags
);
llNewStop
=
Adjust
(
This
->
llStop
,
pStop
,
dwStopFlags
);
...
@@ -222,6 +371,7 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p
...
@@ -222,6 +371,7 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p
This
->
fnChangeStart
(
This
->
pUserData
);
This
->
fnChangeStart
(
This
->
pUserData
);
if
(
bChangeStop
)
if
(
bChangeStop
)
This
->
fnChangeStop
(
This
->
pUserData
);
This
->
fnChangeStop
(
This
->
pUserData
);
LeaveCriticalSection
(
This
->
crst
);
LeaveCriticalSection
(
This
->
crst
);
return
S_OK
;
return
S_OK
;
...
@@ -250,11 +400,24 @@ HRESULT WINAPI MediaSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * p
...
@@ -250,11 +400,24 @@ HRESULT WINAPI MediaSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * p
EnterCriticalSection
(
This
->
crst
);
EnterCriticalSection
(
This
->
crst
);
*
pEarliest
=
0
;
*
pEarliest
=
0
;
*
pLatest
=
This
->
llDuration
;
*
pLatest
=
This
->
llDuration
;
Leave
CriticalSection
(
This
->
crst
);
Enter
CriticalSection
(
This
->
crst
);
return
S_OK
;
return
S_OK
;
}
}
static
HRESULT
fwd_setrate
(
IMediaSeeking
*
iface
,
LPVOID
prate
)
{
double
*
rate
=
prate
;
HRESULT
hr
;
hr
=
IMediaSeeking_SetRate
(
iface
,
*
rate
);
if
(
FAILED
(
hr
))
return
hr
;
return
hr
;
}
HRESULT
WINAPI
MediaSeekingImpl_SetRate
(
IMediaSeeking
*
iface
,
double
dRate
)
HRESULT
WINAPI
MediaSeekingImpl_SetRate
(
IMediaSeeking
*
iface
,
double
dRate
)
{
{
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
...
@@ -267,6 +430,7 @@ HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate)
...
@@ -267,6 +430,7 @@ HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate)
This
->
dRate
=
dRate
;
This
->
dRate
=
dRate
;
if
(
bChangeRate
)
if
(
bChangeRate
)
hr
=
This
->
fnChangeRate
(
This
->
pUserData
);
hr
=
This
->
fnChangeRate
(
This
->
pUserData
);
ForwardCmdSeek
(
This
->
pUserData
,
fwd_setrate
,
&
dRate
);
LeaveCriticalSection
(
This
->
crst
);
LeaveCriticalSection
(
This
->
crst
);
return
hr
;
return
hr
;
...
@@ -279,6 +443,7 @@ HRESULT WINAPI MediaSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate)
...
@@ -279,6 +443,7 @@ HRESULT WINAPI MediaSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate)
TRACE
(
"(%p)
\n
"
,
dRate
);
TRACE
(
"(%p)
\n
"
,
dRate
);
EnterCriticalSection
(
This
->
crst
);
EnterCriticalSection
(
This
->
crst
);
/* Forward? */
*
dRate
=
This
->
dRate
;
*
dRate
=
This
->
dRate
;
LeaveCriticalSection
(
This
->
crst
);
LeaveCriticalSection
(
This
->
crst
);
...
...
dlls/quartz/pin.c
View file @
e02322ae
...
@@ -45,7 +45,7 @@ typedef HRESULT (*SendPinFunc)( IPin *to, LPVOID arg );
...
@@ -45,7 +45,7 @@ typedef HRESULT (*SendPinFunc)( IPin *to, LPVOID arg );
* Return the first received error code (E_NOTIMPL is ignored)
* Return the first received error code (E_NOTIMPL is ignored)
* If no errors occur: return the first received non-error-code that isn't S_OK
* If no errors occur: return the first received non-error-code that isn't S_OK
*/
*/
static
HRESULT
updatehres
(
HRESULT
original
,
HRESULT
new
)
HRESULT
updatehres
(
HRESULT
original
,
HRESULT
new
)
{
{
if
(
FAILED
(
original
)
||
new
==
E_NOTIMPL
)
if
(
FAILED
(
original
)
||
new
==
E_NOTIMPL
)
return
original
;
return
original
;
...
...
dlls/quartz/quartz_private.h
View file @
e02322ae
...
@@ -85,5 +85,6 @@ void FreeMediaType(AM_MEDIA_TYPE * pmt);
...
@@ -85,5 +85,6 @@ void FreeMediaType(AM_MEDIA_TYPE * pmt);
void
DeleteMediaType
(
AM_MEDIA_TYPE
*
pmt
);
void
DeleteMediaType
(
AM_MEDIA_TYPE
*
pmt
);
BOOL
CompareMediaTypes
(
const
AM_MEDIA_TYPE
*
pmt1
,
const
AM_MEDIA_TYPE
*
pmt2
,
BOOL
bWildcards
);
BOOL
CompareMediaTypes
(
const
AM_MEDIA_TYPE
*
pmt1
,
const
AM_MEDIA_TYPE
*
pmt2
,
BOOL
bWildcards
);
void
dump_AM_MEDIA_TYPE
(
const
AM_MEDIA_TYPE
*
pmt
);
void
dump_AM_MEDIA_TYPE
(
const
AM_MEDIA_TYPE
*
pmt
);
HRESULT
updatehres
(
HRESULT
original
,
HRESULT
new
);
#endif
/* __QUARTZ_PRIVATE_INCLUDED__ */
#endif
/* __QUARTZ_PRIVATE_INCLUDED__ */
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