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
d9befadb
Commit
d9befadb
authored
May 15, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: asf: check only active tracks within video/audio
or pcr update could never happen
parent
91376f84
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
4 deletions
+16
-4
modules/demux/asf/asf.c
modules/demux/asf/asf.c
+16
-4
No files found.
modules/demux/asf/asf.c
View file @
d9befadb
...
@@ -85,7 +85,7 @@ typedef struct
...
@@ -85,7 +85,7 @@ typedef struct
asf_object_stream_properties_t
*
p_sp
;
asf_object_stream_properties_t
*
p_sp
;
asf_object_extended_stream_properties_t
*
p_esp
;
asf_object_extended_stream_properties_t
*
p_esp
;
mtime_t
i_time
;
mtime_t
i_time
;
/* track time*/
block_t
*
p_frame
;
/* use to gather complete frame */
block_t
*
p_frame
;
/* use to gather complete frame */
}
asf_track_t
;
}
asf_track_t
;
...
@@ -514,10 +514,22 @@ static mtime_t GetMoviePTS( demux_sys_t *p_sys )
...
@@ -514,10 +514,22 @@ static mtime_t GetMoviePTS( demux_sys_t *p_sys )
{
{
const
asf_track_t
*
tk
=
p_sys
->
track
[
i
];
const
asf_track_t
*
tk
=
p_sys
->
track
[
i
];
if
(
tk
&&
tk
->
p_es
&&
tk
->
i_time
>
0
&&
tk
->
b_selected
)
if
(
tk
&&
tk
->
p_es
&&
tk
->
b_selected
)
{
{
if
(
i_time
<
0
)
i_time
=
tk
->
i_time
;
/* Skip discrete tracks */
else
i_time
=
__MIN
(
i_time
,
tk
->
i_time
);
if
(
tk
->
i_cat
!=
VIDEO_ES
&&
tk
->
i_cat
!=
AUDIO_ES
)
continue
;
/* We need to have all ES seen once, as they might have lower DTS */
if
(
tk
->
i_time
+
(
int64_t
)
p_sys
->
p_fp
->
i_preroll
*
1000
<
0
)
{
/* early fail */
return
-
1
;
}
else
if
(
i_time
==
-
1
||
i_time
>
tk
->
i_time
)
{
i_time
=
tk
->
i_time
;
}
}
}
}
}
...
...
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