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
ebd4b38f
Commit
ebd4b38f
authored
Jun 29, 2020
by
Zebediah Figura
Committed by
Alexandre Julliard
Jun 29, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
qcap: Pass a single AM_MEDIA_TYPE pointer to get_format().
Signed-off-by:
Zebediah Figura
<
z.figura12@gmail.com
>
Signed-off-by:
Alexandre Julliard
<
julliard@winehq.org
>
parent
8ad37074
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
12 deletions
+10
-12
qcap_private.h
dlls/qcap/qcap_private.h
+1
-1
v4l.c
dlls/qcap/v4l.c
+2
-6
vfwcapture.c
dlls/qcap/vfwcapture.c
+7
-5
No files found.
dlls/qcap/qcap_private.h
View file @
ebd4b38f
...
@@ -50,7 +50,7 @@ struct video_capture_device_ops
...
@@ -50,7 +50,7 @@ struct video_capture_device_ops
void
(
*
destroy
)(
struct
video_capture_device
*
device
);
void
(
*
destroy
)(
struct
video_capture_device
*
device
);
HRESULT
(
*
check_format
)(
struct
video_capture_device
*
device
,
const
AM_MEDIA_TYPE
*
mt
);
HRESULT
(
*
check_format
)(
struct
video_capture_device
*
device
,
const
AM_MEDIA_TYPE
*
mt
);
HRESULT
(
*
set_format
)(
struct
video_capture_device
*
device
,
const
AM_MEDIA_TYPE
*
mt
);
HRESULT
(
*
set_format
)(
struct
video_capture_device
*
device
,
const
AM_MEDIA_TYPE
*
mt
);
HRESULT
(
*
get_format
)(
struct
video_capture_device
*
device
,
AM_MEDIA_TYPE
*
*
mt
);
HRESULT
(
*
get_format
)(
struct
video_capture_device
*
device
,
AM_MEDIA_TYPE
*
mt
);
HRESULT
(
*
get_caps
)(
struct
video_capture_device
*
device
,
LONG
index
,
AM_MEDIA_TYPE
**
mt
,
VIDEO_STREAM_CONFIG_CAPS
*
caps
);
HRESULT
(
*
get_caps
)(
struct
video_capture_device
*
device
,
LONG
index
,
AM_MEDIA_TYPE
**
mt
,
VIDEO_STREAM_CONFIG_CAPS
*
caps
);
LONG
(
*
get_caps_count
)(
struct
video_capture_device
*
device
);
LONG
(
*
get_caps_count
)(
struct
video_capture_device
*
device
);
HRESULT
(
*
get_prop_range
)(
struct
video_capture_device
*
device
,
VideoProcAmpProperty
property
,
HRESULT
(
*
get_prop_range
)(
struct
video_capture_device
*
device
,
VideoProcAmpProperty
property
,
...
...
dlls/qcap/v4l.c
View file @
ebd4b38f
...
@@ -212,15 +212,11 @@ static HRESULT v4l_device_set_format(struct video_capture_device *iface, const A
...
@@ -212,15 +212,11 @@ static HRESULT v4l_device_set_format(struct video_capture_device *iface, const A
return
S_OK
;
return
S_OK
;
}
}
static
HRESULT
v4l_device_get_format
(
struct
video_capture_device
*
iface
,
AM_MEDIA_TYPE
*
*
mt
)
static
HRESULT
v4l_device_get_format
(
struct
video_capture_device
*
iface
,
AM_MEDIA_TYPE
*
mt
)
{
{
struct
v4l_device
*
device
=
v4l_device
(
iface
);
struct
v4l_device
*
device
=
v4l_device
(
iface
);
*
mt
=
CoTaskMemAlloc
(
sizeof
(
AM_MEDIA_TYPE
));
return
CopyMediaType
(
mt
,
&
device
->
current_caps
->
media_type
);
if
(
!*
mt
)
return
E_OUTOFMEMORY
;
return
CopyMediaType
(
*
mt
,
&
device
->
current_caps
->
media_type
);
}
}
static
__u32
v4l2_cid_from_qcap_property
(
VideoProcAmpProperty
property
)
static
__u32
v4l2_cid_from_qcap_property
(
VideoProcAmpProperty
property
)
...
...
dlls/qcap/vfwcapture.c
View file @
ebd4b38f
...
@@ -223,16 +223,18 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt)
...
@@ -223,16 +223,18 @@ AMStreamConfig_SetFormat(IAMStreamConfig *iface, AM_MEDIA_TYPE *pmt)
return
hr
;
return
hr
;
}
}
static
HRESULT
WINAPI
AMStreamConfig_GetFormat
(
IAMStreamConfig
*
iface
,
AM_MEDIA_TYPE
**
p
mt
)
static
HRESULT
WINAPI
AMStreamConfig_GetFormat
(
IAMStreamConfig
*
iface
,
AM_MEDIA_TYPE
**
mt
)
{
{
VfwCapture
*
filter
=
impl_from_IAMStreamConfig
(
iface
);
VfwCapture
*
filter
=
impl_from_IAMStreamConfig
(
iface
);
HRESULT
hr
;
HRESULT
hr
;
TRACE
(
"filter %p, mt %p.
\n
"
,
filter
,
p
mt
);
TRACE
(
"filter %p, mt %p.
\n
"
,
filter
,
mt
);
hr
=
filter
->
device
->
ops
->
get_format
(
filter
->
device
,
pmt
);
if
(
!
(
*
mt
=
CoTaskMemAlloc
(
sizeof
(
**
mt
))))
if
(
SUCCEEDED
(
hr
))
return
E_OUTOFMEMORY
;
strmbase_dump_media_type
(
*
pmt
);
if
(
SUCCEEDED
(
hr
=
filter
->
device
->
ops
->
get_format
(
filter
->
device
,
*
mt
)))
strmbase_dump_media_type
(
*
mt
);
return
hr
;
return
hr
;
}
}
...
...
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