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
659b93c7
Commit
659b93c7
authored
Jul 01, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
Jul 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
strmbase: Rename "evComplete" to "state_event" for clarity.
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ac10f3de
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
11 deletions
+12
-11
dsoundrender.c
dlls/quartz/dsoundrender.c
+1
-1
videorenderer.c
dlls/quartz/videorenderer.c
+0
-1
renderer.c
dlls/strmbase/renderer.c
+8
-8
strmbase.h
include/wine/strmbase.h
+3
-1
No files found.
dlls/quartz/dsoundrender.c
View file @
659b93c7
...
...
@@ -727,7 +727,7 @@ static HRESULT WINAPI DSoundRender_Pause(IBaseFilter * iface)
if
(
This
->
renderer
.
filter
.
state
==
State_Stopped
)
{
if
(
This
->
renderer
.
sink
.
pin
.
pConnectedTo
)
ResetEvent
(
This
->
renderer
.
evComplete
);
ResetEvent
(
This
->
renderer
.
state_event
);
This
->
renderer
.
sink
.
end_of_stream
=
0
;
}
...
...
dlls/quartz/videorenderer.c
View file @
659b93c7
...
...
@@ -51,7 +51,6 @@ typedef struct VideoRendererImpl
DWORD
ThreadID
;
HANDLE
hEvent
;
/* hEvent == evComplete? */
BOOL
ThreadResult
;
RECT
SourceRect
;
RECT
DestRect
;
...
...
dlls/strmbase/renderer.c
View file @
659b93c7
...
...
@@ -266,7 +266,7 @@ HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, const IBaseFilterVtb
InitializeCriticalSection
(
&
filter
->
csRenderLock
);
filter
->
csRenderLock
.
DebugInfo
->
Spare
[
0
]
=
(
DWORD_PTR
)(
__FILE__
": BaseRenderer.csRenderLock"
);
filter
->
evComplete
=
CreateEventW
(
NULL
,
TRUE
,
TRUE
,
NULL
);
filter
->
state_event
=
CreateEventW
(
NULL
,
TRUE
,
TRUE
,
NULL
);
filter
->
RenderEvent
=
CreateEventW
(
NULL
,
FALSE
,
FALSE
,
NULL
);
filter
->
pMediaSample
=
NULL
;
...
...
@@ -290,7 +290,7 @@ void strmbase_renderer_cleanup(BaseRenderer *filter)
DeleteCriticalSection
(
&
filter
->
csRenderLock
);
BaseRendererImpl_ClearPendingSample
(
filter
);
CloseHandle
(
filter
->
evComplete
);
CloseHandle
(
filter
->
state_event
);
CloseHandle
(
filter
->
RenderEvent
);
QualityControlImpl_Destroy
(
filter
->
qcimpl
);
strmbase_filter_cleanup
(
&
filter
->
filter
);
...
...
@@ -341,7 +341,7 @@ HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSamp
if
(
This
->
pFuncsTable
->
pfnOnReceiveFirstSample
)
This
->
pFuncsTable
->
pfnOnReceiveFirstSample
(
This
,
pSample
);
SetEvent
(
This
->
evComplete
);
SetEvent
(
This
->
state_event
);
}
/* Wait for render Time */
...
...
@@ -401,7 +401,7 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface)
if
(
This
->
pFuncsTable
->
pfnOnStopStreaming
)
This
->
pFuncsTable
->
pfnOnStopStreaming
(
This
);
This
->
filter
.
state
=
State_Stopped
;
SetEvent
(
This
->
evComplete
);
SetEvent
(
This
->
state_event
);
SetEvent
(
This
->
RenderEvent
);
}
LeaveCriticalSection
(
&
This
->
csRenderLock
);
...
...
@@ -420,7 +420,7 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart)
if
(
This
->
filter
.
state
==
State_Running
)
goto
out
;
SetEvent
(
This
->
evComplete
);
SetEvent
(
This
->
state_event
);
if
(
This
->
sink
.
pin
.
pConnectedTo
)
{
...
...
@@ -466,7 +466,7 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface)
if
(
This
->
filter
.
state
==
State_Stopped
)
{
if
(
This
->
sink
.
pin
.
pConnectedTo
)
ResetEvent
(
This
->
evComplete
);
ResetEvent
(
This
->
state_event
);
This
->
sink
.
end_of_stream
=
FALSE
;
}
else
if
(
This
->
pFuncsTable
->
pfnOnStopStreaming
)
...
...
@@ -503,7 +503,7 @@ HRESULT WINAPI BaseRendererImpl_GetState(IBaseFilter * iface, DWORD dwMilliSecsT
TRACE
(
"(%p)->(%d, %p)
\n
"
,
This
,
dwMilliSecsTimeout
,
pState
);
if
(
WaitForSingleObject
(
This
->
evComplete
,
dwMilliSecsTimeout
)
==
WAIT_TIMEOUT
)
if
(
WaitForSingleObject
(
This
->
state_event
,
dwMilliSecsTimeout
)
==
WAIT_TIMEOUT
)
hr
=
VFW_S_STATE_INTERMEDIATE
;
else
hr
=
S_OK
;
...
...
@@ -531,7 +531,7 @@ HRESULT WINAPI BaseRendererImpl_EndOfStream(BaseRenderer* iface)
}
}
RendererPosPassThru_EOS
(
iface
->
pPosition
);
SetEvent
(
iface
->
evComplete
);
SetEvent
(
iface
->
state_event
);
return
hr
;
}
...
...
include/wine/strmbase.h
View file @
659b93c7
...
...
@@ -540,7 +540,9 @@ typedef struct BaseRendererTag
BaseInputPin
sink
;
IUnknown
*
pPosition
;
CRITICAL_SECTION
csRenderLock
;
HANDLE
evComplete
;
/* Signaled when the filter has completed a state change. The filter waits
* for this event in IBaseFilter::GetState(). */
HANDLE
state_event
;
HANDLE
RenderEvent
;
IMediaSample
*
pMediaSample
;
...
...
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