generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Removing unnecessary assert(delta != 0) from encode_loopfilter()."

Browse Source
This commit is contained in:
Dmitry Kovalev 2013-12-16 11:41:36 -08:00 committed by Gerrit Code Review
commit f00d4e0198
1 changed files with 6 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
vp9/encoder/vp9_bitstream.c
View File

@ -777,38 +777,27 @@ static void encode_loopfilter(struct loopfilter *lf,
vp9_wb_write_bit(wb, lf->mode_ref_delta_enabled);
if (lf->mode_ref_delta_enabled) {
// Do the deltas need to be updated
vp9_wb_write_bit(wb, lf->mode_ref_delta_update);
if (lf->mode_ref_delta_update) {
// Send update
for (i = 0; i < MAX_REF_LF_DELTAS; i++) {
const int delta = lf->ref_deltas[i];
// Frame level data
if (delta != lf->last_ref_deltas[i]) {
const int changed = delta != lf->last_ref_deltas[i];
vp9_wb_write_bit(wb, changed);
if (changed) {
lf->last_ref_deltas[i] = delta;
vp9_wb_write_bit(wb, 1);
assert(delta != 0);
vp9_wb_write_literal(wb, abs(delta) & 0x3F, 6);
vp9_wb_write_bit(wb, delta < 0);
} else {
vp9_wb_write_bit(wb, 0);
}
}
// Send update
for (i = 0; i < MAX_MODE_LF_DELTAS; i++) {
const int delta = lf->mode_deltas[i];
if (delta != lf->last_mode_deltas[i]) {
const int changed = delta != lf->last_mode_deltas[i];
vp9_wb_write_bit(wb, changed);
if (changed) {
lf->last_mode_deltas[i] = delta;
vp9_wb_write_bit(wb, 1);
assert(delta != 0);
vp9_wb_write_literal(wb, abs(delta) & 0x3F, 6);
vp9_wb_write_bit(wb, delta < 0);
} else {
vp9_wb_write_bit(wb, 0);
}
}
}