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

Merge "Moving reaster_block_offset{,_int16} from vp9_blockd.h to vp9_rdopt.h."

Browse Source
This commit is contained in:
Dmitry Kovalev 2013-12-02 10:31:31 -08:00 committed by Gerrit Code Review
commit 526a774adb
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
vp9/common/vp9_blockd.h
View File

@ -386,19 +386,6 @@ static INLINE void foreach_transformed_block_uv(
foreach_transformed_block_in_plane(xd, bsize, plane, visit, arg); foreach_transformed_block_in_plane(xd, bsize, plane, visit, arg);
} }
static int raster_block_offset(BLOCK_SIZE plane_bsize,
int raster_block, int stride) {
const int bw = b_width_log2(plane_bsize);
const int y = 4 * (raster_block >> bw);
const int x = 4 * (raster_block & ((1 << bw) - 1));
return y * stride + x;
}
static int16_t* raster_block_offset_int16(BLOCK_SIZE plane_bsize,
int raster_block, int16_t *base) {
const int stride = 4 << b_width_log2(plane_bsize);
return base + raster_block_offset(plane_bsize, raster_block, stride);
}
static void txfrm_block_to_raster_xy(BLOCK_SIZE plane_bsize, static void txfrm_block_to_raster_xy(BLOCK_SIZE plane_bsize,
TX_SIZE tx_size, int block, TX_SIZE tx_size, int block,
int *x, int *y) { int *x, int *y) {

13
vp9/encoder/vp9_rdopt.c
View File

@ -113,6 +113,19 @@ static int rd_thresh_block_size_factor[BLOCK_SIZES] =
#define MV_COST_WEIGHT 108 #define MV_COST_WEIGHT 108
#define MV_COST_WEIGHT_SUB 120 #define MV_COST_WEIGHT_SUB 120
static int raster_block_offset(BLOCK_SIZE plane_bsize,
int raster_block, int stride) {
const int bw = b_width_log2(plane_bsize);
const int y = 4 * (raster_block >> bw);
const int x = 4 * (raster_block & ((1 << bw) - 1));
return y * stride + x;
}
static int16_t* raster_block_offset_int16(BLOCK_SIZE plane_bsize,
int raster_block, int16_t *base) {
const int stride = 4 << b_width_log2(plane_bsize);
return base + raster_block_offset(plane_bsize, raster_block, stride);
}
static void fill_mode_costs(VP9_COMP *c) { static void fill_mode_costs(VP9_COMP *c) {
VP9_COMMON *const cm = &c->common; VP9_COMMON *const cm = &c->common;
int i, j; int i, j;