if (cpi->oxcf.aq_mode == CYCLIC_REFRESH_AQ &&
cpi->svc.number_spatial_layers > 1 && cpi->svc.temporal_layer_id == 0) {
CYCLIC_REFRESH *const cr = cpi->cyclic_refresh;
- signed char *temp = cr->map;
- uint8_t *temp2 = cr->last_coded_q_map;
- uint8_t *temp3 = cpi->consec_zero_mv;
- cr->map = lc->map;
- lc->map = temp;
- cr->last_coded_q_map = lc->last_coded_q_map;
- lc->last_coded_q_map = temp2;
- cpi->consec_zero_mv = lc->consec_zero_mv;
- lc->consec_zero_mv = temp3;
+ swap_ptr(&cr->map, &lc->map);
+ swap_ptr(&cr->last_coded_q_map, &lc->last_coded_q_map);
+ swap_ptr(&cpi->consec_zero_mv, &lc->consec_zero_mv);
cr->sb_index = lc->sb_index;
+ cr->actual_num_seg1_blocks = lc->actual_num_seg1_blocks;
+ cr->actual_num_seg2_blocks = lc->actual_num_seg2_blocks;
+ cr->counter_encode_maxq_scene_change = lc->counter_encode_maxq_scene_change;
}
}