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
cdf9c4f2
Commit
cdf9c4f2
authored
Mar 14, 2012
by
Aric Stewart
Committed by
Alexandre Julliard
Mar 15, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
strmbase: Rename MediaSeekingPassThru to RendererPosPassThru to match standard strmbase naming.
parent
026037ab
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
18 deletions
+18
-18
dsoundrender.c
dlls/quartz/dsoundrender.c
+4
-4
nullrenderer.c
dlls/quartz/nullrenderer.c
+4
-4
videorenderer.c
dlls/quartz/videorenderer.c
+4
-4
pospass.c
dlls/strmbase/pospass.c
+3
-3
strmbase.h
include/wine/strmbase.h
+3
-3
No files found.
dlls/quartz/dsoundrender.c
View file @
cdf9c4f2
...
...
@@ -386,7 +386,7 @@ static HRESULT WINAPI DSoundRender_Receive(BaseInputPin *pin, IMediaSample * pSa
}
if
(
IMediaSample_GetMediaTime
(
pSample
,
&
tStart
,
&
tStop
)
==
S_OK
)
MediaSeeking
PassThru_RegisterMediaTime
(
This
->
seekthru_unk
,
tStart
);
RendererPos
PassThru_RegisterMediaTime
(
This
->
seekthru_unk
,
tStart
);
hr
=
IMediaSample_GetTime
(
pSample
,
&
tStart
,
&
tStop
);
if
(
FAILED
(
hr
))
{
ERR
(
"Cannot get sample time (%x)
\n
"
,
hr
);
...
...
@@ -670,7 +670,7 @@ static HRESULT WINAPI DSoundRender_Stop(IBaseFilter * iface)
This
->
writepos
=
This
->
buf_size
;
SetEvent
(
This
->
state_change
);
SetEvent
(
This
->
blocked
);
MediaSeeking
PassThru_ResetMediaTime
(
This
->
seekthru_unk
);
RendererPos
PassThru_ResetMediaTime
(
This
->
seekthru_unk
);
}
LeaveCriticalSection
(
&
This
->
filter
.
csFilter
);
...
...
@@ -922,7 +922,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndOfStream(IPin * iface)
}
hr
=
DSoundRender_HandleEndOfStream
(
me
);
MediaSeeking
PassThru_EOS
(
me
->
seekthru_unk
);
RendererPos
PassThru_EOS
(
me
->
seekthru_unk
);
SetEvent
(
me
->
state_change
);
LeaveCriticalSection
(
This
->
pin
.
pCritSec
);
...
...
@@ -977,7 +977,7 @@ static HRESULT WINAPI DSoundRender_InputPin_EndFlush(IPin * iface)
QualityControlRender_Start
(
&
pFilter
->
qcimpl
,
pFilter
->
filter
.
rtStreamStart
);
hr
=
BaseInputPinImpl_EndFlush
(
iface
);
LeaveCriticalSection
(
This
->
pin
.
pCritSec
);
MediaSeeking
PassThru_ResetMediaTime
(
pFilter
->
seekthru_unk
);
RendererPos
PassThru_ResetMediaTime
(
pFilter
->
seekthru_unk
);
return
hr
;
}
...
...
dlls/quartz/nullrenderer.c
View file @
cdf9c4f2
...
...
@@ -71,7 +71,7 @@ static HRESULT WINAPI NullRenderer_Receive(BaseInputPin *pin, IMediaSample * pSa
TRACE
(
"%p %p
\n
"
,
pin
,
pSample
);
if
(
SUCCEEDED
(
IMediaSample_GetMediaTime
(
pSample
,
&
start
,
&
stop
)))
MediaSeeking
PassThru_RegisterMediaTime
(
This
->
seekthru_unk
,
start
);
RendererPos
PassThru_RegisterMediaTime
(
This
->
seekthru_unk
,
start
);
EnterCriticalSection
(
&
This
->
filter
.
csFilter
);
if
(
This
->
pInputPin
->
flushing
||
This
->
pInputPin
->
end_of_stream
)
hr
=
S_FALSE
;
...
...
@@ -308,7 +308,7 @@ static HRESULT WINAPI NullRenderer_Stop(IBaseFilter * iface)
EnterCriticalSection
(
&
This
->
filter
.
csFilter
);
{
This
->
filter
.
state
=
State_Stopped
;
MediaSeeking
PassThru_ResetMediaTime
(
This
->
seekthru_unk
);
RendererPos
PassThru_ResetMediaTime
(
This
->
seekthru_unk
);
}
LeaveCriticalSection
(
&
This
->
filter
.
csFilter
);
...
...
@@ -428,7 +428,7 @@ static HRESULT WINAPI NullRenderer_InputPin_EndOfStream(IPin * iface)
IMediaEventSink_Release
(
pEventSink
);
}
}
MediaSeeking
PassThru_EOS
(
pNull
->
seekthru_unk
);
RendererPos
PassThru_EOS
(
pNull
->
seekthru_unk
);
return
hr
;
}
...
...
@@ -443,7 +443,7 @@ static HRESULT WINAPI NullRenderer_InputPin_EndFlush(IPin * iface)
hr
=
BaseInputPinImpl_EndOfStream
(
iface
);
pNull
=
(
NullRendererImpl
*
)
This
->
pin
.
pinInfo
.
pFilter
;
MediaSeeking
PassThru_ResetMediaTime
(
pNull
->
seekthru_unk
);
RendererPos
PassThru_ResetMediaTime
(
pNull
->
seekthru_unk
);
return
hr
;
}
...
...
dlls/quartz/videorenderer.c
View file @
cdf9c4f2
...
...
@@ -390,7 +390,7 @@ static HRESULT WINAPI VideoRenderer_Receive(BaseInputPin* pin, IMediaSample * pS
}
if
(
IMediaSample_GetMediaTime
(
pSample
,
&
tStart
,
&
tStop
)
==
S_OK
)
MediaSeeking
PassThru_RegisterMediaTime
(
This
->
seekthru_unk
,
tStart
);
RendererPos
PassThru_RegisterMediaTime
(
This
->
seekthru_unk
,
tStart
);
/* Preroll means the sample isn't shown, this is used for key frames and things like that */
if
(
IMediaSample_IsPreroll
(
pSample
)
==
S_OK
)
{
...
...
@@ -776,7 +776,7 @@ static HRESULT WINAPI VideoRenderer_Stop(IBaseFilter * iface)
This
->
filter
.
state
=
State_Stopped
;
SetEvent
(
This
->
hEvent
);
SetEvent
(
This
->
blocked
);
MediaSeeking
PassThru_ResetMediaTime
(
This
->
seekthru_unk
);
RendererPos
PassThru_ResetMediaTime
(
This
->
seekthru_unk
);
if
(
This
->
AutoShow
)
/* Black it out */
RedrawWindow
(
This
->
hWnd
,
NULL
,
NULL
,
RDW_INVALIDATE
|
RDW_ERASE
);
...
...
@@ -928,7 +928,7 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndOfStream(IPin * iface)
hr
=
IMediaEventSink_Notify
(
pEventSink
,
EC_COMPLETE
,
S_OK
,
(
LONG_PTR
)
pFilter
);
IMediaEventSink_Release
(
pEventSink
);
}
MediaSeeking
PassThru_EOS
(
pFilter
->
seekthru_unk
);
RendererPos
PassThru_EOS
(
pFilter
->
seekthru_unk
);
This
->
end_of_stream
=
1
;
out:
LeaveCriticalSection
(
This
->
pin
.
pCritSec
);
...
...
@@ -973,7 +973,7 @@ static HRESULT WINAPI VideoRenderer_InputPin_EndFlush(IPin * iface)
QualityControlRender_Start
(
&
pVideoRenderer
->
qcimpl
,
pVideoRenderer
->
filter
.
rtStreamStart
);
hr
=
BaseInputPinImpl_EndFlush
(
iface
);
LeaveCriticalSection
(
This
->
pin
.
pCritSec
);
MediaSeeking
PassThru_ResetMediaTime
(
pVideoRenderer
->
seekthru_unk
);
RendererPos
PassThru_ResetMediaTime
(
pVideoRenderer
->
seekthru_unk
);
return
hr
;
}
...
...
dlls/strmbase/pospass.c
View file @
cdf9c4f2
...
...
@@ -567,7 +567,7 @@ static HRESULT WINAPI MediaSeekingPassThru_GetPreroll(IMediaSeeking * iface, LON
return
hr
;
}
HRESULT
WINAPI
MediaSeeking
PassThru_RegisterMediaTime
(
IUnknown
*
iface
,
REFERENCE_TIME
start
)
HRESULT
WINAPI
RendererPos
PassThru_RegisterMediaTime
(
IUnknown
*
iface
,
REFERENCE_TIME
start
)
{
ICOM_THIS_MULTI
(
PassThruImpl
,
IInner_vtbl
,
iface
);
EnterCriticalSection
(
&
This
->
time_cs
);
...
...
@@ -577,7 +577,7 @@ HRESULT WINAPI MediaSeekingPassThru_RegisterMediaTime(IUnknown *iface, REFERENCE
return
S_OK
;
}
HRESULT
WINAPI
MediaSeeking
PassThru_ResetMediaTime
(
IUnknown
*
iface
)
HRESULT
WINAPI
RendererPos
PassThru_ResetMediaTime
(
IUnknown
*
iface
)
{
ICOM_THIS_MULTI
(
PassThruImpl
,
IInner_vtbl
,
iface
);
EnterCriticalSection
(
&
This
->
time_cs
);
...
...
@@ -586,7 +586,7 @@ HRESULT WINAPI MediaSeekingPassThru_ResetMediaTime(IUnknown *iface)
return
S_OK
;
}
HRESULT
WINAPI
MediaSeeking
PassThru_EOS
(
IUnknown
*
iface
)
HRESULT
WINAPI
RendererPos
PassThru_EOS
(
IUnknown
*
iface
)
{
ICOM_THIS_MULTI
(
PassThruImpl
,
IInner_vtbl
,
iface
);
REFERENCE_TIME
time
;
...
...
include/wine/strmbase.h
View file @
cdf9c4f2
...
...
@@ -321,9 +321,9 @@ HRESULT WINAPI SourceSeekingImpl_GetRate(IMediaSeeking * iface, double * dRate);
HRESULT
WINAPI
SourceSeekingImpl_GetPreroll
(
IMediaSeeking
*
iface
,
LONGLONG
*
pPreroll
);
/* PosPassThru */
HRESULT
WINAPI
MediaSeeking
PassThru_RegisterMediaTime
(
IUnknown
*
iface
,
REFERENCE_TIME
start
);
HRESULT
WINAPI
MediaSeeking
PassThru_ResetMediaTime
(
IUnknown
*
iface
);
HRESULT
WINAPI
MediaSeeking
PassThru_EOS
(
IUnknown
*
iface
);
HRESULT
WINAPI
RendererPos
PassThru_RegisterMediaTime
(
IUnknown
*
iface
,
REFERENCE_TIME
start
);
HRESULT
WINAPI
RendererPos
PassThru_ResetMediaTime
(
IUnknown
*
iface
);
HRESULT
WINAPI
RendererPos
PassThru_EOS
(
IUnknown
*
iface
);
HRESULT
WINAPI
CreatePosPassThru
(
IUnknown
*
pUnkOuter
,
BOOL
bRenderer
,
IPin
*
pPin
,
IUnknown
**
ppPassThru
);
HRESULT
WINAPI
PosPassThru_Construct
(
IUnknown
*
pUnkOuter
,
LPVOID
*
ppPassThru
);
...
...
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