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
b2af2ff7
Commit
b2af2ff7
authored
Mar 19, 2015
by
Steve Lhomme
Committed by
Jean-Baptiste Kempf
Mar 19, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MKV: fix COOK/ATRAC3 seeking
Fixes #14210 Signed-off-by:
Jean-Baptiste Kempf
<
jb@videolan.org
>
parent
e99891e7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
3 deletions
+11
-3
modules/demux/mkv/mkv.cpp
modules/demux/mkv/mkv.cpp
+4
-3
modules/demux/mkv/util.cpp
modules/demux/mkv/util.cpp
+7
-0
No files found.
modules/demux/mkv/mkv.cpp
View file @
b2af2ff7
...
@@ -595,6 +595,10 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
...
@@ -595,6 +595,10 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
{
{
memcpy
(
p_block
->
p_buffer
,
tk
->
p_compression_data
->
GetBuffer
(),
tk
->
p_compression_data
->
GetSize
()
);
memcpy
(
p_block
->
p_buffer
,
tk
->
p_compression_data
->
GetBuffer
(),
tk
->
p_compression_data
->
GetSize
()
);
}
}
if
(
b_key_picture
)
p_block
->
i_flags
|=
BLOCK_FLAG_TYPE_I
;
switch
(
tk
->
fmt
.
i_codec
)
switch
(
tk
->
fmt
.
i_codec
)
{
{
case
VLC_CODEC_COOK
:
case
VLC_CODEC_COOK
:
...
@@ -630,9 +634,6 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
...
@@ -630,9 +634,6 @@ void BlockDecode( demux_t *p_demux, KaxBlock *block, KaxSimpleBlock *simpleblock
break
;
break
;
}
}
if
(
b_key_picture
)
p_block
->
i_flags
|=
BLOCK_FLAG_TYPE_I
;
if
(
tk
->
fmt
.
i_cat
!=
VIDEO_ES
)
if
(
tk
->
fmt
.
i_cat
!=
VIDEO_ES
)
{
{
if
(
tk
->
fmt
.
i_cat
==
NAV_ES
)
if
(
tk
->
fmt
.
i_cat
==
NAV_ES
)
...
...
modules/demux/mkv/util.cpp
View file @
b2af2ff7
...
@@ -183,6 +183,13 @@ void handle_real_audio(demux_t * p_demux, mkv_track_t * p_tk, block_t * p_blk, m
...
@@ -183,6 +183,13 @@ void handle_real_audio(demux_t * p_demux, mkv_track_t * p_tk, block_t * p_blk, m
p_sys
->
p_subpackets
[
i
]
=
NULL
;
p_sys
->
p_subpackets
[
i
]
=
NULL
;
}
}
p_sys
->
i_subpacket
=
0
;
p_sys
->
i_subpacket
=
0
;
if
(
!
(
p_blk
->
i_flags
&
BLOCK_FLAG_TYPE_I
)
)
{
msg_Dbg
(
p_demux
,
"discard non-key preroll block in track %d at%"
PRId64
,
p_tk
->
i_number
,
i_pts
);
return
;
}
}
}
if
(
p_tk
->
fmt
.
i_codec
==
VLC_CODEC_COOK
||
if
(
p_tk
->
fmt
.
i_codec
==
VLC_CODEC_COOK
||
...
...
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