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

Added placeholder for real time mode

Browse Source 
Change-Id: I203d10f76c7ca78d875eaae15557cd765c6240d1
This commit is contained in:
Yaowu Xu 2014-01-06 11:51:18 -08:00
parent a9deec4389
commit a2c01ed5b4
3 changed files with 187 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

185
vp9/encoder/vp9_onyx_if.c
View File

@ -592,6 +592,181 @@ static void set_rd_speed_thresholds_sub8x8(VP9_COMP *cpi, int mode) {
sf->thresh_mult_sub8x8[THR_COMP_GA] = INT_MAX; sf->thresh_mult_sub8x8[THR_COMP_GA] = INT_MAX;
} }
static void set_rt_speed_feature(VP9_COMMON *cm,
SPEED_FEATURES *sf,
int speed) {
sf->static_segmentation = 0;
sf->use_avoid_tested_higherror = 1;
sf->adaptive_rd_thresh = 1;
sf->recode_loop = (speed < 1);
if (speed >= 1) {
sf->use_square_partition_only = !frame_is_intra_only(cm);
sf->less_rectangular_check = 1;
sf->tx_size_search_method =
frame_is_intra_only(cm) ? USE_FULL_RD : USE_LARGESTALL;
if (MIN(cm->width, cm->height) >= 720)
sf->disable_split_mask = cm->show_frame ?
DISABLE_ALL_SPLIT :
DISABLE_ALL_INTER_SPLIT;
else
sf->disable_split_mask = DISABLE_COMPOUND_SPLIT;
sf->use_rd_breakout = 1;
sf->adaptive_motion_search = 1;
sf->adaptive_pred_filter_type = 1;
sf->auto_mv_step_size = 1;
sf->adaptive_rd_thresh = 2;
sf->recode_loop = 2;
sf->intra_y_mode_mask[TX_32X32] = INTRA_DC_H_V;
sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC_H_V;
sf->intra_uv_mode_mask[TX_16X16] = INTRA_DC_H_V;
}
if (speed >= 2) {
sf->use_square_partition_only = !frame_is_intra_only(cm);
sf->less_rectangular_check = 1;
sf->tx_size_search_method =
frame_is_intra_only(cm) ? USE_FULL_RD : USE_LARGESTALL;
if (MIN(cm->width, cm->height) >= 720)
sf->disable_split_mask = cm->show_frame ?
DISABLE_ALL_SPLIT :
DISABLE_ALL_INTER_SPLIT;
else
sf->disable_split_mask = LAST_AND_INTRA_SPLIT_ONLY;
sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH
| FLAG_SKIP_INTRA_BESTINTER | FLAG_SKIP_COMP_BESTINTRA
| FLAG_SKIP_INTRA_LOWVAR;
sf->use_rd_breakout = 1;
sf->adaptive_motion_search = 1;
sf->adaptive_pred_filter_type = 2;
sf->auto_mv_step_size = 1;
sf->disable_filter_search_var_thresh = 50;
sf->comp_inter_joint_search_thresh = BLOCK_SIZES;
sf->auto_min_max_partition_size = 1;
sf->use_lastframe_partitioning = LAST_FRAME_PARTITION_LOW_MOTION;
sf->adjust_partitioning_from_last_frame = 1;
sf->last_partitioning_redo_frequency = 3;
sf->adaptive_rd_thresh = 2;
sf->recode_loop = 2;
sf->use_lp32x32fdct = 1;
sf->mode_skip_start = 11;
sf->intra_y_mode_mask[TX_32X32] = INTRA_DC_H_V;
sf->intra_y_mode_mask[TX_16X16] = INTRA_DC_H_V;
sf->intra_uv_mode_mask[TX_32X32] = INTRA_DC_H_V;
sf->intra_uv_mode_mask[TX_16X16] = INTRA_DC_H_V;
}
if (speed >= 3) {
sf->use_square_partition_only = 1;
sf->tx_size_search_method = USE_LARGESTALL;
if (MIN(cm->width, cm->height) >= 720)
sf->disable_split_mask = DISABLE_ALL_SPLIT;
else
sf->disable_split_mask = DISABLE_ALL_INTER_SPLIT;
sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH
| FLAG_SKIP_INTRA_BESTINTER | FLAG_SKIP_COMP_BESTINTRA
| FLAG_SKIP_INTRA_LOWVAR;
sf->use_rd_breakout = 1;
sf->adaptive_motion_search = 1;
sf->adaptive_pred_filter_type = 2;
sf->auto_mv_step_size = 1;
sf->disable_filter_search_var_thresh = 100;
sf->comp_inter_joint_search_thresh = BLOCK_SIZES;
sf->auto_min_max_partition_size = 1;
sf->use_lastframe_partitioning = LAST_FRAME_PARTITION_ALL;
sf->adjust_partitioning_from_last_frame = 1;
sf->last_partitioning_redo_frequency = 3;
sf->use_uv_intra_rd_estimate = 1;
sf->skip_encode_sb = 1;
sf->use_lp32x32fdct = 1;
sf->subpel_iters_per_step = 1;
sf->use_fast_coef_updates = 2;
sf->adaptive_rd_thresh = 4;
sf->mode_skip_start = 6;
}
if (speed >= 4) {
sf->use_square_partition_only = 1;
sf->tx_size_search_method = USE_LARGESTALL;
sf->disable_split_mask = DISABLE_ALL_SPLIT;
sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH
| FLAG_SKIP_INTRA_BESTINTER | FLAG_SKIP_COMP_BESTINTRA
| FLAG_SKIP_COMP_REFMISMATCH | FLAG_SKIP_INTRA_LOWVAR
| FLAG_EARLY_TERMINATE;
sf->use_rd_breakout = 1;
sf->adaptive_motion_search = 1;
sf->adaptive_pred_filter_type = 2;
sf->auto_mv_step_size = 1;
sf->disable_filter_search_var_thresh = 200;
sf->comp_inter_joint_search_thresh = BLOCK_SIZES;
sf->auto_min_max_partition_size = 1;
sf->use_lastframe_partitioning = LAST_FRAME_PARTITION_ALL;
sf->adjust_partitioning_from_last_frame = 1;
sf->last_partitioning_redo_frequency = 3;
sf->use_uv_intra_rd_estimate = 1;
sf->skip_encode_sb = 1;
sf->use_lp32x32fdct = 1;
sf->subpel_iters_per_step = 1;
sf->use_fast_coef_updates = 2;
sf->adaptive_rd_thresh = 4;
sf->mode_skip_start = 6;
/* sf->intra_y_mode_mask = INTRA_DC_ONLY;
sf->intra_uv_mode_mask = INTRA_DC_ONLY;
sf->search_method = BIGDIA;
sf->disable_split_var_thresh = 64;
sf->disable_filter_search_var_thresh = 64; */
}
if (speed >= 5) {
int i;
sf->comp_inter_joint_search_thresh = BLOCK_SIZES;
sf->use_one_partition_size_always = 1;
sf->always_this_block_size = BLOCK_16X16;
sf->tx_size_search_method =
frame_is_intra_only(cm) ? USE_FULL_RD : USE_LARGESTALL;
sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH
| FLAG_SKIP_INTRA_BESTINTER | FLAG_SKIP_COMP_BESTINTRA
| FLAG_SKIP_COMP_REFMISMATCH | FLAG_SKIP_INTRA_LOWVAR
| FLAG_EARLY_TERMINATE;
sf->use_rd_breakout = 1;
sf->use_lp32x32fdct = 1;
sf->optimize_coefficients = 0;
sf->auto_mv_step_size = 1;
// sf->reduce_first_step_size = 1;
// sf->reference_masking = 1;
sf->disable_split_mask = DISABLE_ALL_SPLIT;
sf->search_method = HEX;
sf->subpel_iters_per_step = 1;
sf->disable_split_var_thresh = 64;
sf->disable_filter_search_var_thresh = 500;
for (i = 0; i < TX_SIZES; i++) {
sf->intra_y_mode_mask[i] = INTRA_DC_ONLY;
sf->intra_uv_mode_mask[i] = INTRA_DC_ONLY;
}
sf->use_fast_coef_updates = 2;
sf->adaptive_rd_thresh = 4;
sf->mode_skip_start = 6;
}
}
void vp9_set_speed_features(VP9_COMP *cpi) { void vp9_set_speed_features(VP9_COMP *cpi) {
SPEED_FEATURES *sf = &cpi->sf; SPEED_FEATURES *sf = &cpi->sf;
VP9_COMMON *cm = &cpi->common; VP9_COMMON *cm = &cpi->common;
@ -599,9 +774,9 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
int speed = cpi->speed; int speed = cpi->speed;
int i; int i;
// Only modes 0 and 1 supported for now in experimental code basae // Convert negative speed to positive
if (mode > 1) if (speed < 0)
mode = 1; speed = -speed;
for (i = 0; i < MAX_MODES; ++i) for (i = 0; i < MAX_MODES; ++i)
cpi->mode_chosen_counts[i] = 0; cpi->mode_chosen_counts[i] = 0;
@ -663,6 +838,7 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
break; break;
case 1: case 1:
#if CONFIG_MULTIPLE_ARF #if CONFIG_MULTIPLE_ARF
// Switch segmentation off. // Switch segmentation off.
sf->static_segmentation = 0; sf->static_segmentation = 0;
@ -844,6 +1020,9 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
sf->mode_skip_start = 6; sf->mode_skip_start = 6;
} }
break; break;
case 2:
set_rt_speed_feature(cm, sf, speed);
break;
}; /* switch */ }; /* switch */
// Set rd thresholds based on mode and speed setting // Set rd thresholds based on mode and speed setting

