Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
4302a97d
Commit
4302a97d
authored
Oct 28, 2004
by
Gildas Bazin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
* modules/access/dshow: some more debug messages.
parent
3c9ff429
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
3 deletions
+12
-3
modules/access/dshow/dshow.cpp
modules/access/dshow/dshow.cpp
+11
-2
modules/access/dshow/filter.cpp
modules/access/dshow/filter.cpp
+1
-1
No files found.
modules/access/dshow/dshow.cpp
View file @
4302a97d
...
@@ -1115,7 +1115,7 @@ static size_t EnumDeviceCaps( vlc_object_t *p_this, IBaseFilter *p_filter,
...
@@ -1115,7 +1115,7 @@ static size_t EnumDeviceCaps( vlc_object_t *p_this, IBaseFilter *p_filter,
AM_MEDIA_TYPE
*
p_mt
;
AM_MEDIA_TYPE
*
p_mt
;
while
(
p_enummt
->
Next
(
1
,
&
p_mt
,
NULL
)
==
S_OK
)
while
(
p_enummt
->
Next
(
1
,
&
p_mt
,
NULL
)
==
S_OK
)
{
{
int
i_current_fourcc
=
GetFourCCFromMediaType
(
*
p_mt
);
int
i_current_fourcc
=
GetFourCCFromMediaType
(
*
p_mt
);
if
(
i_current_fourcc
&&
p_mt
->
majortype
==
MEDIATYPE_Video
)
if
(
i_current_fourcc
&&
p_mt
->
majortype
==
MEDIATYPE_Video
)
{
{
int
i_current_width
=
p_mt
->
pbFormat
?
int
i_current_width
=
p_mt
->
pbFormat
?
...
@@ -1188,6 +1188,10 @@ static size_t EnumDeviceCaps( vlc_object_t *p_this, IBaseFilter *p_filter,
...
@@ -1188,6 +1188,10 @@ static size_t EnumDeviceCaps( vlc_object_t *p_this, IBaseFilter *p_filter,
}
}
else
if
(
i_current_fourcc
&&
p_mt
->
majortype
==
MEDIATYPE_Stream
)
else
if
(
i_current_fourcc
&&
p_mt
->
majortype
==
MEDIATYPE_Stream
)
{
{
msg_Dbg
(
p_this
,
"EnumDeviceCaps: input pin "
"accepts stream format: %4.4s"
,
(
char
*
)
&
i_current_fourcc
);
if
(
(
!
i_fourcc
||
i_fourcc
==
i_current_fourcc
)
&&
if
(
(
!
i_fourcc
||
i_fourcc
==
i_current_fourcc
)
&&
mt_count
<
mt_max
)
mt_count
<
mt_max
)
{
{
...
@@ -1199,7 +1203,12 @@ static size_t EnumDeviceCaps( vlc_object_t *p_this, IBaseFilter *p_filter,
...
@@ -1199,7 +1203,12 @@ static size_t EnumDeviceCaps( vlc_object_t *p_this, IBaseFilter *p_filter,
}
}
else
else
{
{
msg_Dbg
(
p_this
,
"EnumDeviceCaps: input pin: unknown format"
);
char
*
psz_type
=
"unknown"
;
if
(
p_mt
->
majortype
==
MEDIATYPE_Video
)
psz_type
=
"video"
;
if
(
p_mt
->
majortype
==
MEDIATYPE_Audio
)
psz_type
=
"audio"
;
if
(
p_mt
->
majortype
==
MEDIATYPE_Stream
)
psz_type
=
"stream"
;
msg_Dbg
(
p_this
,
"EnumDeviceCaps: input pin: unknown format "
"(%s %4.4s)"
,
psz_type
,
(
char
*
)
&
p_mt
->
subtype
);
FreeMediaType
(
*
p_mt
);
FreeMediaType
(
*
p_mt
);
}
}
CoTaskMemFree
(
(
PVOID
)
p_mt
);
CoTaskMemFree
(
(
PVOID
)
p_mt
);
...
...
modules/access/dshow/filter.cpp
View file @
4302a97d
...
@@ -219,7 +219,7 @@ int GetFourCCFromMediaType( const AM_MEDIA_TYPE &media_type )
...
@@ -219,7 +219,7 @@ int GetFourCCFromMediaType( const AM_MEDIA_TYPE &media_type )
if
(
media_type
.
majortype
==
MEDIATYPE_Video
)
if
(
media_type
.
majortype
==
MEDIATYPE_Video
)
{
{
/* currently only support this type of video info format */
/* currently only support this type of video info format */
if
(
media_type
.
formattype
==
FORMAT_VideoInfo
)
if
(
1
/* media_type.formattype == FORMAT_VideoInfo */
)
{
{
/* Packed RGB formats */
/* Packed RGB formats */
if
(
media_type
.
subtype
==
MEDIASUBTYPE_RGB1
)
if
(
media_type
.
subtype
==
MEDIASUBTYPE_RGB1
)
...
...
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