Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
wine
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package registry
Container Registry
Model registry
Operate
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Alexey Alyaev
wine
Commits
734d6159
Commit
734d6159
authored
17 years ago
by
Maarten Lankhorst
Committed by
Alexandre Julliard
17 years ago
Browse files
Options
Downloads
Patches
Plain Diff
quartz: Add critical sections to IMediaSeeking.
parent
9ec42400
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
dlls/quartz/control.c
+37
-13
37 additions, 13 deletions
dlls/quartz/control.c
dlls/quartz/control_private.h
+3
-1
3 additions, 1 deletion
dlls/quartz/control_private.h
dlls/quartz/parser.c
+1
-1
1 addition, 1 deletion
dlls/quartz/parser.c
with
41 additions
and
15 deletions
dlls/quartz/control.c
+
37
−
13
View file @
734d6159
...
...
@@ -29,7 +29,7 @@
WINE_DEFAULT_DEBUG_CHANNEL
(
quartz
);
HRESULT
MediaSeekingImpl_Init
(
IBaseFilter
*
pUserData
,
CHANGEPROC
fnChangeStop
,
CHANGEPROC
fnChangeStart
,
CHANGEPROC
fnChangeRate
,
MediaSeekingImpl
*
pSeeking
)
HRESULT
MediaSeekingImpl_Init
(
IBaseFilter
*
pUserData
,
CHANGEPROC
fnChangeStop
,
CHANGEPROC
fnChangeStart
,
CHANGEPROC
fnChangeRate
,
MediaSeekingImpl
*
pSeeking
,
PCRITICAL_SECTION
crit_sect
)
{
assert
(
fnChangeStop
&&
fnChangeStart
&&
fnChangeRate
);
...
...
@@ -47,6 +47,8 @@ HRESULT MediaSeekingImpl_Init(IBaseFilter *pUserData, CHANGEPROC fnChangeStop, C
pSeeking
->
llStop
=
((
ULONGLONG
)
0x80000000
)
<<
32
;
pSeeking
->
llDuration
=
pSeeking
->
llStop
-
pSeeking
->
llStart
;
pSeeking
->
dRate
=
1
.
0
;
pSeeking
->
timeformat
=
TIME_FORMAT_MEDIA_TIME
;
pSeeking
->
crst
=
crit_sect
;
return
S_OK
;
}
...
...
@@ -99,24 +101,29 @@ HRESULT WINAPI MediaSeekingImpl_QueryPreferredFormat(IMediaSeeking * iface, GUID
HRESULT
WINAPI
MediaSeekingImpl_GetTimeFormat
(
IMediaSeeking
*
iface
,
GUID
*
pFormat
)
{
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
TRACE
(
"(%s)
\n
"
,
qzdebugstr_guid
(
pFormat
));
*
pFormat
=
TIME_FORMAT_MEDIA_TIME
;
EnterCriticalSection
(
This
->
crst
);
*
pFormat
=
This
->
timeformat
;
LeaveCriticalSection
(
This
->
crst
);
return
S_OK
;
}
HRESULT
WINAPI
MediaSeekingImpl_IsUsingTimeFormat
(
IMediaSeeking
*
iface
,
const
GUID
*
pFormat
)
{
TRACE
(
"(%s)
\n
"
,
qzdebugstr_guid
(
pFormat
));
return
(
IsEqualIID
(
pFormat
,
&
TIME_FORMAT_MEDIA_TIME
)
?
S_OK
:
S_FALSE
);
}
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
HRESULT
hr
=
S_OK
;
HRESULT
WINAPI
MediaSeekingImpl_SetTimeFormat
(
IMediaSeeking
*
iface
,
const
GUID
*
pFormat
)
{
TRACE
(
"(%s)
\n
"
,
qzdebugstr_guid
(
pFormat
));
return
(
IsEqualIID
(
pFormat
,
&
TIME_FORMAT_MEDIA_TIME
)
?
S_OK
:
S_FALSE
);
EnterCriticalSection
(
This
->
crst
);
if
(
!
IsEqualIID
(
pFormat
,
&
This
->
timeformat
))
hr
=
S_FALSE
;
LeaveCriticalSection
(
This
->
crst
);
return
hr
;
}
HRESULT
WINAPI
MediaSeekingImpl_GetDuration
(
IMediaSeeking
*
iface
,
LONGLONG
*
pDuration
)
...
...
@@ -125,7 +132,9 @@ HRESULT WINAPI MediaSeekingImpl_GetDuration(IMediaSeeking * iface, LONGLONG * pD
TRACE
(
"(%p)
\n
"
,
pDuration
);
EnterCriticalSection
(
This
->
crst
);
*
pDuration
=
This
->
llDuration
;
LeaveCriticalSection
(
This
->
crst
);
return
S_OK
;
}
...
...
@@ -136,7 +145,9 @@ HRESULT WINAPI MediaSeekingImpl_GetStopPosition(IMediaSeeking * iface, LONGLONG
TRACE
(
"(%p)
\n
"
,
pStop
);
EnterCriticalSection
(
This
->
crst
);
*
pStop
=
This
->
llStop
;
LeaveCriticalSection
(
This
->
crst
);
return
S_OK
;
}
...
...
@@ -147,7 +158,9 @@ HRESULT WINAPI MediaSeekingImpl_GetCurrentPosition(IMediaSeeking * iface, LONGLO
TRACE
(
"(%p)
\n
"
,
pCurrent
);
EnterCriticalSection
(
This
->
crst
);
*
pCurrent
=
This
->
llStart
;
LeaveCriticalSection
(
This
->
crst
);
return
S_OK
;
}
...
...
@@ -188,6 +201,7 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p
TRACE
(
"(%p, %x, %p, %x)
\n
"
,
pCurrent
,
dwCurrentFlags
,
pStop
,
dwStopFlags
);
EnterCriticalSection
(
This
->
crst
);
llNewStart
=
Adjust
(
This
->
llStart
,
pCurrent
,
dwCurrentFlags
);
llNewStop
=
Adjust
(
This
->
llStop
,
pStop
,
dwStopFlags
);
...
...
@@ -208,6 +222,7 @@ HRESULT WINAPI MediaSeekingImpl_SetPositions(IMediaSeeking * iface, LONGLONG * p
This
->
fnChangeStart
(
This
->
pUserData
);
if
(
bChangeStop
)
This
->
fnChangeStop
(
This
->
pUserData
);
LeaveCriticalSection
(
This
->
crst
);
return
S_OK
;
}
...
...
@@ -218,9 +233,11 @@ HRESULT WINAPI MediaSeekingImpl_GetPositions(IMediaSeeking * iface, LONGLONG * p
TRACE
(
"(%p, %p)
\n
"
,
pCurrent
,
pStop
);
EnterCriticalSection
(
This
->
crst
);
*
pCurrent
=
This
->
llStart
;
*
pStop
=
This
->
llStop
;
LeaveCriticalSection
(
This
->
crst
);
return
S_OK
;
}
...
...
@@ -230,8 +247,10 @@ HRESULT WINAPI MediaSeekingImpl_GetAvailable(IMediaSeeking * iface, LONGLONG * p
TRACE
(
"(%p, %p)
\n
"
,
pEarliest
,
pLatest
);
EnterCriticalSection
(
This
->
crst
);
*
pEarliest
=
0
;
*
pLatest
=
This
->
llDuration
;
LeaveCriticalSection
(
This
->
crst
);
return
S_OK
;
}
...
...
@@ -240,14 +259,17 @@ HRESULT WINAPI MediaSeekingImpl_SetRate(IMediaSeeking * iface, double dRate)
{
MediaSeekingImpl
*
This
=
(
MediaSeekingImpl
*
)
iface
;
BOOL
bChangeRate
=
(
dRate
!=
This
->
dRate
);
HRESULT
hr
=
S_OK
;
TRACE
(
"(%e)
\n
"
,
dRate
);
EnterCriticalSection
(
This
->
crst
);
This
->
dRate
=
dRate
;
if
(
bChangeRate
)
return
This
->
fnChangeRate
(
This
->
pUserData
);
else
return
S_OK
;
hr
=
This
->
fnChangeRate
(
This
->
pUserData
);
LeaveCriticalSection
(
This
->
crst
);
return
hr
;
}
HRESULT
WINAPI
MediaSeekingImpl_GetRate
(
IMediaSeeking
*
iface
,
double
*
dRate
)
...
...
@@ -256,7 +278,9 @@ HRESULT WINAPI MediaSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate)
TRACE
(
"(%p)
\n
"
,
dRate
);
EnterCriticalSection
(
This
->
crst
);
*
dRate
=
This
->
dRate
;
LeaveCriticalSection
(
This
->
crst
);
return
S_OK
;
}
...
...
This diff is collapsed.
Click to expand it.
dlls/quartz/control_private.h
+
3
−
1
View file @
734d6159
...
...
@@ -34,9 +34,11 @@ typedef struct MediaSeekingImpl
LONGLONG
llStart
;
LONGLONG
llStop
;
LONGLONG
llDuration
;
/* FIXME: needed? */
GUID
timeformat
;
PCRITICAL_SECTION
crst
;
}
MediaSeekingImpl
;
HRESULT
MediaSeekingImpl_Init
(
IBaseFilter
*
pUserData
,
CHANGEPROC
fnChangeStop
,
CHANGEPROC
fnChangeStart
,
CHANGEPROC
fnChangeRate
,
MediaSeekingImpl
*
pSeeking
);
HRESULT
MediaSeekingImpl_Init
(
IBaseFilter
*
pUserData
,
CHANGEPROC
fnChangeStop
,
CHANGEPROC
fnChangeStart
,
CHANGEPROC
fnChangeRate
,
MediaSeekingImpl
*
pSeeking
,
PCRITICAL_SECTION
crit_sect
);
HRESULT
WINAPI
MediaSeekingImpl_GetCapabilities
(
IMediaSeeking
*
iface
,
DWORD
*
pCapabilities
);
HRESULT
WINAPI
MediaSeekingImpl_CheckCapabilities
(
IMediaSeeking
*
iface
,
DWORD
*
pCapabilities
);
...
...
This diff is collapsed.
Click to expand it.
dlls/quartz/parser.c
+
1
−
1
View file @
734d6159
...
...
@@ -80,7 +80,7 @@ HRESULT Parser_Create(ParserImpl* pParser, const CLSID* pClsid, PFN_PROCESS_SAMP
piInput
.
pFilter
=
(
IBaseFilter
*
)
pParser
;
lstrcpynW
(
piInput
.
achName
,
wcsInputPinName
,
sizeof
(
piInput
.
achName
)
/
sizeof
(
piInput
.
achName
[
0
]));
MediaSeekingImpl_Init
((
IBaseFilter
*
)
pParser
,
Parser_ChangeStop
,
Parser_ChangeStart
,
Parser_ChangeRate
,
&
pParser
->
mediaSeeking
);
MediaSeekingImpl_Init
((
IBaseFilter
*
)
pParser
,
Parser_ChangeStop
,
Parser_ChangeStart
,
Parser_ChangeRate
,
&
pParser
->
mediaSeeking
,
&
pParser
->
csFilter
);
pParser
->
mediaSeeking
.
lpVtbl
=
&
Parser_Seeking_Vtbl
;
hr
=
Parser_InputPin_Construct
(
&
piInput
,
fnProcessSample
,
(
LPVOID
)
pParser
,
fnQueryAccept
,
&
pParser
->
csFilter
,
(
IPin
**
)
&
pParser
->
pInputPin
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment