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
cb31dc35
Commit
cb31dc35
authored
Apr 05, 2005
by
Steve Lhomme
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mkv.cpp: clean & fix seeking inside virtual_segment_t
parent
164b14f0
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
17 deletions
+20
-17
modules/demux/mkv.cpp
modules/demux/mkv.cpp
+20
-17
No files found.
modules/demux/mkv.cpp
View file @
cb31dc35
...
@@ -1569,11 +1569,12 @@ bool matroska_segment_t::Select( mtime_t i_start_time )
...
@@ -1569,11 +1569,12 @@ bool matroska_segment_t::Select( mtime_t i_start_time )
}
}
sys
.
i_start_pts
=
i_start_time
;
sys
.
i_start_pts
=
i_start_time
;
ep
->
Reset
(
&
sys
.
demuxer
);
// reset the stream reading to the first cluster of the segment used
// reset the stream reading to the first cluster of the segment used
es
.
I_O
().
setFilePointer
(
i_start_pos
);
es
.
I_O
().
setFilePointer
(
i_start_pos
);
delete
ep
;
ep
=
new
EbmlParser
(
&
es
,
segment
,
&
sys
.
demuxer
);
return
true
;
return
true
;
}
}
...
@@ -1591,6 +1592,8 @@ void matroska_segment_t::UnSelect( )
...
@@ -1591,6 +1592,8 @@ void matroska_segment_t::UnSelect( )
}
}
#undef tk
#undef tk
}
}
delete
ep
;
ep
=
NULL
;
}
}
bool
virtual_segment_t
::
Select
(
input_title_t
&
title
)
bool
virtual_segment_t
::
Select
(
input_title_t
&
title
)
...
@@ -3678,12 +3681,12 @@ void matroska_segment_t::Seek( mtime_t i_date, mtime_t i_time_offset )
...
@@ -3678,12 +3681,12 @@ void matroska_segment_t::Seek( mtime_t i_date, mtime_t i_time_offset )
msg_Dbg
(
&
sys
.
demuxer
,
"seek got "
I64Fd
" (%d%%)"
,
msg_Dbg
(
&
sys
.
demuxer
,
"seek got "
I64Fd
" (%d%%)"
,
i_seek_time
,
(
int
)(
100
*
i_seek_position
/
stream_Size
(
sys
.
demuxer
.
s
)
)
);
i_seek_time
,
(
int
)(
100
*
i_seek_position
/
stream_Size
(
sys
.
demuxer
.
s
)
)
);
es
.
I_O
().
setFilePointer
(
i_seek_position
,
seek_beginning
);
delete
ep
;
delete
ep
;
ep
=
new
EbmlParser
(
&
es
,
segment
,
&
sys
.
demuxer
);
ep
=
new
EbmlParser
(
&
es
,
segment
,
&
sys
.
demuxer
);
cluster
=
NULL
;
cluster
=
NULL
;
es
.
I_O
().
setFilePointer
(
i_seek_position
,
seek_beginning
);
sys
.
i_start_pts
=
i_date
;
sys
.
i_start_pts
=
i_date
;
es_out_Control
(
sys
.
demuxer
.
out
,
ES_OUT_RESET_PCR
);
es_out_Control
(
sys
.
demuxer
.
out
,
ES_OUT_RESET_PCR
);
...
...
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