4d0ec7aacd
Add a function clip_pixel() to clip a pixel value to the [0,255] range of allowed values, and use this where-ever appropriate (e.g. prediction, reconstruction). Likewise, consistently use the recently added function clip_prob(), which calculates a binary probability in the [1,255] range. If possible, try to use get_prob() or its sister get_binary_prob() to calculate binary probabilities, for consistency. Since in some places, this means that binary probability calculations are changed (we use {255,256}*count0/(total) in a range of places, and all of these are now changed to use 256*count0+(total>>1)/total), this changes the encoding result, so this patch warrants some extensive testing. Change-Id: Ibeeff8d886496839b8e0c0ace9ccc552351f7628
188 lines
3.8 KiB
C
188 lines
3.8 KiB
C
/*
|
|
* Copyright (c) 2010 The WebM project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
|
|
#include "vpx_ports/config.h"
|
|
#include "vp9_rtcd.h"
|
|
#include "vp9/common/vp9_blockd.h"
|
|
|
|
void vp9_recon_b_c
|
|
(
|
|
unsigned char *pred_ptr,
|
|
short *diff_ptr,
|
|
unsigned char *dst_ptr,
|
|
int stride
|
|
) {
|
|
int r, c;
|
|
|
|
for (r = 0; r < 4; r++) {
|
|
for (c = 0; c < 4; c++) {
|
|
dst_ptr[c] = clip_pixel(diff_ptr[c] + pred_ptr[c]);
|
|
}
|
|
|
|
dst_ptr += stride;
|
|
diff_ptr += 16;
|
|
pred_ptr += 16;
|
|
}
|
|
}
|
|
|
|
void vp9_recon_uv_b_c
|
|
(
|
|
unsigned char *pred_ptr,
|
|
short *diff_ptr,
|
|
unsigned char *dst_ptr,
|
|
int stride
|
|
) {
|
|
int r, c;
|
|
|
|
for (r = 0; r < 4; r++) {
|
|
for (c = 0; c < 4; c++) {
|
|
dst_ptr[c] = clip_pixel(diff_ptr[c] + pred_ptr[c]);
|
|
}
|
|
|
|
dst_ptr += stride;
|
|
diff_ptr += 8;
|
|
pred_ptr += 8;
|
|
}
|
|
}
|
|
void vp9_recon4b_c
|
|
(
|
|
unsigned char *pred_ptr,
|
|
short *diff_ptr,
|
|
unsigned char *dst_ptr,
|
|
int stride
|
|
) {
|
|
int r, c;
|
|
|
|
for (r = 0; r < 4; r++) {
|
|
for (c = 0; c < 16; c++) {
|
|
dst_ptr[c] = clip_pixel(diff_ptr[c] + pred_ptr[c]);
|
|
}
|
|
|
|
dst_ptr += stride;
|
|
diff_ptr += 16;
|
|
pred_ptr += 16;
|
|
}
|
|
}
|
|
|
|
void vp9_recon2b_c
|
|
(
|
|
unsigned char *pred_ptr,
|
|
short *diff_ptr,
|
|
unsigned char *dst_ptr,
|
|
int stride
|
|
) {
|
|
int r, c;
|
|
|
|
for (r = 0; r < 4; r++) {
|
|
for (c = 0; c < 8; c++) {
|
|
dst_ptr[c] = clip_pixel(diff_ptr[c] + pred_ptr[c]);
|
|
}
|
|
|
|
dst_ptr += stride;
|
|
diff_ptr += 8;
|
|
pred_ptr += 8;
|
|
}
|
|
}
|
|
|
|
#if CONFIG_SUPERBLOCKS
|
|
void vp9_recon_mby_s_c(MACROBLOCKD *xd, uint8_t *dst) {
|
|
int x, y;
|
|
BLOCKD *b = &xd->block[0];
|
|
int stride = b->dst_stride;
|
|
short *diff = b->diff;
|
|
|
|
for (y = 0; y < 16; y++) {
|
|
for (x = 0; x < 16; x++) {
|
|
dst[x] = clip_pixel(dst[x] + diff[x]);
|
|
}
|
|
dst += stride;
|
|
diff += 16;
|
|
}
|
|
}
|
|
|
|
void vp9_recon_mbuv_s_c(MACROBLOCKD *xd, uint8_t *udst, uint8_t *vdst) {
|
|
int x, y, i;
|
|
uint8_t *dst = udst;
|
|
|
|
for (i = 0; i < 2; i++, dst = vdst) {
|
|
BLOCKD *b = &xd->block[16 + 4 * i];
|
|
int stride = b->dst_stride;
|
|
short *diff = b->diff;
|
|
|
|
for (y = 0; y < 8; y++) {
|
|
for (x = 0; x < 8; x++) {
|
|
dst[x] = clip_pixel(dst[x] + diff[x]);
|
|
}
|
|
dst += stride;
|
|
diff += 8;
|
|
}
|
|
}
|
|
}
|
|
|
|
#if CONFIG_TX32X32
|
|
void vp9_recon_sby_s_c(MACROBLOCKD *xd, uint8_t *dst) {
|
|
int x, y, stride = xd->block[0].dst_stride;
|
|
short *diff = xd->sb_coeff_data.diff;
|
|
|
|
for (y = 0; y < 32; y++) {
|
|
for (x = 0; x < 32; x++) {
|
|
dst[x] = clip_pixel(dst[x] + diff[x]);
|
|
}
|
|
dst += stride;
|
|
diff += 32;
|
|
}
|
|
}
|
|
|
|
void vp9_recon_sbuv_s_c(MACROBLOCKD *xd, uint8_t *udst, uint8_t *vdst) {
|
|
int x, y, stride = xd->block[16].dst_stride;
|
|
short *udiff = xd->sb_coeff_data.diff + 1024;
|
|
short *vdiff = xd->sb_coeff_data.diff + 1280;
|
|
|
|
for (y = 0; y < 16; y++) {
|
|
for (x = 0; x < 16; x++) {
|
|
udst[x] = clip_pixel(udst[x] + udiff[x]);
|
|
vdst[x] = clip_pixel(vdst[x] + vdiff[x]);
|
|
}
|
|
udst += stride;
|
|
vdst += stride;
|
|
udiff += 16;
|
|
vdiff += 16;
|
|
}
|
|
}
|
|
#endif
|
|
#endif
|
|
|
|
void vp9_recon_mby_c(MACROBLOCKD *xd) {
|
|
int i;
|
|
|
|
for (i = 0; i < 16; i += 4) {
|
|
BLOCKD *b = &xd->block[i];
|
|
|
|
vp9_recon4b(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
|
|
}
|
|
}
|
|
|
|
void vp9_recon_mb_c(MACROBLOCKD *xd) {
|
|
int i;
|
|
|
|
for (i = 0; i < 16; i += 4) {
|
|
BLOCKD *b = &xd->block[i];
|
|
|
|
vp9_recon4b(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
|
|
}
|
|
|
|
for (i = 16; i < 24; i += 2) {
|
|
BLOCKD *b = &xd->block[i];
|
|
|
|
vp9_recon2b(b->predictor, b->diff, *(b->base_dst) + b->dst, b->dst_stride);
|
|
}
|
|
}
|