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

Merge "Add a speed feature for intra filter search" into nextgenv2

Browse Source
This commit is contained in:
Hui Su
2016-02-05 18:49:24 +00:00
committed by Gerrit Code Review
parent 48b2713553 5b618b7cae
commit e5bd08185a
2 changed files with 38 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
vp10/common/blockd.h
View File

@@ -401,6 +401,7 @@ static const int ext_tx_used_inter[EXT_TX_SETS_INTER][TX_TYPES] = {
#define MAX_ANGLE_DELTAS 3 #define MAX_ANGLE_DELTAS 3
#define ANGLE_FAST_SEARCH 1 #define ANGLE_FAST_SEARCH 1
#define ANGLE_SKIP_THRESH 0.10 #define ANGLE_SKIP_THRESH 0.10
#define FILTER_FAST_SEARCH 1
static uint8_t mode_to_angle_map[INTRA_MODES] = { static uint8_t mode_to_angle_map[INTRA_MODES] = {
0, 90, 180, 45, 135, 111, 157, 203, 67, 0, 0, 90, 180, 45, 135, 111, 157, 203, 67, 0,

40
vp10/encoder/rdopt.c
View File

@@ -1837,7 +1837,8 @@ static int64_t rd_pick_intra_angle_sby(VP10_COMP *cpi, MACROBLOCK *x,
p_angle = mode_to_angle_map[mbmi->mode] + p_angle = mode_to_angle_map[mbmi->mode] +
mbmi->angle_delta[0] * ANGLE_STEP; mbmi->angle_delta[0] * ANGLE_STEP;
for (filter = INTRA_FILTER_LINEAR; filter < INTRA_FILTERS; ++filter) { for (filter = INTRA_FILTER_LINEAR; filter < INTRA_FILTERS; ++filter) {
if (!pick_intra_filter(p_angle) && filter != INTRA_FILTER_LINEAR) if ((FILTER_FAST_SEARCH || !pick_intra_filter(p_angle)) &&
filter != INTRA_FILTER_LINEAR)
continue; continue;
mic->mbmi.intra_filter = filter; mic->mbmi.intra_filter = filter;
super_block_yrd(cpi, x, &this_rate_tokenonly, &this_distortion, super_block_yrd(cpi, x, &this_rate_tokenonly, &this_distortion,
@@ -1878,7 +1879,8 @@ static int64_t rd_pick_intra_angle_sby(VP10_COMP *cpi, MACROBLOCK *x,
mbmi->angle_delta[0] * ANGLE_STEP; mbmi->angle_delta[0] * ANGLE_STEP;
for (filter = INTRA_FILTER_LINEAR; filter < INTRA_FILTERS; ++filter) { for (filter = INTRA_FILTER_LINEAR; filter < INTRA_FILTERS; ++filter) {
mic->mbmi.intra_filter = filter; mic->mbmi.intra_filter = filter;
if (!pick_intra_filter(p_angle) && filter != INTRA_FILTER_LINEAR) if ((FILTER_FAST_SEARCH || !pick_intra_filter(p_angle)) &&
filter != INTRA_FILTER_LINEAR)
continue; continue;
super_block_yrd(cpi, x, &this_rate_tokenonly, &this_distortion, super_block_yrd(cpi, x, &this_rate_tokenonly, &this_distortion,
&s, NULL, bsize, best_rd); &s, NULL, bsize, best_rd);
@@ -1909,7 +1911,8 @@ static int64_t rd_pick_intra_angle_sby(VP10_COMP *cpi, MACROBLOCK *x,
mbmi->angle_delta[0] * ANGLE_STEP; mbmi->angle_delta[0] * ANGLE_STEP;
for (filter = INTRA_FILTER_LINEAR; filter < INTRA_FILTERS; ++filter) { for (filter = INTRA_FILTER_LINEAR; filter < INTRA_FILTERS; ++filter) {
mic->mbmi.intra_filter = filter; mic->mbmi.intra_filter = filter;
if (!pick_intra_filter(p_angle) && filter != INTRA_FILTER_LINEAR) if ((FILTER_FAST_SEARCH || !pick_intra_filter(p_angle)) &&
filter != INTRA_FILTER_LINEAR)
continue; continue;
super_block_yrd(cpi, x, &this_rate_tokenonly, &this_distortion, super_block_yrd(cpi, x, &this_rate_tokenonly, &this_distortion,
&s, NULL, bsize, best_rd); &s, NULL, bsize, best_rd);
@@ -1935,6 +1938,37 @@ static int64_t rd_pick_intra_angle_sby(VP10_COMP *cpi, MACROBLOCK *x,
} }
} }
if (FILTER_FAST_SEARCH && *rate_tokenonly < INT_MAX) {
mbmi->angle_delta[0] = best_angle_delta;
p_angle = mode_to_angle_map[mbmi->mode] +
mbmi->angle_delta[0] * ANGLE_STEP;
if (pick_intra_filter(p_angle)) {
for (filter = INTRA_FILTER_LINEAR + 1; filter < INTRA_FILTERS; ++filter) {
mic->mbmi.intra_filter = filter;
super_block_yrd(cpi, x, &this_rate_tokenonly, &this_distortion,
&s, NULL, bsize, best_rd);
if (this_rate_tokenonly == INT_MAX)
continue;
this_rate = this_rate_tokenonly + rate_overhead +
cpi->intra_filter_cost[intra_filter_ctx][filter];
this_rd = RDCOST(x->rdmult, x->rddiv, this_rate, this_distortion);
if (this_rd < best_rd) {
best_rd = this_rd;
best_angle_delta = mbmi->angle_delta[0];
best_tx_size = mbmi->tx_size;
best_filter = mbmi->intra_filter;
best_tx_type = mbmi->tx_type;
*rate = this_rate;
*rate_tokenonly = this_rate_tokenonly;
*distortion = this_distortion;
*skippable = s;
}
}
}
}
mbmi->tx_size = best_tx_size; mbmi->tx_size = best_tx_size;
mbmi->angle_delta[0] = best_angle_delta; mbmi->angle_delta[0] = best_angle_delta;
mic->mbmi.intra_filter = best_filter; mic->mbmi.intra_filter = best_filter;