Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
312daa15
Commit
312daa15
authored
Nov 11, 2014
by
Luca Barbato
Committed by
Vittorio Giovara
Nov 21, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
vp9: Use the correct upper bound for seg_id
And use a macro to make apparent why the value. Bug-Id: CID 1108595
parent
d466d82f
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
2 deletions
+4
-2
vp9.h
libavcodec/vp9.h
+2
-1
vp9block.c
libavcodec/vp9block.c
+2
-1
No files found.
libavcodec/vp9.h
View file @
312daa15
...
@@ -313,6 +313,7 @@ typedef struct VP9Context {
...
@@ -313,6 +313,7 @@ typedef struct VP9Context {
uint8_t
temporal
;
uint8_t
temporal
;
uint8_t
absolute_vals
;
uint8_t
absolute_vals
;
uint8_t
update_map
;
uint8_t
update_map
;
#define MAX_SEGMENT 8
struct
{
struct
{
uint8_t
q_enabled
;
uint8_t
q_enabled
;
uint8_t
lf_enabled
;
uint8_t
lf_enabled
;
...
@@ -323,7 +324,7 @@ typedef struct VP9Context {
...
@@ -323,7 +324,7 @@ typedef struct VP9Context {
int8_t
lf_val
;
int8_t
lf_val
;
int16_t
qmul
[
2
][
2
];
int16_t
qmul
[
2
][
2
];
uint8_t
lflvl
[
4
][
2
];
uint8_t
lflvl
[
4
][
2
];
}
feat
[
8
];
}
feat
[
MAX_SEGMENT
];
}
segmentation
;
}
segmentation
;
struct
{
struct
{
unsigned
log2_tile_cols
,
log2_tile_rows
;
unsigned
log2_tile_cols
,
log2_tile_rows
;
...
...
libavcodec/vp9block.c
View file @
312daa15
...
@@ -71,7 +71,8 @@ static void decode_mode(VP9Context *s, VP9Block *const b)
...
@@ -71,7 +71,8 @@ static void decode_mode(VP9Context *s, VP9Block *const b)
vp56_rac_get_prob_branchy
(
&
s
->
c
,
vp56_rac_get_prob_branchy
(
&
s
->
c
,
s
->
prob
.
segpred
[
s
->
above_segpred_ctx
[
col
]
+
s
->
prob
.
segpred
[
s
->
above_segpred_ctx
[
col
]
+
s
->
left_segpred_ctx
[
row7
]])))
{
s
->
left_segpred_ctx
[
row7
]])))
{
int
pred
=
8
,
x
;
int
pred
=
MAX_SEGMENT
-
1
;
int
x
;
for
(
y
=
0
;
y
<
h4
;
y
++
)
for
(
y
=
0
;
y
<
h4
;
y
++
)
for
(
x
=
0
;
x
<
w4
;
x
++
)
for
(
x
=
0
;
x
<
w4
;
x
++
)
...
...
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