Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
25a8f939
Commit
25a8f939
authored
Oct 08, 2008
by
Laurent Aimar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improved a bit PCR in asf.
parent
53f3c079
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
modules/demux/asf/asf.c
modules/demux/asf/asf.c
+6
-3
No files found.
modules/demux/asf/asf.c
View file @
25a8f939
...
@@ -179,6 +179,7 @@ static int Demux( demux_t *p_demux )
...
@@ -179,6 +179,7 @@ static int Demux( demux_t *p_demux )
_
(
"VLC failed to load the ASF header."
)
);
_
(
"VLC failed to load the ASF header."
)
);
return
0
;
return
0
;
}
}
es_out_Control
(
p_demux
->
out
,
ES_OUT_RESET_PCR
);
continue
;
continue
;
}
}
}
}
...
@@ -203,7 +204,7 @@ static int Demux( demux_t *p_demux )
...
@@ -203,7 +204,7 @@ static int Demux( demux_t *p_demux )
p_sys
->
i_time
=
GetMoviePTS
(
p_sys
);
p_sys
->
i_time
=
GetMoviePTS
(
p_sys
);
if
(
p_sys
->
i_time
>=
0
)
if
(
p_sys
->
i_time
>=
0
)
{
{
es_out_Control
(
p_demux
->
out
,
ES_OUT_SET_PCR
,
p_sys
->
i_time
);
es_out_Control
(
p_demux
->
out
,
ES_OUT_SET_PCR
,
p_sys
->
i_time
+
1
);
}
}
return
1
;
return
1
;
...
@@ -346,6 +347,7 @@ static mtime_t GetMoviePTS( demux_sys_t *p_sys )
...
@@ -346,6 +347,7 @@ static mtime_t GetMoviePTS( demux_sys_t *p_sys )
{
{
if
(
i_time
<
0
)
i_time
=
tk
->
i_time
;
if
(
i_time
<
0
)
i_time
=
tk
->
i_time
;
else
i_time
=
__MIN
(
i_time
,
tk
->
i_time
);
else
i_time
=
__MIN
(
i_time
,
tk
->
i_time
);
break
;
}
}
}
}
...
@@ -580,6 +582,9 @@ static int DemuxPacket( demux_t *p_demux )
...
@@ -580,6 +582,9 @@ static int DemuxPacket( demux_t *p_demux )
/* send complete packet to decoder */
/* send complete packet to decoder */
block_t
*
p_gather
=
block_ChainGather
(
tk
->
p_frame
);
block_t
*
p_gather
=
block_ChainGather
(
tk
->
p_frame
);
if
(
p_sys
->
i_time
<
0
)
es_out_Control
(
p_demux
->
out
,
ES_OUT_SET_PCR
,
tk
->
i_time
);
es_out_Send
(
p_demux
->
out
,
tk
->
p_es
,
p_gather
);
es_out_Send
(
p_demux
->
out
,
tk
->
p_es
,
p_gather
);
tk
->
p_frame
=
NULL
;
tk
->
p_frame
=
NULL
;
...
@@ -1013,8 +1018,6 @@ static int DemuxInit( demux_t *p_demux )
...
@@ -1013,8 +1018,6 @@ static int DemuxInit( demux_t *p_demux )
}
}
}
}
#endif
#endif
es_out_Control
(
p_demux
->
out
,
ES_OUT_RESET_PCR
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
error:
error:
...
...
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