Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
VLC
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
15
Merge Requests
15
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
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
Steve Lhomme
VLC
Commits
5e909857
Commit
5e909857
authored
Nov 03, 2004
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/access/dshow/dshow.cpp: really fix DV/PVR support this time (hopefully ;).
parent
cab0e6fb
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
9 deletions
+21
-9
modules/access/dshow/dshow.cpp
modules/access/dshow/dshow.cpp
+21
-9
No files found.
modules/access/dshow/dshow.cpp
View file @
5e909857
...
...
@@ -306,7 +306,7 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys,
/* Initialize some data */
p_sys
->
i_streams
=
0
;
p_sys
->
pp_streams
=
(
dshow_stream_t
**
)
malloc
(
1
)
;
p_sys
->
pp_streams
=
0
;
p_sys
->
i_width
=
i_width
;
p_sys
->
i_height
=
i_height
;
p_sys
->
i_chroma
=
i_chroma
;
...
...
@@ -338,10 +338,25 @@ static int CommonOpen( vlc_object_t *p_this, access_sys_t *p_sys,
p_stream
->
i_fourcc
==
VLC_FOURCC
(
'm'
,
'p'
,
'2'
,
'v'
)
)
{
b_audio
=
VLC_FALSE
;
if
(
b_access_demux
)
{
/* Let the access (only) take care of that */
return
VLC_EGENERIC
;
}
}
}
if
(
p_stream
->
mt
.
majortype
==
MEDIATYPE_Stream
)
b_audio
=
VLC_FALSE
;
if
(
p_stream
->
mt
.
majortype
==
MEDIATYPE_Stream
)
{
b_audio
=
VLC_FALSE
;
if
(
b_access_demux
)
{
/* Let the access (only) take care of that */
return
VLC_EGENERIC
;
}
}
}
if
(
b_audio
&&
OpenDevice
(
p_this
,
p_sys
,
adevname
,
1
)
!=
VLC_SUCCESS
)
...
...
@@ -493,7 +508,7 @@ static int AccessOpen( vlc_object_t *p_this )
p_access
->
p_sys
=
p_sys
=
(
access_sys_t
*
)
malloc
(
sizeof
(
access_sys_t
)
);
memset
(
p_sys
,
0
,
sizeof
(
access_sys_t
)
);
if
(
CommonOpen
(
p_this
,
p_sys
,
VLC_
TRU
E
)
!=
VLC_SUCCESS
)
if
(
CommonOpen
(
p_this
,
p_sys
,
VLC_
FALS
E
)
!=
VLC_SUCCESS
)
{
CommonClose
(
p_this
,
p_sys
);
return
VLC_EGENERIC
;
...
...
@@ -549,11 +564,8 @@ static void CommonClose( vlc_object_t *p_this, access_sys_t *p_sys )
CoUninitialize
();
/* Remove filters from graph */
for
(
int
i
=
0
;
i
<
p_sys
->
i_streams
;
i
++
)
{
delete
p_sys
->
pp_streams
[
i
];
}
free
(
p_sys
->
pp_streams
);
for
(
int
i
=
0
;
i
<
p_sys
->
i_streams
;
i
++
)
delete
p_sys
->
pp_streams
[
i
];
if
(
p_sys
->
i_streams
)
free
(
p_sys
->
pp_streams
);
vlc_mutex_destroy
(
&
p_sys
->
lock
);
vlc_cond_destroy
(
&
p_sys
->
wait
);
...
...
@@ -764,7 +776,7 @@ static int OpenDevice( vlc_object_t *p_this, access_sys_t *p_sys,
* won't add a prefered media type as this doesn't seem to work well
* -- to investigate. */
vlc_bool_t
b_stream_type
=
VLC_FALSE
;
for
(
in
t
i
=
0
;
i
<
media_count
;
i
++
)
for
(
size_
t
i
=
0
;
i
<
media_count
;
i
++
)
{
if
(
media_types
[
i
].
majortype
==
MEDIATYPE_Stream
)
{
...
...
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