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

Revert "Align frame size to 8 instead of 16."

Browse Source 
This reverts commit c2574414d4

Change-Id: Ie9013cb0bb43e639e01b4588f630b1da59295d38
This commit is contained in:
Ronald S. Bultje 2013-06-07 08:59:27 -07:00 committed by Gerrit Code Review
parent c2574414d4
commit e7d306aae6
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
vp9/common/vp9_alloccommon.c
View File

@ -68,8 +68,8 @@ void vp9_free_frame_buffers(VP9_COMMON *oci) {
}
static void set_mb_mi(VP9_COMMON *cm, int aligned_width, int aligned_height) {
cm->mb_cols = (aligned_width + 8) >> 4;
cm->mb_rows = (aligned_height + 8) >> 4;
cm->mb_cols = aligned_width >> 4;
cm->mb_rows = aligned_height >> 4;
cm->MBs = cm->mb_rows * cm->mb_cols;
cm->mi_cols = aligned_width >> LOG2_MI_SIZE;
@ -95,8 +95,8 @@ int vp9_alloc_frame_buffers(VP9_COMMON *oci, int width, int height) {
int i, mi_cols;
// Our internal buffers are always multiples of 16
const int aligned_width = multiple8(width);
const int aligned_height = multiple8(height);
const int aligned_width = multiple16(width);
const int aligned_height = multiple16(height);
const int ss_x = oci->subsampling_x;
const int ss_y = oci->subsampling_y;
@ -222,8 +222,8 @@ void vp9_initialize_common() {
}
void vp9_update_frame_size(VP9_COMMON *cm) {
const int aligned_width = multiple8(cm->width);
const int aligned_height = multiple8(cm->height);
const int aligned_width = multiple16(cm->width);
const int aligned_height = multiple16(cm->height);
set_mb_mi(cm, aligned_width, aligned_height);
setup_mi(cm);

4
vp9/common/vp9_common.h
View File

@ -56,8 +56,8 @@ static INLINE double fclamp(double value, double low, double high) {
return value < low ? low : (value > high ? high : value);
}
static INLINE int multiple8(int value) {
return (value + 7) & ~7;
static INLINE int multiple16(int value) {
return (value + 15) & ~15;
}
#define SYNC_CODE_0 0x49

2
vp9/vp9_iface_common.h
View File

@ -29,7 +29,7 @@ static void yuvconfig2image(vpx_image_t *img, const YV12_BUFFER_CONFIG *yv12,
img->fmt = VPX_IMG_FMT_I420;
}
img->w = yv12->y_stride;
img->h = multiple8(yv12->y_height + 2 * VP9BORDERINPIXELS);
img->h = multiple16(yv12->y_height + 2 * VP9BORDERINPIXELS);
img->d_w = yv12->y_crop_width;
img->d_h = yv12->y_crop_height;
img->x_chroma_shift = yv12->uv_width < yv12->y_width;