Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Guillaume Martres
aom-rav1e
Commits
de5cb8b1
Commit
de5cb8b1
authored
Oct 04, 2013
by
Jim Bankoski
Browse files
vp9_encodeframe.c cpplint issues resolved
Change-Id: Id9d837e062d9c4a94def4b4ed1f49a67c75d3618
parent
1ab60f7b
Changes
1
Hide whitespace changes
Inline
Side-by-side
vp9/encoder/vp9_encodeframe.c
View file @
de5cb8b1
...
...
@@ -173,8 +173,9 @@ static void calc_av_activity(VP9_COMP *cpi, int64_t activity_sum) {
tmp
=
sortlist
[
j
-
1
];
sortlist
[
j
-
1
]
=
sortlist
[
j
];
sortlist
[
j
]
=
tmp
;
}
else
break
;
}
else
{
break
;
}
}
}
...
...
@@ -246,13 +247,11 @@ static void calc_activity_index(VP9_COMP *cpi, MACROBLOCK *x) {
#if OUTPUT_NORM_ACT_STATS
fprintf
(
f
,
"
\n
"
);
#endif
}
#if OUTPUT_NORM_ACT_STATS
fclose
(
f
);
#endif
}
#endif // USE_ACT_INDEX
...
...
@@ -317,7 +316,6 @@ static void build_activity_map(VP9_COMP *cpi) {
// Calculate an activity index number of each mb
calc_activity_index
(
cpi
,
x
);
#endif
}
// Macroblock activity masking
...
...
@@ -684,7 +682,7 @@ static PICK_MODE_CONTEXT *get_block_context(MACROBLOCK *x, BLOCK_SIZE bsize) {
return
&
x
->
ab4x4_context
[
xd
->
sb_index
][
xd
->
mb_index
][
xd
->
b_index
];
default:
assert
(
0
);
return
NULL
;
return
NULL
;
}
}
...
...
@@ -701,7 +699,7 @@ static BLOCK_SIZE *get_sb_partitioning(MACROBLOCK *x, BLOCK_SIZE bsize) {
return
&
x
->
b_partitioning
[
xd
->
sb_index
][
xd
->
mb_index
][
xd
->
b_index
];
default:
assert
(
0
);
return
NULL
;
return
NULL
;
}
}
...
...
@@ -2012,7 +2010,6 @@ static void encode_frame_internal(VP9_COMP *cpi) {
// Keep record of the total distortion this time around for future use
cpi->last_frame_distortion = cpi->frame_distortion;
#endif
}
static
int
check_dual_ref_flags
(
VP9_COMP
*
cpi
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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