Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
8f3eebd6
Commit
8f3eebd6
authored
Apr 10, 2011
by
Clément Bœsch
Committed by
Luca Barbato
Apr 15, 2011
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
oggdec: simplify audio chained ogg streams support
Signed-off-by:
Luca Barbato
<
lu_zero@gentoo.org
>
parent
f668afd4
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
8 deletions
+1
-8
oggdec.c
libavformat/oggdec.c
+1
-7
oggdec.h
libavformat/oggdec.h
+0
-1
No files found.
libavformat/oggdec.c
View file @
8f3eebd6
...
@@ -164,7 +164,6 @@ ogg_new_stream (AVFormatContext * s, uint32_t serial)
...
@@ -164,7 +164,6 @@ ogg_new_stream (AVFormatContext * s, uint32_t serial)
os
->
bufsize
=
DECODER_BUFFER_SIZE
;
os
->
bufsize
=
DECODER_BUFFER_SIZE
;
os
->
buf
=
av_malloc
(
os
->
bufsize
);
os
->
buf
=
av_malloc
(
os
->
bufsize
);
os
->
header
=
-
1
;
os
->
header
=
-
1
;
os
->
page_begin
=
1
;
st
=
av_new_stream
(
s
,
idx
);
st
=
av_new_stream
(
s
,
idx
);
if
(
!
st
)
if
(
!
st
)
...
@@ -242,8 +241,7 @@ ogg_read_page (AVFormatContext * s, int *str)
...
@@ -242,8 +241,7 @@ ogg_read_page (AVFormatContext * s, int *str)
idx
=
ogg_find_stream
(
ogg
,
serial
);
idx
=
ogg_find_stream
(
ogg
,
serial
);
if
(
idx
<
0
){
if
(
idx
<
0
){
for
(
i
=
0
;
i
<
ogg
->
nstreams
;
i
++
)
{
if
(
ogg
->
headers
)
{
if
(
!
ogg
->
streams
[
i
].
page_begin
)
{
int
n
;
int
n
;
for
(
n
=
0
;
n
<
ogg
->
nstreams
;
n
++
)
{
for
(
n
=
0
;
n
<
ogg
->
nstreams
;
n
++
)
{
...
@@ -252,8 +250,6 @@ ogg_read_page (AVFormatContext * s, int *str)
...
@@ -252,8 +250,6 @@ ogg_read_page (AVFormatContext * s, int *str)
}
}
ogg
->
curidx
=
-
1
;
ogg
->
curidx
=
-
1
;
ogg
->
nstreams
=
0
;
ogg
->
nstreams
=
0
;
break
;
}
}
}
idx
=
ogg_new_stream
(
s
,
serial
);
idx
=
ogg_new_stream
(
s
,
serial
);
if
(
idx
<
0
)
if
(
idx
<
0
)
...
@@ -261,8 +257,6 @@ ogg_read_page (AVFormatContext * s, int *str)
...
@@ -261,8 +257,6 @@ ogg_read_page (AVFormatContext * s, int *str)
}
}
os
=
ogg
->
streams
+
idx
;
os
=
ogg
->
streams
+
idx
;
if
(
!
(
flags
&
OGG_FLAG_BOS
))
os
->
page_begin
=
0
;
os
->
page_pos
=
avio_tell
(
bc
)
-
27
;
os
->
page_pos
=
avio_tell
(
bc
)
-
27
;
if
(
os
->
psize
>
0
)
if
(
os
->
psize
>
0
)
...
...
libavformat/oggdec.h
View file @
8f3eebd6
...
@@ -75,7 +75,6 @@ struct ogg_stream {
...
@@ -75,7 +75,6 @@ struct ogg_stream {
int
incomplete
;
///< whether we're expecting a continuation in the next page
int
incomplete
;
///< whether we're expecting a continuation in the next page
int
page_end
;
///< current packet is the last one completed in the page
int
page_end
;
///< current packet is the last one completed in the page
int
keyframe_seek
;
int
keyframe_seek
;
int
page_begin
;
///< set to 1 if the stream only received a begin-of-stream packet, otherwise 0
void
*
private
;
void
*
private
;
};
};
...
...
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