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
a81cc9be
Commit
a81cc9be
authored
Jul 15, 2015
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Dshow: fix freeze
Close #14278
parent
bb15c815
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
modules/access/dshow/dshow.cpp
modules/access/dshow/dshow.cpp
+6
-3
No files found.
modules/access/dshow/dshow.cpp
View file @
a81cc9be
...
@@ -1871,7 +1871,7 @@ static int Demux( demux_t *p_demux )
...
@@ -1871,7 +1871,7 @@ static int Demux( demux_t *p_demux )
REFERENCE_TIME
i_pts
,
i_end_date
;
REFERENCE_TIME
i_pts
,
i_end_date
;
HRESULT
hr
=
sample
.
p_sample
->
GetTime
(
&
i_pts
,
&
i_end_date
);
HRESULT
hr
=
sample
.
p_sample
->
GetTime
(
&
i_pts
,
&
i_end_date
);
if
(
hr
==
S_OK
||
hr
=
=
VFW_S_NO_STOP_TIME
)
if
(
hr
!=
S_OK
&&
hr
!
=
VFW_S_NO_STOP_TIME
)
{
{
if
(
p_stream
->
mt
.
majortype
==
MEDIATYPE_Video
||
!
p_stream
->
b_pts
)
if
(
p_stream
->
mt
.
majortype
==
MEDIATYPE_Video
||
!
p_stream
->
b_pts
)
{
{
...
@@ -1879,12 +1879,15 @@ static int Demux( demux_t *p_demux )
...
@@ -1879,12 +1879,15 @@ static int Demux( demux_t *p_demux )
i_pts
=
sample
.
i_timestamp
;
i_pts
=
sample
.
i_timestamp
;
p_stream
->
b_pts
=
true
;
p_stream
->
b_pts
=
true
;
}
}
else
i_pts
=
VLC_TS_INVALID
;
}
if
(
i_pts
>
VLC_TS_INVALID
)
{
i_pts
+=
(
i_pts
>=
0
)
?
+
5
:
-
4
;
i_pts
+=
(
i_pts
>=
0
)
?
+
5
:
-
4
;
i_pts
/=
10
;
/* 100-ns to µs conversion */
i_pts
/=
10
;
/* 100-ns to µs conversion */
i_pts
+=
VLC_TS_0
;
i_pts
+=
VLC_TS_0
;
}
}
else
i_pts
=
VLC_TS_INVALID
;
#if 0
#if 0
msg_Dbg( p_demux, "Read() stream: %i, size: %i, PTS: %" PRId64,
msg_Dbg( p_demux, "Read() stream: %i, size: %i, PTS: %" PRId64,
i_stream, i_data_size, i_pts );
i_stream, i_data_size, i_pts );
...
...
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