16
warnings.c
View File

@ -71,14 +71,6 @@ static int continue_prompt(int num_warnings) {
return c == 'y'; return c == 'y';
} }
static void check_lag_in_frames_realtime_deadline(
int lag_in_frames,
int deadline,
struct WarningList *warning_list) {
if (deadline == VPX_DL_REALTIME && lag_in_frames != 0)
add_warning(lag_in_frames_with_realtime, warning_list);
}
static void check_quantizer(int min_q, int max_q, static void check_quantizer(int min_q, int max_q,
struct WarningList *warning_list) { struct WarningList *warning_list) {
const int lossless = min_q == 0 && max_q == 0; const int lossless = min_q == 0 && max_q == 0;
@ -88,7 +80,7 @@ static void check_quantizer(int min_q, int max_q,
void check_encoder_config(int disable_prompt, void check_encoder_config(int disable_prompt,
const struct VpxEncoderConfig *global_config, const struct VpxEncoderConfig *global_config,
const struct vpx_codec_enc_cfg *stream_config) { struct vpx_codec_enc_cfg *stream_config) {
int num_warnings = 0; int num_warnings = 0;
struct WarningListNode *warning = NULL; struct WarningListNode *warning = NULL;
struct WarningList warning_list = {0}; struct WarningList warning_list = {0};
@ -96,9 +88,9 @@ void check_encoder_config(int disable_prompt,
check_quantizer(stream_config->rc_min_quantizer, check_quantizer(stream_config->rc_min_quantizer,
stream_config->rc_max_quantizer, stream_config->rc_max_quantizer,
&warning_list); &warning_list);
check_lag_in_frames_realtime_deadline(stream_config->g_lag_in_frames,
global_config->deadline, if (global_config->deadline == VPX_DL_REALTIME)
&warning_list); stream_config->g_lag_in_frames = 0;
/* Count and print warnings. */ /* Count and print warnings. */
for (warning = warning_list.warning_node; for (warning = warning_list.warning_node;

2
warnings.h
View File

@ -20,6 +20,6 @@ struct VpxEncoderConfig;
*/ */
void check_encoder_config(int disable_prompt, void check_encoder_config(int disable_prompt,
const struct VpxEncoderConfig *global_config, const struct VpxEncoderConfig *global_config,
const struct vpx_codec_enc_cfg *stream_config); struct vpx_codec_enc_cfg *stream_config);
#endif // WARNINGS_H_ #endif // WARNINGS_H_