Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
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
Commits
4c1d4771
Commit
4c1d4771
authored
Sep 17, 2013
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: ogg: don't try seeking using bitrate if incomplete.
Results in wrong position if only one track has bitrate info.
parent
1a5cb04e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
2 deletions
+8
-2
modules/demux/ogg.c
modules/demux/ogg.c
+7
-2
modules/demux/ogg.h
modules/demux/ogg.h
+1
-0
No files found.
modules/demux/ogg.c
View file @
4c1d4771
...
@@ -571,7 +571,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
...
@@ -571,7 +571,7 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
Ogg_ResetStreamHelper
(
p_sys
);
Ogg_ResetStreamHelper
(
p_sys
);
if
(
p_sys
->
i_bitrate
==
0
)
if
(
p_sys
->
i_bitrate
==
0
||
p_sys
->
b_partial_bitrate
)
{
{
/* we won't be able to find block by time
/* we won't be able to find block by time
* we'll need to bisect search from here
* we'll need to bisect search from here
...
@@ -1653,7 +1653,12 @@ static int Ogg_BeginningOfStream( demux_t *p_demux )
...
@@ -1653,7 +1653,12 @@ static int Ogg_BeginningOfStream( demux_t *p_demux )
es_out_Control
(
p_demux
->
out
,
ES_OUT_SET_ES
,
p_stream
->
p_es
);
es_out_Control
(
p_demux
->
out
,
ES_OUT_SET_ES
,
p_stream
->
p_es
);
}
}
p_ogg
->
i_bitrate
+=
p_stream
->
fmt
.
i_bitrate
;
if
(
p_stream
->
fmt
.
i_bitrate
==
0
&&
(
p_stream
->
fmt
.
i_cat
==
VIDEO_ES
||
p_stream
->
fmt
.
i_cat
==
AUDIO_ES
)
)
p_ogg
->
b_partial_bitrate
=
true
;
else
p_ogg
->
i_bitrate
+=
p_stream
->
fmt
.
i_bitrate
;
p_stream
->
i_pcr
=
p_stream
->
i_previous_pcr
=
p_stream
->
i_pcr
=
p_stream
->
i_previous_pcr
=
p_stream
->
i_interpolated_pcr
=
-
1
;
p_stream
->
i_interpolated_pcr
=
-
1
;
...
...
modules/demux/ogg.h
View file @
4c1d4771
...
@@ -102,6 +102,7 @@ struct demux_sys_t
...
@@ -102,6 +102,7 @@ struct demux_sys_t
/* bitrate */
/* bitrate */
int
i_bitrate
;
int
i_bitrate
;
bool
b_partial_bitrate
;
/* after reading all headers, the first data page is stuffed into the relevant stream, ready to use */
/* after reading all headers, the first data page is stuffed into the relevant stream, ready to use */
bool
b_page_waiting
;
bool
b_page_waiting
;
...
...
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