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
8a05fe0f
Commit
8a05fe0f
authored
Nov 26, 2019
by
Zebediah Figura
Committed by
Alexandre Julliard
Nov 27, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
strmbase: Get rid of BaseOutputPinImpl_Deliver().
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
ce9af91c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
0 additions
and
41 deletions
+0
-41
pin.c
dlls/strmbase/pin.c
+0
-40
strmbase.h
include/wine/strmbase.h
+0
-1
No files found.
dlls/strmbase/pin.c
View file @
8a05fe0f
...
...
@@ -465,46 +465,6 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *This,
return
hr
;
}
/* replaces OutputPin_SendSample */
HRESULT
WINAPI
BaseOutputPinImpl_Deliver
(
struct
strmbase_source
*
This
,
IMediaSample
*
pSample
)
{
IMemInputPin
*
pMemConnected
=
NULL
;
PIN_INFO
pinInfo
;
HRESULT
hr
;
EnterCriticalSection
(
&
This
->
pin
.
filter
->
csFilter
);
{
if
(
!
This
->
pin
.
peer
||
!
This
->
pMemInputPin
)
hr
=
VFW_E_NOT_CONNECTED
;
else
{
/* we don't have the lock held when using This->pMemInputPin,
* so we need to AddRef it to stop it being deleted while we are
* using it. Same with its filter. */
pMemConnected
=
This
->
pMemInputPin
;
IMemInputPin_AddRef
(
pMemConnected
);
hr
=
IPin_QueryPinInfo
(
This
->
pin
.
peer
,
&
pinInfo
);
}
}
LeaveCriticalSection
(
&
This
->
pin
.
filter
->
csFilter
);
if
(
SUCCEEDED
(
hr
))
{
/* NOTE: if we are in a critical section when Receive is called
* then it causes some problems (most notably with the native Video
* Renderer) if we are re-entered for whatever reason */
hr
=
IMemInputPin_Receive
(
pMemConnected
,
pSample
);
/* If the filter's destroyed, tell upstream to stop sending data */
if
(
IBaseFilter_Release
(
pinInfo
.
pFilter
)
==
0
&&
SUCCEEDED
(
hr
))
hr
=
S_FALSE
;
}
if
(
pMemConnected
)
IMemInputPin_Release
(
pMemConnected
);
return
hr
;
}
/* replaces OutputPin_CommitAllocator */
HRESULT
WINAPI
BaseOutputPinImpl_Active
(
struct
strmbase_source
*
This
)
{
...
...
include/wine/strmbase.h
View file @
8a05fe0f
...
...
@@ -123,7 +123,6 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface);
HRESULT
WINAPI
BaseOutputPinImpl_GetDeliveryBuffer
(
struct
strmbase_source
*
pin
,
IMediaSample
**
sample
,
REFERENCE_TIME
*
start
,
REFERENCE_TIME
*
stop
,
DWORD
flags
);
HRESULT
WINAPI
BaseOutputPinImpl_Deliver
(
struct
strmbase_source
*
pin
,
IMediaSample
*
sample
);
HRESULT
WINAPI
BaseOutputPinImpl_Active
(
struct
strmbase_source
*
pin
);
HRESULT
WINAPI
BaseOutputPinImpl_Inactive
(
struct
strmbase_source
*
pin
);
HRESULT
WINAPI
BaseOutputPinImpl_InitAllocator
(
struct
strmbase_source
*
pin
,
IMemAllocator
**
allocator
);
...
...
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