Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
W
wine-cw
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-cw
Commits
09b49669
Commit
09b49669
authored
Jun 07, 2005
by
Christian Costa
Committed by
Alexandre Julliard
Jun 07, 2005
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Don't use fullscreen mode in video renderer for now and improve error
handling a bit. Improved a bit Run/Pause/Stop methods of parser template.
parent
ef53e7a2
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
41 additions
and
12 deletions
+41
-12
avidec.c
dlls/quartz/avidec.c
+1
-1
parser.c
dlls/quartz/parser.c
+37
-9
videorenderer.c
dlls/quartz/videorenderer.c
+3
-2
No files found.
dlls/quartz/avidec.c
View file @
09b49669
...
@@ -218,7 +218,7 @@ static HRESULT AVIDec_ConnectInput(TransformFilterImpl* pTransformFilter, const
...
@@ -218,7 +218,7 @@ static HRESULT AVIDec_ConnectInput(TransformFilterImpl* pTransformFilter, const
/* Update output media type */
/* Update output media type */
CopyMediaType
(
outpmt
,
pmt
);
CopyMediaType
(
outpmt
,
pmt
);
outpmt
->
subtype
=
*
outsubtype
;
outpmt
->
subtype
=
*
outsubtype
;
memcpy
(
&
(((
VIDEOINFOHEADER
*
)
outpmt
->
pbFormat
)
->
bmiHeader
),
This
->
pBihOut
,
This
->
pBihOut
->
biSize
);
memcpy
(
&
(((
VIDEOINFOHEADER
*
)
outpmt
->
pbFormat
)
->
bmiHeader
),
This
->
pBihOut
,
This
->
pBihOut
->
biSize
);
/* Update buffer size of media samples in output */
/* Update buffer size of media samples in output */
((
OutputPin
*
)
This
->
tf
.
ppPins
[
1
])
->
allocProps
.
cbBuffer
=
This
->
pBihOut
->
biSizeImage
;
((
OutputPin
*
)
This
->
tf
.
ppPins
[
1
])
->
allocProps
.
cbBuffer
=
This
->
pBihOut
->
biSizeImage
;
...
...
dlls/quartz/parser.c
View file @
09b49669
...
@@ -223,6 +223,11 @@ static HRESULT WINAPI Parser_Stop(IBaseFilter * iface)
...
@@ -223,6 +223,11 @@ static HRESULT WINAPI Parser_Stop(IBaseFilter * iface)
EnterCriticalSection
(
&
This
->
csFilter
);
EnterCriticalSection
(
&
This
->
csFilter
);
{
{
if
(
This
->
state
==
State_Stopped
)
{
LeaveCriticalSection
(
&
This
->
csFilter
);
return
S_OK
;
}
hr
=
PullPin_StopProcessing
(
This
->
pInputPin
);
hr
=
PullPin_StopProcessing
(
This
->
pInputPin
);
This
->
state
=
State_Stopped
;
This
->
state
=
State_Stopped
;
}
}
...
@@ -241,6 +246,11 @@ static HRESULT WINAPI Parser_Pause(IBaseFilter * iface)
...
@@ -241,6 +246,11 @@ static HRESULT WINAPI Parser_Pause(IBaseFilter * iface)
EnterCriticalSection
(
&
This
->
csFilter
);
EnterCriticalSection
(
&
This
->
csFilter
);
{
{
if
(
This
->
state
==
State_Paused
)
{
LeaveCriticalSection
(
&
This
->
csFilter
);
return
S_OK
;
}
bInit
=
(
This
->
state
==
State_Stopped
);
bInit
=
(
This
->
state
==
State_Stopped
);
This
->
state
=
State_Paused
;
This
->
state
=
State_Paused
;
}
}
...
@@ -250,7 +260,7 @@ static HRESULT WINAPI Parser_Pause(IBaseFilter * iface)
...
@@ -250,7 +260,7 @@ static HRESULT WINAPI Parser_Pause(IBaseFilter * iface)
{
{
unsigned
int
i
;
unsigned
int
i
;
/*hr = PullPin_Seek(This->pInputPin, This->CurrentChunkOffset, This->EndOfFile); */
hr
=
PullPin_Seek
(
This
->
pInputPin
,
0
,
((
LONGLONG
)
0x7fffffff
<<
32
)
|
0xffffffff
);
if
(
SUCCEEDED
(
hr
))
if
(
SUCCEEDED
(
hr
))
hr
=
PullPin_InitProcessing
(
This
->
pInputPin
);
hr
=
PullPin_InitProcessing
(
This
->
pInputPin
);
...
@@ -275,6 +285,9 @@ static HRESULT WINAPI Parser_Pause(IBaseFilter * iface)
...
@@ -275,6 +285,9 @@ static HRESULT WINAPI Parser_Pause(IBaseFilter * iface)
}
}
/* FIXME: else pause thread */
/* FIXME: else pause thread */
if
(
SUCCEEDED
(
hr
))
hr
=
PullPin_PauseProcessing
(
This
->
pInputPin
);
return
hr
;
return
hr
;
}
}
...
@@ -288,19 +301,34 @@ static HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart)
...
@@ -288,19 +301,34 @@ static HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart)
EnterCriticalSection
(
&
This
->
csFilter
);
EnterCriticalSection
(
&
This
->
csFilter
);
{
{
if
(
This
->
state
==
State_Running
)
{
LeaveCriticalSection
(
&
This
->
csFilter
);
return
S_OK
;
}
This
->
rtStreamStart
=
tStart
;
This
->
rtStreamStart
=
tStart
;
This
->
state
=
State_Running
;
hr
=
PullPin_
InitProcessing
(
This
->
pInputPin
);
hr
=
PullPin_
Seek
(
This
->
pInputPin
,
tStart
,
((
LONGLONG
)
0x7fffffff
<<
32
)
|
0xffffffff
);
if
(
SUCCEEDED
(
hr
))
if
(
SUCCEEDED
(
hr
)
&&
(
This
->
state
==
State_Stopped
))
{
{
for
(
i
=
1
;
i
<
This
->
cStreams
+
1
;
i
++
)
hr
=
PullPin_InitProcessing
(
This
->
pInputPin
);
{
OutputPin_CommitAllocator
((
OutputPin
*
)
This
->
ppPins
[
i
]);
if
(
SUCCEEDED
(
hr
))
{
for
(
i
=
1
;
i
<
(
This
->
cStreams
+
1
);
i
++
)
{
OutputPin_CommitAllocator
((
OutputPin
*
)
This
->
ppPins
[
i
]);
}
}
}
hr
=
PullPin_StartProcessing
(
This
->
pInputPin
);
}
}
if
(
SUCCEEDED
(
hr
))
hr
=
PullPin_StartProcessing
(
This
->
pInputPin
);
if
(
SUCCEEDED
(
hr
))
This
->
state
=
State_Running
;
}
}
LeaveCriticalSection
(
&
This
->
csFilter
);
LeaveCriticalSection
(
&
This
->
csFilter
);
...
...
dlls/quartz/videorenderer.c
View file @
09b49669
...
@@ -127,7 +127,7 @@ static HRESULT VideoRenderer_CreatePrimarySurface(IBaseFilter * iface)
...
@@ -127,7 +127,7 @@ static HRESULT VideoRenderer_CreatePrimarySurface(IBaseFilter * iface)
return
hr
;
return
hr
;
}
}
hr
=
IDirectDraw_SetCooperativeLevel
(
This
->
ddraw
,
NULL
,
DDSCL_FULLSCREEN
|
DDSCL_EXCLUSIVE
);
hr
=
IDirectDraw_SetCooperativeLevel
(
This
->
ddraw
,
GetDesktopWindow
(),
DDSCL_NORMAL
);
if
(
FAILED
(
hr
))
{
if
(
FAILED
(
hr
))
{
ERR
(
"Cannot set fulscreen mode
\n
"
);
ERR
(
"Cannot set fulscreen mode
\n
"
);
return
hr
;
return
hr
;
...
@@ -298,12 +298,13 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample)
...
@@ -298,12 +298,13 @@ static HRESULT VideoRenderer_Sample(LPVOID iface, IMediaSample * pSample)
if
(
!
This
->
init
)
if
(
!
This
->
init
)
{
{
This
->
init
=
1
;
hr
=
VideoRenderer_CreatePrimarySurface
(
iface
);
hr
=
VideoRenderer_CreatePrimarySurface
(
iface
);
if
(
FAILED
(
hr
))
if
(
FAILED
(
hr
))
{
{
ERR
(
"Unable to create primary surface
\n
"
);
ERR
(
"Unable to create primary surface
\n
"
);
return
hr
;
}
}
This
->
init
=
1
;
}
}
VideoRenderer_SendSampleData
(
This
,
pbSrcStream
,
cbSrcStream
);
VideoRenderer_SendSampleData
(
This
,
pbSrcStream
,
cbSrcStream
);
...
...
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