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

Merge "CLPF: Don't assume sb size=64 and w&h multiple of 8 + valgrind fix." into nextgenv2

Browse Source
This commit is contained in:
Yaowu Xu
2016-10-11 17:44:12 +00:00
committed by Gerrit Code Review
parent 3b161e14b3 f4d41e6330
commit b5e73bddb0
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
av1/common/clpf.c
View File

@@ -14,9 +14,8 @@
int av1_clpf_maxbits(const AV1_COMMON *cm) {
return get_msb(
ALIGN_POWER_OF_TWO(cm->mi_cols * MAX_MIB_SIZE, cm->clpf_size + 4) *
ALIGN_POWER_OF_TWO(cm->mi_rows * MAX_MIB_SIZE,
cm->clpf_size + 4) >>
ALIGN_POWER_OF_TWO(cm->mi_cols * MI_SIZE, cm->clpf_size + 4) *
ALIGN_POWER_OF_TWO(cm->mi_rows * MI_SIZE, cm->clpf_size + 4) >>
(cm->clpf_size * 2 + 8)) +
1;
}
@@ -59,11 +58,11 @@ int av1_clpf_frame(const YV12_BUFFER_CONFIG *dst, const YV12_BUFFER_CONFIG *rec,
unsigned int, unsigned int, uint8_t *)) {
/* Constrained low-pass filter (CLPF) */
int c, k, l, m, n;
int width = rec->y_crop_width;
int height = rec->y_crop_height;
const int bs = MI_SIZE;
int width = cm->mi_cols * bs;
int height = cm->mi_rows * bs;
int xpos, ypos;
int stride_y = rec->y_stride;
const int bs = MAX_MIB_SIZE;
int num_fb_hor = (width + (1 << fb_size_log2) - bs) >> fb_size_log2;
int num_fb_ver = (height + (1 << fb_size_log2) - bs) >> fb_size_log2;
int block_index = 0;

2
av1/encoder/bitstream.c
View File

@@ -2602,7 +2602,7 @@ static void encode_clpf(const AV1_COMMON *cm, struct aom_write_bit_buffer *wb) {
// 50% probability, so a more efficient coding is possible.
aom_wb_write_literal(wb, cm->clpf_numblocks, av1_clpf_maxbits(cm));
for (i = 0; i < cm->clpf_numblocks; i++) {
aom_wb_write_literal(wb, cm->clpf_blocks[i], 1);
aom_wb_write_literal(wb, cm->clpf_blocks ? cm->clpf_blocks[i] : 0, 1);
}
}
}

1
av1/encoder/encoder.c
View File

@@ -4733,6 +4733,7 @@ static void encode_frame_to_data_rate(AV1_COMP *cpi, size_t *size,
#if CONFIG_CLPF
aom_free(cm->clpf_blocks);
cm->clpf_blocks = 0;
#endif
if (cm->seg.update_map) update_reference_segmentation_map(cpi);