Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
fe87c923
Commit
fe87c923
authored
Oct 20, 2004
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/access/dshow/dshow.cpp: codying style changes + a couple of fixes.
parent
23e2a1d4
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
45 additions
and
44 deletions
+45
-44
modules/access/dshow/dshow.cpp
modules/access/dshow/dshow.cpp
+45
-44
No files found.
modules/access/dshow/dshow.cpp
View file @
fe87c923
...
@@ -59,7 +59,7 @@ static int ConfigDevicesCallback( vlc_object_t *, char const *,
...
@@ -59,7 +59,7 @@ static int ConfigDevicesCallback( vlc_object_t *, char const *,
static
void
ShowPropertyPage
(
IUnknown
*
);
static
void
ShowPropertyPage
(
IUnknown
*
);
static
void
ShowDeviceProperties
(
vlc_object_t
*
,
ICaptureGraphBuilder2
*
,
static
void
ShowDeviceProperties
(
vlc_object_t
*
,
ICaptureGraphBuilder2
*
,
IBaseFilter
*
,
vlc_bool_t
b_audio
);
IBaseFilter
*
,
vlc_bool_t
);
/*****************************************************************************
/*****************************************************************************
* Module descriptor
* Module descriptor
...
@@ -223,7 +223,6 @@ static void DeleteDirectShowGraph( access_sys_t *p_sys )
...
@@ -223,7 +223,6 @@ static void DeleteDirectShowGraph( access_sys_t *p_sys )
}
}
}
}
/*****************************************************************************
/*****************************************************************************
* CommonOpen: open direct show device
* CommonOpen: open direct show device
*****************************************************************************/
*****************************************************************************/
...
@@ -378,8 +377,9 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys,
...
@@ -378,8 +377,9 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys,
{
{
IAMCrossbar
*
pXbar
=
p_sys
->
crossbar_routes
[
i
].
pXbar
;
IAMCrossbar
*
pXbar
=
p_sys
->
crossbar_routes
[
i
].
pXbar
;
IBaseFilter
*
p_XF
;
IBaseFilter
*
p_XF
;
HRESULT
hr
=
pXbar
->
QueryInterface
(
IID_IBaseFilter
,
(
void
**
)
&
p_XF
);
if
(
SUCCEEDED
(
hr
)
)
if
(
SUCCEEDED
(
pXbar
->
QueryInterface
(
IID_IBaseFilter
,
(
void
**
)
&
p_XF
)
)
)
{
{
ShowPropertyPage
(
p_XF
);
ShowPropertyPage
(
p_XF
);
p_XF
->
Release
();
p_XF
->
Release
();
...
@@ -749,7 +749,7 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
...
@@ -749,7 +749,7 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
if
(
!
b_audio
)
if
(
!
b_audio
)
{
{
//
i
nsert prefered video media type
//
I
nsert prefered video media type
AM_MEDIA_TYPE
mtr
;
AM_MEDIA_TYPE
mtr
;
VIDEOINFOHEADER
vh
;
VIDEOINFOHEADER
vh
;
...
@@ -757,7 +757,6 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
...
@@ -757,7 +757,6 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
mtr
.
subtype
=
MEDIASUBTYPE_I420
;
mtr
.
subtype
=
MEDIASUBTYPE_I420
;
mtr
.
bFixedSizeSamples
=
TRUE
;
mtr
.
bFixedSizeSamples
=
TRUE
;
mtr
.
bTemporalCompression
=
FALSE
;
mtr
.
bTemporalCompression
=
FALSE
;
mtr
.
lSampleSize
=
0
;
mtr
.
pUnk
=
NULL
;
mtr
.
pUnk
=
NULL
;
mtr
.
formattype
=
FORMAT_VideoInfo
;
mtr
.
formattype
=
FORMAT_VideoInfo
;
mtr
.
cbFormat
=
sizeof
(
vh
);
mtr
.
cbFormat
=
sizeof
(
vh
);
...
@@ -766,12 +765,14 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
...
@@ -766,12 +765,14 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
memset
(
&
vh
,
0
,
sizeof
(
vh
));
memset
(
&
vh
,
0
,
sizeof
(
vh
));
vh
.
bmiHeader
.
biSize
=
sizeof
(
vh
.
bmiHeader
);
vh
.
bmiHeader
.
biSize
=
sizeof
(
vh
.
bmiHeader
);
vh
.
bmiHeader
.
biWidth
=
p_sys
->
i_width
>
0
?
p_sys
->
i_width
:
320
;
vh
.
bmiHeader
.
biWidth
=
p_sys
->
i_width
>
0
?
p_sys
->
i_width
:
320
;
vh
.
bmiHeader
.
biHeight
=
p_sys
->
i_height
>
0
?
p_sys
->
i_height
:
240
;
vh
.
bmiHeader
.
biHeight
=
p_sys
->
i_height
>
0
?
p_sys
->
i_height
:
240
;
vh
.
bmiHeader
.
biPlanes
=
1
;
vh
.
bmiHeader
.
biPlanes
=
3
;
vh
.
bmiHeader
.
biBitCount
=
12
;
vh
.
bmiHeader
.
biBitCount
=
12
;
vh
.
bmiHeader
.
biCompression
=
VLC_FOURCC
(
'I'
,
'4'
,
'2'
,
'0'
);
vh
.
bmiHeader
.
biCompression
=
VLC_FOURCC
(
'I'
,
'4'
,
'2'
,
'0'
);
vh
.
bmiHeader
.
biSizeImage
=
p_sys
->
i_width
*
12
*
p_sys
->
i_height
/
8
;
vh
.
bmiHeader
.
biSizeImage
=
vh
.
bmiHeader
.
biWidth
*
12
*
vh
.
bmiHeader
.
biHeight
/
8
;
mtr
.
lSampleSize
=
vh
.
bmiHeader
.
biSizeImage
;
mt_count
=
1
;
mt_count
=
1
;
mt
=
(
AM_MEDIA_TYPE
*
)
malloc
(
sizeof
(
AM_MEDIA_TYPE
)
*
mt_count
);
mt
=
(
AM_MEDIA_TYPE
*
)
malloc
(
sizeof
(
AM_MEDIA_TYPE
)
*
mt_count
);
...
@@ -779,7 +780,7 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
...
@@ -779,7 +780,7 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
}
}
else
else
{
{
//
i
nsert prefered audio media type
//
I
nsert prefered audio media type
AM_MEDIA_TYPE
mtr
;
AM_MEDIA_TYPE
mtr
;
WAVEFORMATEX
wf
;
WAVEFORMATEX
wf
;
...
@@ -808,16 +809,17 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
...
@@ -808,16 +809,17 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
CopyMediaType
(
mt
,
&
mtr
);
CopyMediaType
(
mt
,
&
mtr
);
}
}
// retreive acceptable media types supported by device
// Retreive acceptable media types supported by device
AM_MEDIA_TYPE
media_types
[
MAX_MEDIA_TYPES
];
AM_MEDIA_TYPE
media_types
[
MAX_MEDIA_TYPES
];
size_t
media_count
=
EnumDeviceCaps
(
p_this
,
p_device_filter
,
p_sys
->
i_chroma
,
size_t
media_count
=
EnumDeviceCaps
(
p_this
,
p_device_filter
,
p_sys
->
i_chroma
,
p_sys
->
i_width
,
p_sys
->
i_height
,
p_sys
->
i_width
,
p_sys
->
i_height
,
0
,
0
,
0
,
media_types
,
MAX_MEDIA_TYPES
);
0
,
0
,
0
,
media_types
,
MAX_MEDIA_TYPES
);
if
(
media_count
>
0
)
if
(
media_count
>
0
)
{
{
mt
=
(
AM_MEDIA_TYPE
*
)
realloc
(
mt
,
sizeof
(
AM_MEDIA_TYPE
)
*
(
mt_count
+
media_count
)
);
mt
=
(
AM_MEDIA_TYPE
*
)
realloc
(
mt
,
sizeof
(
AM_MEDIA_TYPE
)
*
(
mt_count
+
media_count
)
);
// Order and copy returned media types according to arbitrary
// Order and copy returned media types according to arbitrary
// fourcc priority
// fourcc priority
...
@@ -871,13 +873,14 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
...
@@ -871,13 +873,14 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
dshow_stream
.
mt
=
dshow_stream
.
mt
=
p_capture_filter
->
CustomGetPin
()
->
CustomGetMediaType
();
p_capture_filter
->
CustomGetPin
()
->
CustomGetMediaType
();
/* Show Device properties. Done here so the VLC stream is setup with
the
/* Show Device properties. Done here so the VLC stream is setup with
* proper parameters. */
*
the
proper parameters. */
vlc_value_t
val
;
vlc_value_t
val
;
var_Get
(
p_this
,
"dshow-config"
,
&
val
);
var_Get
(
p_this
,
"dshow-config"
,
&
val
);
if
(
val
.
i_int
)
if
(
val
.
i_int
)
{
{
ShowDeviceProperties
(
p_this
,
p_sys
->
p_capture_graph_builder2
,
p_device_filter
,
b_audio
);
ShowDeviceProperties
(
p_this
,
p_sys
->
p_capture_graph_builder2
,
p_device_filter
,
b_audio
);
}
}
dshow_stream
.
mt
=
dshow_stream
.
mt
=
...
@@ -1544,18 +1547,16 @@ static int ConfigDevicesCallback( vlc_object_t *p_this, char const *psz_name,
...
@@ -1544,18 +1547,16 @@ static int ConfigDevicesCallback( vlc_object_t *p_this, char const *psz_name,
}
}
/*****************************************************************************
/*****************************************************************************
*
p
roperties
*
P
roperties
*****************************************************************************/
*****************************************************************************/
static
void
ShowPropertyPage
(
IUnknown
*
obj
)
static
void
ShowPropertyPage
(
IUnknown
*
obj
)
{
{
ISpecifyPropertyPages
*
p_spec
;
ISpecifyPropertyPages
*
p_spec
;
CAUUID
cauuid
;
HRESULT
hr
=
obj
->
QueryInterface
(
IID_ISpecifyPropertyPages
,
HRESULT
hr
=
obj
->
QueryInterface
(
IID_ISpecifyPropertyPages
,
(
void
**
)
&
p_spec
);
(
void
**
)
&
p_spec
);
if
(
SUCCEEDED
(
hr
)
)
if
(
FAILED
(
hr
)
)
return
;
{
CAUUID
cauuid
;
if
(
SUCCEEDED
(
p_spec
->
GetPages
(
&
cauuid
))
)
if
(
SUCCEEDED
(
p_spec
->
GetPages
(
&
cauuid
))
)
{
{
...
@@ -1570,12 +1571,12 @@ static void ShowPropertyPage( IUnknown *obj )
...
@@ -1570,12 +1571,12 @@ static void ShowPropertyPage( IUnknown *obj )
}
}
p_spec
->
Release
();
p_spec
->
Release
();
}
}
}
}
}
static
void
ShowDeviceProperties
(
vlc_object_t
*
p_this
,
static
void
ShowDeviceProperties
(
vlc_object_t
*
p_this
,
ICaptureGraphBuilder2
*
p_capture_graph
,
ICaptureGraphBuilder2
*
p_capture_graph
,
IBaseFilter
*
p_device_filter
,
vlc_bool_t
b_audio
)
IBaseFilter
*
p_device_filter
,
vlc_bool_t
b_audio
)
{
{
HRESULT
hr
;
HRESULT
hr
;
msg_Dbg
(
p_this
,
"Configuring Device Properties"
);
msg_Dbg
(
p_this
,
"Configuring Device Properties"
);
...
@@ -1595,7 +1596,8 @@ static void ShowDeviceProperties( vlc_object_t *p_this,
...
@@ -1595,7 +1596,8 @@ static void ShowDeviceProperties( vlc_object_t *p_this,
msg_Dbg
(
p_this
,
"Showing WDM Audio Configuration Pages"
);
msg_Dbg
(
p_this
,
"Showing WDM Audio Configuration Pages"
);
hr
=
p_capture_graph
->
FindInterface
(
&
PIN_CATEGORY_CAPTURE
,
hr
=
p_capture_graph
->
FindInterface
(
&
PIN_CATEGORY_CAPTURE
,
&
MEDIATYPE_Audio
,
p_device_filter
,
IID_IAMStreamConfig
,
&
MEDIATYPE_Audio
,
p_device_filter
,
IID_IAMStreamConfig
,
(
void
**
)
&
p_SC
);
(
void
**
)
&
p_SC
);
if
(
SUCCEEDED
(
hr
)
)
if
(
SUCCEEDED
(
hr
)
)
{
{
...
@@ -1603,7 +1605,6 @@ static void ShowDeviceProperties( vlc_object_t *p_this,
...
@@ -1603,7 +1605,6 @@ static void ShowDeviceProperties( vlc_object_t *p_this,
p_SC
->
Release
();
p_SC
->
Release
();
}
}
/*
/*
* TV Audio filter
* TV Audio filter
*/
*/
...
...
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