Remove comment from calls to vp9_clear_system_state.
Removed the comment "// __asm emms;" from all calls to vp9_clear_system_state. Change-Id: Ib4dae69c1cdf3f185b04184a870cd70c4d703f10
This commit is contained in:
Родитель
e3178d0c1c
Коммит
9b9c33a2b8
|
@ -1272,7 +1272,7 @@ void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, size_t *size) {
|
|||
active_section = 7;
|
||||
#endif
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
first_part_size = write_compressed_header(cpi, data);
|
||||
data += first_part_size;
|
||||
|
|
|
@ -627,7 +627,7 @@ static void rd_pick_sb_modes(VP9_COMP *cpi, const TileInfo *const tile,
|
|||
int orig_rdmult = x->rdmult;
|
||||
double rdmult_ratio;
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
rdmult_ratio = 1.0; // avoid uninitialized warnings
|
||||
|
||||
// Use the lower precision, but faster, 32x32 fdct for mode selection.
|
||||
|
@ -683,7 +683,7 @@ static void rd_pick_sb_modes(VP9_COMP *cpi, const TileInfo *const tile,
|
|||
activity_masking(cpi, x);
|
||||
|
||||
if (cpi->oxcf.aq_mode == VARIANCE_AQ) {
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
x->rdmult = round(x->rdmult * rdmult_ratio);
|
||||
} else if (cpi->oxcf.aq_mode == COMPLEXITY_AQ) {
|
||||
const int mi_offset = mi_row * cm->mi_cols + mi_col;
|
||||
|
@ -713,7 +713,7 @@ static void rd_pick_sb_modes(VP9_COMP *cpi, const TileInfo *const tile,
|
|||
if (cpi->oxcf.aq_mode == VARIANCE_AQ) {
|
||||
x->rdmult = orig_rdmult;
|
||||
if (*totalrate != INT_MAX) {
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
*totalrate = round(*totalrate * rdmult_ratio);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -495,7 +495,7 @@ void vp9_first_pass(VP9_COMP *cpi) {
|
|||
struct twopass_rc *const twopass = &cpi->twopass;
|
||||
const MV zero_mv = {0, 0};
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
vp9_setup_src_planes(x, cpi->Source, 0, 0);
|
||||
setup_pre_planes(xd, 0, lst_yv12, 0, 0, NULL);
|
||||
|
@ -544,7 +544,7 @@ void vp9_first_pass(VP9_COMP *cpi) {
|
|||
double error_weight = 1.0;
|
||||
const BLOCK_SIZE bsize = get_bsize(cm, mb_row, mb_col);
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
xd->plane[0].dst.buf = new_yv12->y_buffer + recon_yoffset;
|
||||
xd->plane[1].dst.buf = new_yv12->u_buffer + recon_uvoffset;
|
||||
|
@ -565,7 +565,7 @@ void vp9_first_pass(VP9_COMP *cpi) {
|
|||
// Do intra 16x16 prediction.
|
||||
this_error = vp9_encode_intra(x, use_dc_pred);
|
||||
if (cpi->oxcf.aq_mode == VARIANCE_AQ) {
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
this_error = (int)(this_error * error_weight);
|
||||
}
|
||||
|
||||
|
@ -601,7 +601,7 @@ void vp9_first_pass(VP9_COMP *cpi) {
|
|||
first_pass_motion_search(cpi, x, &best_ref_mv.as_mv, &mv.as_mv,
|
||||
&motion_error);
|
||||
if (cpi->oxcf.aq_mode == VARIANCE_AQ) {
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
motion_error = (int)(motion_error * error_weight);
|
||||
}
|
||||
|
||||
|
@ -612,7 +612,7 @@ void vp9_first_pass(VP9_COMP *cpi) {
|
|||
first_pass_motion_search(cpi, x, &zero_mv, &tmp_mv.as_mv,
|
||||
&tmp_err);
|
||||
if (cpi->oxcf.aq_mode == VARIANCE_AQ) {
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
tmp_err = (int)(tmp_err * error_weight);
|
||||
}
|
||||
|
||||
|
@ -633,7 +633,7 @@ void vp9_first_pass(VP9_COMP *cpi) {
|
|||
first_pass_motion_search(cpi, x, &zero_mv, &tmp_mv.as_mv,
|
||||
&gf_motion_error);
|
||||
if (cpi->oxcf.aq_mode == VARIANCE_AQ) {
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
gf_motion_error = (int)(gf_motion_error * error_weight);
|
||||
}
|
||||
|
||||
|
@ -742,10 +742,10 @@ void vp9_first_pass(VP9_COMP *cpi) {
|
|||
x->plane[2].src.buf += uv_mb_height * x->plane[1].src.stride -
|
||||
uv_mb_height * cm->mb_cols;
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
}
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
{
|
||||
FIRSTPASS_STATS fps;
|
||||
|
||||
|
@ -1409,7 +1409,7 @@ static void define_gf_group(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
|
|||
|
||||
twopass->gf_group_bits = 0;
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
start_pos = twopass->stats_in;
|
||||
|
||||
|
@ -1907,7 +1907,7 @@ static void find_next_key_frame(VP9_COMP *cpi, FIRSTPASS_STATS *this_frame) {
|
|||
|
||||
vp9_zero(next_frame);
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
start_position = twopass->stats_in;
|
||||
cpi->common.frame_type = KEY_FRAME;
|
||||
|
|
|
@ -419,7 +419,7 @@ void vp9_update_mbgraph_stats(VP9_COMP *cpi) {
|
|||
golden_ref, cpi->Source);
|
||||
}
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
separate_arf_mbs(cpi);
|
||||
}
|
||||
|
|
|
@ -2740,7 +2740,7 @@ static void output_frame_level_debug_stats(VP9_COMP *cpi) {
|
|||
FILE *const f = fopen("tmp.stt", cm->current_video_frame ? "a" : "w");
|
||||
int recon_err;
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
recon_err = vp9_calc_ss_err(cpi->Source, get_frame_new_buffer(cm));
|
||||
|
||||
|
@ -2799,7 +2799,7 @@ static void encode_without_recode_loop(VP9_COMP *cpi,
|
|||
uint8_t *dest,
|
||||
int q) {
|
||||
VP9_COMMON *const cm = &cpi->common;
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
vp9_set_quantizer(cpi, q);
|
||||
|
||||
// Set up entropy context depending on frame type. The decoder mandates
|
||||
|
@ -2828,7 +2828,7 @@ static void encode_without_recode_loop(VP9_COMP *cpi,
|
|||
// Update the skip mb flag probabilities based on the distribution
|
||||
// seen in the last encoder iteration.
|
||||
// update_base_skip_probs(cpi);
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
}
|
||||
|
||||
static void encode_with_recode_loop(VP9_COMP *cpi,
|
||||
|
@ -2852,7 +2852,7 @@ static void encode_with_recode_loop(VP9_COMP *cpi,
|
|||
&frame_over_shoot_limit);
|
||||
|
||||
do {
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
vp9_set_quantizer(cpi, q);
|
||||
|
||||
|
@ -2887,7 +2887,7 @@ static void encode_with_recode_loop(VP9_COMP *cpi,
|
|||
// seen in the last encoder iteration.
|
||||
// update_base_skip_probs(cpi);
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
// Dummy pack of the bitstream using up to date stats to get an
|
||||
// accurate estimate of output frame size to determine if we need
|
||||
|
@ -3681,7 +3681,7 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags,
|
|||
*size = 0;
|
||||
|
||||
// Clear down mmx registers
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
/* find a free buffer for the new frame, releasing the reference previously
|
||||
* held.
|
||||
|
|
|
@ -354,7 +354,7 @@ void vp9_rc_update_rate_correction_factors(VP9_COMP *cpi, int damp_var) {
|
|||
int projected_size_based_on_q = 0;
|
||||
|
||||
// Clear down mmx registers to allow floating point in what follows
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
// Work out how big we would have expected the frame to be at this Q given
|
||||
// the current correction factor.
|
||||
|
|
|
@ -274,7 +274,7 @@ void vp9_initialize_rd_consts(VP9_COMP *cpi) {
|
|||
MACROBLOCK *x = &cpi->mb;
|
||||
int qindex, i;
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
// Further tests required to see if optimum is different
|
||||
// for key frames, golden frames and arf frames.
|
||||
|
|
|
@ -44,7 +44,7 @@ unsigned int vp9_vaq_segment_id(int energy) {
|
|||
double vp9_vaq_rdmult_ratio(int energy) {
|
||||
ENERGY_IN_BOUNDS(energy);
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
return RDMULT_RATIO(energy);
|
||||
}
|
||||
|
@ -52,7 +52,7 @@ double vp9_vaq_rdmult_ratio(int energy) {
|
|||
double vp9_vaq_inv_q_ratio(int energy) {
|
||||
ENERGY_IN_BOUNDS(energy);
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
return Q_RATIO(-energy);
|
||||
}
|
||||
|
@ -63,7 +63,7 @@ void vp9_vaq_init() {
|
|||
|
||||
assert(ENERGY_SPAN <= MAX_SEGMENTS);
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
base_ratio = 1.5;
|
||||
|
||||
|
@ -88,7 +88,7 @@ void vp9_vaq_frame_setup(VP9_COMP *cpi) {
|
|||
|
||||
seg->abs_delta = SEGMENT_DELTADATA;
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
for (i = ENERGY_MIN; i <= ENERGY_MAX; i++) {
|
||||
int qindex_delta, segment_rdmult;
|
||||
|
@ -141,7 +141,7 @@ int vp9_block_energy(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs) {
|
|||
double energy;
|
||||
unsigned int var = block_variance(cpi, x, bs);
|
||||
|
||||
vp9_clear_system_state(); // __asm emms;
|
||||
vp9_clear_system_state();
|
||||
|
||||
energy = 0.9 * (log(var + 1.0) - 10.0);
|
||||
return clamp(round(energy), ENERGY_MIN, ENERGY_MAX);
|
||||
|
|
Загрузка…
Ссылка в новой задаче