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
6fb815bb
Commit
6fb815bb
authored
Nov 09, 2013
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: asf: Use pts as track time instead of dts
Use pts as track time, and then for pcr.
parent
87fcede4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
14 additions
and
4 deletions
+14
-4
modules/demux/asf/asf.c
modules/demux/asf/asf.c
+14
-4
No files found.
modules/demux/asf/asf.c
View file @
6fb815bb
...
...
@@ -514,14 +514,22 @@ static void SendPacket(demux_t *p_demux, asf_track_t *tk)
block_t
*
p_gather
=
block_ChainGather
(
tk
->
p_frame
);
if
(
p_gather
->
i_
d
ts
>
VLC_TS_INVALID
)
tk
->
i_time
=
p_gather
->
i_
d
ts
-
VLC_TS_0
;
if
(
p_gather
->
i_
p
ts
>
VLC_TS_INVALID
)
tk
->
i_time
=
p_gather
->
i_
p
ts
-
VLC_TS_0
;
if
(
p_sys
->
i_time
<
0
)
es_out_Control
(
p_demux
->
out
,
ES_OUT_SET_PCR
,
p_gather
->
i_dts
);
{
es_out_Control
(
p_demux
->
out
,
ES_OUT_SET_PCR
,
p_gather
->
i_pts
);
#ifdef ASF_DEBUG
msg_Dbg
(
p_demux
,
"setting PCR to %"
PRId64
,
p_gather
->
i_pts
);
#endif
}
es_out_Send
(
p_demux
->
out
,
tk
->
p_es
,
p_gather
);
#ifdef ASF_DEBUG
msg_Dbg
(
p_demux
,
"sending packet dts %"
PRId64
" %"
PRId64
,
p_gather
->
i_dts
,
p_gather
->
i_pts
);
#endif
es_out_Send
(
p_demux
->
out
,
tk
->
p_es
,
p_gather
);
tk
->
p_frame
=
NULL
;
}
...
...
@@ -641,6 +649,8 @@ static int DemuxPayload(demux_t *p_demux, struct asf_packet_t *pkt, int i_payloa
"payload(%d) stream_number:%"
PRIu8
" media_object_number:%d media_object_offset:%"
PRIu32
" replicated_data_length:%"
PRIu32
" payload_data_length %"
PRIu32
,
i_payload
+
1
,
i_stream_number
,
i_media_object_number
,
i_media_object_offset
,
i_replicated_data_length
,
i_payload_data_length
);
msg_Dbg
(
p_demux
,
" pts=%"
PRId64
" st=%"
PRIu32
,
i_pts
,
pkt
->
send_time
);
#endif
asf_track_t
*
tk
=
p_sys
->
track
[
i_stream_number
];
...
...
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