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
3f4c0dad
Commit
3f4c0dad
authored
Apr 25, 2012
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffv1: move init_slice_state() into the decoder threads.
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
60217b5b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
12 deletions
+4
-12
ffv1.c
libavcodec/ffv1.c
+4
-12
No files found.
libavcodec/ffv1.c
View file @
3f4c0dad
...
...
@@ -1601,12 +1601,13 @@ static int decode_slice(AVCodecContext *c, void *arg){
AVFrame
*
const
p
=
&
f
->
picture
;
if
(
f
->
version
>
2
){
if
(
decode_slice_header
(
f
,
fs
)
<
0
)
return
AVERROR_INVALIDDATA
;
if
(
init_slice_state
(
f
,
fs
)
<
0
)
return
AVERROR
(
ENOMEM
);
if
(
decode_slice_header
(
f
,
fs
)
<
0
)
return
AVERROR_INVALIDDATA
;
}
if
(
init_slice_state
(
f
,
fs
)
<
0
)
return
AVERROR
(
ENOMEM
);
if
(
f
->
picture
.
key_frame
)
clear_slice_state
(
f
,
fs
);
width
=
fs
->
slice_width
;
...
...
@@ -1968,8 +1969,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
f
->
key_frame_ok
=
0
;
if
(
read_header
(
f
)
<
0
)
return
-
1
;
if
(
init_slices_state
(
f
)
<
0
)
return
-
1
;
f
->
key_frame_ok
=
1
;
}
else
{
if
(
!
f
->
key_frame_ok
)
{
...
...
@@ -1978,13 +1977,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, AVPac
}
p
->
key_frame
=
0
;
}
if
(
f
->
ac
>
1
){
int
i
;
for
(
i
=
1
;
i
<
256
;
i
++
){
c
->
one_state
[
i
]
=
f
->
state_transition
[
i
];
c
->
zero_state
[
256
-
i
]
=
256
-
c
->
one_state
[
i
];
}
}
p
->
reference
=
0
;
if
(
avctx
->
get_buffer
(
avctx
,
p
)
<
0
){
...
...
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