Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
7d78d2e4
Commit
7d78d2e4
authored
Apr 02, 2005
by
Steve Lhomme
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mkv.cpp: the segment start time is now an integer in microseconds
parent
70f70fd0
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
modules/demux/mkv.cpp
modules/demux/mkv.cpp
+6
-6
No files found.
modules/demux/mkv.cpp
View file @
7d78d2e4
...
...
@@ -385,7 +385,7 @@ public:
,
es
(
estream
)
,
i_timescale
(
MKVD_TIMECODESCALE
)
,
f_duration
(
-
1.0
)
,
f_start_time
(
0.
0
)
,
i_start_time
(
0
)
,
i_cues_position
(
-
1
)
,
i_chapters_position
(
-
1
)
,
i_tags_position
(
-
1
)
...
...
@@ -462,7 +462,7 @@ public:
/* duration of the segment */
float
f_duration
;
float
f
_start_time
;
mtime_t
i
_start_time
;
/* all tracks */
std
::
vector
<
mkv_track_t
*>
tracks
;
...
...
@@ -3077,7 +3077,7 @@ void matroska_segment_t::ParseCluster( )
}
}
f_start_time
=
cluster
->
GlobalTimecode
()
/
1000000.
0
;
i_start_time
=
cluster
->
GlobalTimecode
()
/
100
0
;
}
/*****************************************************************************
...
...
@@ -3532,7 +3532,7 @@ float virtual_segment_t::Duration() const
matroska_segment_t
*
p_last_segment
=
linked_segments
[
linked_segments
.
size
()
-
1
];
// p_last_segment->ParseCluster( );
f_duration
=
p_last_segment
->
f_start_time
+
p_last_segment
->
f_duration
;
f_duration
=
p_last_segment
->
i_start_time
/
1000
+
p_last_segment
->
f_duration
;
}
return
f_duration
;
}
...
...
@@ -3567,7 +3567,7 @@ void matroska_segment_t::Seek( mtime_t i_date, mtime_t i_time_offset )
int64_t
i_block_ref2
;
size_t
i_track
;
int64_t
i_seek_position
=
i_start_pos
;
int64_t
i_seek_time
=
f_start_time
*
1000
;
int64_t
i_seek_time
=
i_start_time
;
if
(
i_index
>
0
)
{
...
...
@@ -3688,7 +3688,7 @@ void virtual_segment_t::Seek( demux_t & demuxer, mtime_t i_date, mtime_t i_time_
// find the best matching segment
for
(
i
=
0
;
i
<
linked_segments
.
size
();
i
++
)
{
if
(
i_date
<
linked_segments
[
i
]
->
f_start_time
*
1000.0
)
if
(
i_date
<
linked_segments
[
i
]
->
i_start_time
)
break
;
}
...
...
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