Renaming 'Speed' to 'speed' inside VP9_COMP struct.
Change-Id: I4374b5af40ee9082ddf7956a9756a15ad9ad5436
This commit is contained in:
Родитель
80f9963232
Коммит
4be190d9d0
|
@ -35,7 +35,7 @@ static unsigned int do_16x16_motion_iteration(VP9_COMP *cpi,
|
|||
|
||||
// Further step/diamond searches as necessary
|
||||
int step_param = cpi->sf.first_step +
|
||||
(cpi->Speed < 8 ? (cpi->Speed > 5 ? 1 : 0) : 2);
|
||||
(cpi->speed < 8 ? (cpi->speed > 5 ? 1 : 0) : 2);
|
||||
|
||||
vp9_clamp_mv_min_max(x, ref_mv);
|
||||
|
||||
|
|
|
@ -695,7 +695,7 @@ static void set_rd_speed_thresholds(VP9_COMP *cpi, int mode, int speed) {
|
|||
void vp9_set_speed_features(VP9_COMP *cpi) {
|
||||
SPEED_FEATURES *sf = &cpi->sf;
|
||||
int mode = cpi->compressor_speed;
|
||||
int speed = cpi->Speed;
|
||||
int speed = cpi->speed;
|
||||
int i;
|
||||
|
||||
// Only modes 0 and 1 supported for now in experimental code basae
|
||||
|
@ -830,7 +830,7 @@ void vp9_set_speed_features(VP9_COMP *cpi) {
|
|||
cpi->mb.optimize = cpi->sf.optimize_coefficients == 1 && cpi->pass != 1;
|
||||
|
||||
#ifdef SPEEDSTATS
|
||||
frames_at_speed[cpi->Speed]++;
|
||||
frames_at_speed[cpi->speed]++;
|
||||
#endif
|
||||
}
|
||||
|
||||
|
@ -1215,7 +1215,7 @@ void vp9_change_config(VP9_PTR ptr, VP9_CONFIG *oxcf) {
|
|||
cpi->last_boosted_qindex = cpi->oxcf.fixed_q;
|
||||
}
|
||||
|
||||
cpi->Speed = cpi->oxcf.cpu_used;
|
||||
cpi->speed = cpi->oxcf.cpu_used;
|
||||
|
||||
if (cpi->oxcf.lag_in_frames == 0) {
|
||||
// force to allowlag to 0 if lag_in_frames is 0;
|
||||
|
|
|
@ -467,7 +467,7 @@ typedef struct VP9_COMP {
|
|||
// for real time encoding
|
||||
int avg_encode_time; // microsecond
|
||||
int avg_pick_mode_time; // microsecond
|
||||
int Speed;
|
||||
int speed;
|
||||
unsigned int cpu_freq; // Mhz
|
||||
int compressor_speed;
|
||||
|
||||
|
|
|
@ -2284,7 +2284,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
|
|||
best_txfm_rd[i] = INT64_MAX;
|
||||
|
||||
// Create a mask set to 1 for each frame used by a smaller resolution.
|
||||
if (cpi->Speed > 0) {
|
||||
if (cpi->speed > 0) {
|
||||
switch (block_size) {
|
||||
case BLOCK_64X64:
|
||||
for (i = 0; i < 4; i++) {
|
||||
|
@ -2324,8 +2324,8 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
|
|||
frame_mv[NEWMV][ref_frame].as_int = INVALID_MV;
|
||||
frame_mv[ZEROMV][ref_frame].as_int = 0;
|
||||
}
|
||||
if (cpi->Speed == 0
|
||||
|| (cpi->Speed > 0 && (ref_frame_mask & (1 << INTRA_FRAME)))) {
|
||||
if (cpi->speed == 0
|
||||
|| (cpi->speed > 0 && (ref_frame_mask & (1 << INTRA_FRAME)))) {
|
||||
mbmi->mode = DC_PRED;
|
||||
for (i = 0; i <= (bsize < BLOCK_SIZE_MB16X16 ? TX_4X4 :
|
||||
(bsize < BLOCK_SIZE_SB32X32 ? TX_8X8 :
|
||||
|
@ -2363,7 +2363,7 @@ int64_t vp9_rd_pick_inter_mode_sb(VP9_COMP *cpi, MACROBLOCK *x,
|
|||
|| (cpi->ref_frame_flags & flag_list[ref_frame]))) {
|
||||
continue;
|
||||
}
|
||||
if (cpi->Speed > 0) {
|
||||
if (cpi->speed > 0) {
|
||||
if (!(ref_frame_mask & (1 << ref_frame))) {
|
||||
continue;
|
||||
}
|
||||
|
|
|
@ -147,12 +147,10 @@ static int temporal_filter_find_matching_mb_c(VP9_COMP *cpi,
|
|||
xd->plane[0].pre[0].stride = arf_frame->y_stride;
|
||||
|
||||
// Further step/diamond searches as necessary
|
||||
if (cpi->Speed < 8) {
|
||||
step_param = cpi->sf.first_step +
|
||||
((cpi->Speed > 5) ? 1 : 0);
|
||||
} else {
|
||||
if (cpi->speed < 8)
|
||||
step_param = cpi->sf.first_step + ((cpi->speed > 5) ? 1 : 0);
|
||||
else
|
||||
step_param = cpi->sf.first_step + 2;
|
||||
}
|
||||
|
||||
/*cpi->sf.search_method == HEX*/
|
||||
// TODO Check that the 16x16 vf & sdf are selected here
|
||||
|
|
Загрузка…
Ссылка в новой задаче