Commit a8a08ce5 authored by Alex Converse's avatar Alex Converse
Browse files

Move vp9_systemdependent.h to vpx_ports bitops.h and system_state.h

Use system_state.h in vpx_dsp and remove unneeded includes of
vp9_systemdependent.h.

Change-Id: I92557ec6dd5aa790160b4f31fe7967db0d7ec3c4
parent 29d0cc24
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
#include "vp9/common/vp9_entropymode.h" #include "vp9/common/vp9_entropymode.h"
#include "vp9/common/vp9_entropymv.h" #include "vp9/common/vp9_entropymv.h"
#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vp9/common/vp9_systemdependent.h"
// TODO(hkuang): Don't need to lock the whole pool after implementing atomic // TODO(hkuang): Don't need to lock the whole pool after implementing atomic
// frame reference count. // frame reference count.
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#include "vpx_dsp/vpx_dsp_common.h" #include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vp9/common/vp9_systemdependent.h" #include "vpx_ports/bitops.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
......
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
#include "./vpx_dsp_rtcd.h" #include "./vpx_dsp_rtcd.h"
#include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#include "vp9/common/vp9_idct.h" #include "vp9/common/vp9_idct.h"
#include "vp9/common/vp9_systemdependent.h"
#include "vpx_dsp/inv_txfm.h" #include "vpx_dsp/inv_txfm.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
......
...@@ -17,12 +17,12 @@ ...@@ -17,12 +17,12 @@
#include "./vp9_rtcd.h" #include "./vp9_rtcd.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/system_state.h"
#include "vpx_scale/vpx_scale.h" #include "vpx_scale/vpx_scale.h"
#include "vpx_scale/yv12config.h" #include "vpx_scale/yv12config.h"
#include "vp9/common/vp9_onyxc_int.h" #include "vp9/common/vp9_onyxc_int.h"
#include "vp9/common/vp9_postproc.h" #include "vp9/common/vp9_postproc.h"
#include "vp9/common/vp9_systemdependent.h"
#include "vp9/common/vp9_textblit.h" #include "vp9/common/vp9_textblit.h"
#if CONFIG_VP9_POSTPROC #if CONFIG_VP9_POSTPROC
...@@ -544,7 +544,7 @@ static void fillrd(struct postproc_state *state, int q, int a) { ...@@ -544,7 +544,7 @@ static void fillrd(struct postproc_state *state, int q, int a) {
double sigma; double sigma;
int ai = a, qi = q, i; int ai = a, qi = q, i;
vp9_clear_system_state(); vpx_clear_system_state();
sigma = ai + .5 + .6 * (63 - qi) / 63.0; sigma = ai + .5 + .6 * (63 - qi) / 63.0;
...@@ -638,7 +638,7 @@ int vp9_post_proc_frame(struct VP9Common *cm, ...@@ -638,7 +638,7 @@ int vp9_post_proc_frame(struct VP9Common *cm,
return 0; return 0;
} }
vp9_clear_system_state(); vpx_clear_system_state();
// Alloc memory for prev_mip in the first frame. // Alloc memory for prev_mip in the first frame.
if (cm->current_video_frame == 1) { if (cm->current_video_frame == 1) {
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "./vpx_scale_rtcd.h" #include "./vpx_scale_rtcd.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/system_state.h"
#include "vpx_ports/vpx_once.h" #include "vpx_ports/vpx_once.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
#include "vpx_scale/vpx_scale.h" #include "vpx_scale/vpx_scale.h"
...@@ -30,7 +31,6 @@ ...@@ -30,7 +31,6 @@
#endif #endif
#include "vp9/common/vp9_quant_common.h" #include "vp9/common/vp9_quant_common.h"
#include "vp9/common/vp9_reconintra.h" #include "vp9/common/vp9_reconintra.h"
#include "vp9/common/vp9_systemdependent.h"
#include "vp9/decoder/vp9_decodeframe.h" #include "vp9/decoder/vp9_decodeframe.h"
#include "vp9/decoder/vp9_decoder.h" #include "vp9/decoder/vp9_decoder.h"
...@@ -365,7 +365,7 @@ int vp9_receive_compressed_data(VP9Decoder *pbi, ...@@ -365,7 +365,7 @@ int vp9_receive_compressed_data(VP9Decoder *pbi,
decrease_ref_count(cm->new_fb_idx, frame_bufs, pool); decrease_ref_count(cm->new_fb_idx, frame_bufs, pool);
unlock_buffer_pool(pool); unlock_buffer_pool(pool);
vp9_clear_system_state(); vpx_clear_system_state();
return -1; return -1;
} }
...@@ -374,7 +374,7 @@ int vp9_receive_compressed_data(VP9Decoder *pbi, ...@@ -374,7 +374,7 @@ int vp9_receive_compressed_data(VP9Decoder *pbi,
swap_frame_buffers(pbi); swap_frame_buffers(pbi);
vp9_clear_system_state(); vpx_clear_system_state();
if (!cm->show_existing_frame) { if (!cm->show_existing_frame) {
cm->last_show_frame = cm->show_frame; cm->last_show_frame = cm->show_frame;
...@@ -440,7 +440,7 @@ int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd, ...@@ -440,7 +440,7 @@ int vp9_get_raw_frame(VP9Decoder *pbi, YV12_BUFFER_CONFIG *sd,
*sd = *cm->frame_to_show; *sd = *cm->frame_to_show;
ret = 0; ret = 0;
#endif /*!CONFIG_POSTPROC*/ #endif /*!CONFIG_POSTPROC*/
vp9_clear_system_state(); vpx_clear_system_state();
return ret; return ret;
} }
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
#include "vpx_ports/system_state.h"
#include "vp9/encoder/vp9_aq_complexity.h" #include "vp9/encoder/vp9_aq_complexity.h"
#include "vp9/encoder/vp9_aq_variance.h" #include "vp9/encoder/vp9_aq_variance.h"
...@@ -47,7 +48,7 @@ void vp9_setup_in_frame_q_adj(VP9_COMP *cpi) { ...@@ -47,7 +48,7 @@ void vp9_setup_in_frame_q_adj(VP9_COMP *cpi) {
struct segmentation *const seg = &cm->seg; struct segmentation *const seg = &cm->seg;
// Make SURE use of floating point in this function is safe. // Make SURE use of floating point in this function is safe.
vp9_clear_system_state(); vpx_clear_system_state();
if (cm->frame_type == KEY_FRAME || if (cm->frame_type == KEY_FRAME ||
cpi->refresh_alt_ref_frame || cpi->refresh_alt_ref_frame ||
...@@ -133,7 +134,7 @@ void vp9_caq_select_segment(VP9_COMP *cpi, MACROBLOCK *mb, BLOCK_SIZE bs, ...@@ -133,7 +134,7 @@ void vp9_caq_select_segment(VP9_COMP *cpi, MACROBLOCK *mb, BLOCK_SIZE bs,
double low_var_thresh; double low_var_thresh;
const int aq_strength = get_aq_c_strength(cm->base_qindex, cm->bit_depth); const int aq_strength = get_aq_c_strength(cm->base_qindex, cm->bit_depth);
vp9_clear_system_state(); vpx_clear_system_state();
low_var_thresh = (cpi->oxcf.pass == 2) low_var_thresh = (cpi->oxcf.pass == 2)
? MAX(cpi->twopass.mb_av_energy, MIN_DEFAULT_LV_THRESH) ? MAX(cpi->twopass.mb_av_energy, MIN_DEFAULT_LV_THRESH)
: DEFAULT_LV_THRESH; : DEFAULT_LV_THRESH;
......
...@@ -11,6 +11,8 @@ ...@@ -11,6 +11,8 @@
#include <limits.h> #include <limits.h>
#include <math.h> #include <math.h>
#include "vpx_ports/system_state.h"
#include "vp9/encoder/vp9_aq_cyclicrefresh.h" #include "vp9/encoder/vp9_aq_cyclicrefresh.h"
#include "vp9/common/vp9_seg_common.h" #include "vp9/common/vp9_seg_common.h"
...@@ -506,7 +508,7 @@ void vp9_cyclic_refresh_setup(VP9_COMP *const cpi) { ...@@ -506,7 +508,7 @@ void vp9_cyclic_refresh_setup(VP9_COMP *const cpi) {
int qindex_delta = 0; int qindex_delta = 0;
int qindex2; int qindex2;
const double q = vp9_convert_qindex_to_q(cm->base_qindex, cm->bit_depth); const double q = vp9_convert_qindex_to_q(cm->base_qindex, cm->bit_depth);
vp9_clear_system_state(); vpx_clear_system_state();
// Set rate threshold to some multiple (set to 2 for now) of the target // Set rate threshold to some multiple (set to 2 for now) of the target
// rate (target is given by sb64_target_rate and scaled by 256). // rate (target is given by sb64_target_rate and scaled by 256).
cr->thresh_rate_sb = ((int64_t)(rc->sb64_target_rate) << 8) << 2; cr->thresh_rate_sb = ((int64_t)(rc->sb64_target_rate) << 8) << 2;
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <math.h> #include <math.h>
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/system_state.h"
#include "vp9/encoder/vp9_aq_variance.h" #include "vp9/encoder/vp9_aq_variance.h"
...@@ -19,7 +20,6 @@ ...@@ -19,7 +20,6 @@
#include "vp9/encoder/vp9_ratectrl.h" #include "vp9/encoder/vp9_ratectrl.h"
#include "vp9/encoder/vp9_rd.h" #include "vp9/encoder/vp9_rd.h"
#include "vp9/encoder/vp9_segmentation.h" #include "vp9/encoder/vp9_segmentation.h"
#include "vp9/common/vp9_systemdependent.h"
#define ENERGY_MIN (-4) #define ENERGY_MIN (-4)
#define ENERGY_MAX (1) #define ENERGY_MAX (1)
...@@ -56,7 +56,7 @@ void vp9_vaq_frame_setup(VP9_COMP *cpi) { ...@@ -56,7 +56,7 @@ void vp9_vaq_frame_setup(VP9_COMP *cpi) {
seg->abs_delta = SEGMENT_DELTADATA; seg->abs_delta = SEGMENT_DELTADATA;
vp9_clear_system_state(); vpx_clear_system_state();
for (i = 0; i < MAX_SEGMENTS; ++i) { for (i = 0; i < MAX_SEGMENTS; ++i) {
int qindex_delta = int qindex_delta =
...@@ -191,7 +191,7 @@ static unsigned int block_variance(VP9_COMP *cpi, MACROBLOCK *x, ...@@ -191,7 +191,7 @@ static unsigned int block_variance(VP9_COMP *cpi, MACROBLOCK *x,
double vp9_log_block_var(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs) { double vp9_log_block_var(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs) {
unsigned int var = block_variance(cpi, x, bs); unsigned int var = block_variance(cpi, x, bs);
vp9_clear_system_state(); vpx_clear_system_state();
return log(var + 1.0); return log(var + 1.0);
} }
...@@ -199,7 +199,7 @@ double vp9_log_block_var(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs) { ...@@ -199,7 +199,7 @@ double vp9_log_block_var(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs) {
int vp9_block_energy(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs) { int vp9_block_energy(VP9_COMP *cpi, MACROBLOCK *x, BLOCK_SIZE bs) {
double energy; double energy;
double energy_midpoint; double energy_midpoint;
vp9_clear_system_state(); vpx_clear_system_state();
energy_midpoint = energy_midpoint =
(cpi->oxcf.pass == 2) ? cpi->twopass.mb_av_energy : DEFAULT_E_MIDPOINT; (cpi->oxcf.pass == 2) ? cpi->twopass.mb_av_energy : DEFAULT_E_MIDPOINT;
energy = vp9_log_block_var(cpi, x, bs) - energy_midpoint; energy = vp9_log_block_var(cpi, x, bs) - energy_midpoint;
......
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
#include "vpx_dsp/bitwriter_buffer.h" #include "vpx_dsp/bitwriter_buffer.h"
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vpx_ports/mem_ops.h" #include "vpx_ports/mem_ops.h"
#include "vpx_ports/system_state.h"
#include "vp9/common/vp9_entropy.h" #include "vp9/common/vp9_entropy.h"
#include "vp9/common/vp9_entropymode.h" #include "vp9/common/vp9_entropymode.h"
...@@ -23,7 +24,6 @@ ...@@ -23,7 +24,6 @@
#include "vp9/common/vp9_mvref_common.h" #include "vp9/common/vp9_mvref_common.h"
#include "vp9/common/vp9_pred_common.h" #include "vp9/common/vp9_pred_common.h"
#include "vp9/common/vp9_seg_common.h" #include "vp9/common/vp9_seg_common.h"
#include "vp9/common/vp9_systemdependent.h"
#include "vp9/common/vp9_tile_common.h" #include "vp9/common/vp9_tile_common.h"
#include "vp9/encoder/vp9_cost.h" #include "vp9/encoder/vp9_cost.h"
...@@ -1240,7 +1240,7 @@ void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, size_t *size) { ...@@ -1240,7 +1240,7 @@ void vp9_pack_bitstream(VP9_COMP *cpi, uint8_t *dest, size_t *size) {
uncompressed_hdr_size = vpx_wb_bytes_written(&wb); uncompressed_hdr_size = vpx_wb_bytes_written(&wb);
data += uncompressed_hdr_size; data += uncompressed_hdr_size;
vp9_clear_system_state(); vpx_clear_system_state();
first_part_size = write_compressed_header(cpi, data); first_part_size = write_compressed_header(cpi, data);
data += first_part_size; data += first_part_size;
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include "vpx_dsp/vpx_convolve.h" #include "vpx_dsp/vpx_convolve.h"
#include "vpx_dsp/vpx_filter.h" #include "vpx_dsp/vpx_filter.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/system_state.h"
static int horizontal_filter(const uint8_t *s) { static int horizontal_filter(const uint8_t *s) {
return (s[1] - s[-2]) * 2 + (s[-1] - s[0]) * 6; return (s[1] - s[-2]) * 2 + (s[-1] - s[0]) * 6;
...@@ -123,7 +124,7 @@ double vp9_get_blockiness(const unsigned char *img1, int img1_pitch, ...@@ -123,7 +124,7 @@ double vp9_get_blockiness(const unsigned char *img1, int img1_pitch,
int width, int height ) { int width, int height ) {
double blockiness = 0; double blockiness = 0;
int i, j; int i, j;
vp9_clear_system_state(); vpx_clear_system_state();
for (i = 0; i < height; i += 4, img1 += img1_pitch * 4, for (i = 0; i < height; i += 4, img1 += img1_pitch * 4,
img2 += img2_pitch * 4) { img2 += img2_pitch * 4) {
for (j = 0; j < width; j += 4) { for (j = 0; j < width; j += 4) {
......
...@@ -17,7 +17,6 @@ ...@@ -17,7 +17,6 @@
#include "vp9/common/vp9_blockd.h" #include "vp9/common/vp9_blockd.h"
#include "vp9/common/vp9_idct.h" #include "vp9/common/vp9_idct.h"
#include "vp9/common/vp9_systemdependent.h"
#include "vpx_dsp/fwd_txfm.h" #include "vpx_dsp/fwd_txfm.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
......
...@@ -18,6 +18,7 @@ ...@@ -18,6 +18,7 @@
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
#include "vpx_ports/system_state.h"
#include "vp9/common/vp9_common.h" #include "vp9/common/vp9_common.h"
#include "vp9/common/vp9_entropy.h" #include "vp9/common/vp9_entropy.h"
...@@ -29,7 +30,6 @@ ...@@ -29,7 +30,6 @@
#include "vp9/common/vp9_reconintra.h" #include "vp9/common/vp9_reconintra.h"
#include "vp9/common/vp9_reconinter.h" #include "vp9/common/vp9_reconinter.h"
#include "vp9/common/vp9_seg_common.h" #include "vp9/common/vp9_seg_common.h"
#include "vp9/common/vp9_systemdependent.h"
#include "vp9/common/vp9_tile_common.h" #include "vp9/common/vp9_tile_common.h"
#include "vp9/encoder/vp9_aq_complexity.h" #include "vp9/encoder/vp9_aq_complexity.h"
...@@ -1152,7 +1152,7 @@ static int set_segment_rdmult(VP9_COMP *const cpi, ...@@ -1152,7 +1152,7 @@ static int set_segment_rdmult(VP9_COMP *const cpi,
int segment_qindex; int segment_qindex;
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
vp9_init_plane_quantizers(cpi, x); vp9_init_plane_quantizers(cpi, x);
vp9_clear_system_state(); vpx_clear_system_state();
segment_qindex = vp9_get_qindex(&cm->seg, segment_id, segment_qindex = vp9_get_qindex(&cm->seg, segment_id,
cm->base_qindex); cm->base_qindex);
return vp9_compute_rd_mult(cpi, segment_qindex + cm->y_dc_delta_q); return vp9_compute_rd_mult(cpi, segment_qindex + cm->y_dc_delta_q);
...@@ -1173,7 +1173,7 @@ static void rd_pick_sb_modes(VP9_COMP *cpi, ...@@ -1173,7 +1173,7 @@ static void rd_pick_sb_modes(VP9_COMP *cpi,
const AQ_MODE aq_mode = cpi->oxcf.aq_mode; const AQ_MODE aq_mode = cpi->oxcf.aq_mode;
int i, orig_rdmult; int i, orig_rdmult;
vp9_clear_system_state(); vpx_clear_system_state();
// Use the lower precision, but faster, 32x32 fdct for mode selection. // Use the lower precision, but faster, 32x32 fdct for mode selection.
x->use_lp32x32fdct = 1; x->use_lp32x32fdct = 1;
......
...@@ -21,7 +21,6 @@ ...@@ -21,7 +21,6 @@
#include "vp9/common/vp9_reconinter.h" #include "vp9/common/vp9_reconinter.h"
#include "vp9/common/vp9_reconintra.h" #include "vp9/common/vp9_reconintra.h"
#include "vp9/common/vp9_scan.h" #include "vp9/common/vp9_scan.h"
#include "vp9/common/vp9_systemdependent.h"
#include "vp9/encoder/vp9_encodemb.h" #include "vp9/encoder/vp9_encodemb.h"
#include "vp9/encoder/vp9_rd.h" #include "vp9/encoder/vp9_rd.h"
......
...@@ -12,7 +12,6 @@ ...@@ -12,7 +12,6 @@
#include "vp9/common/vp9_common.h" #include "vp9/common/vp9_common.h"
#include "vp9/common/vp9_entropymode.h" #include "vp9/common/vp9_entropymode.h"
#include "vp9/common/vp9_systemdependent.h"
#include "vp9/encoder/vp9_cost.h" #include "vp9/encoder/vp9_cost.h"
#include "vp9/encoder/vp9_encodemv.h" #include "vp9/encoder/vp9_encodemv.h"
......
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
#include "vpx_dsp/ssim.h" #include "vpx_dsp/ssim.h"
#endif #endif
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx_ports/system_state.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
#include "vpx_scale/vpx_scale.h" #include "vpx_scale/vpx_scale.h"
...@@ -33,7 +34,6 @@ ...@@ -33,7 +34,6 @@
#endif #endif
#include "vp9/common/vp9_reconinter.h" #include "vp9/common/vp9_reconinter.h"
#include "vp9/common/vp9_reconintra.h" #include "vp9/common/vp9_reconintra.h"
#include "vp9/common/vp9_systemdependent.h"
#include "vp9/common/vp9_tile_common.h" #include "vp9/common/vp9_tile_common.h"
#include "vp9/encoder/vp9_aq_complexity.h" #include "vp9/encoder/vp9_aq_complexity.h"
...@@ -1926,7 +1926,7 @@ void vp9_remove_compressor(VP9_COMP *cpi) { ...@@ -1926,7 +1926,7 @@ void vp9_remove_compressor(VP9_COMP *cpi) {
if (cpi && (cm->current_video_frame > 0)) { if (cpi && (cm->current_video_frame > 0)) {
#if CONFIG_INTERNAL_STATS #if CONFIG_INTERNAL_STATS
vp9_clear_system_state(); vpx_clear_system_state();
if (cpi->oxcf.pass != 1) { if (cpi->oxcf.pass != 1) {
char headings[512] = {0}; char headings[512] = {0};
...@@ -2748,7 +2748,7 @@ static void loopfilter_frame(VP9_COMP *cpi, VP9_COMMON *cm) { ...@@ -2748,7 +2748,7 @@ static void loopfilter_frame(VP9_COMP *cpi, VP9_COMMON *cm) {
} else { } else {
struct vpx_usec_timer timer; struct vpx_usec_timer timer;
vp9_clear_system_state(); vpx_clear_system_state();
vpx_usec_timer_start(&timer); vpx_usec_timer_start(&timer);
...@@ -2932,7 +2932,7 @@ static void output_frame_level_debug_stats(VP9_COMP *cpi) { ...@@ -2932,7 +2932,7 @@ static void output_frame_level_debug_stats(VP9_COMP *cpi) {
FILE *const f = fopen("tmp.stt", cm->current_video_frame ? "a" : "w"); FILE *const f = fopen("tmp.stt", cm->current_video_frame ? "a" : "w");
int64_t recon_err; int64_t recon_err;
vp9_clear_system_state(); vpx_clear_system_state();
recon_err = vp9_get_y_sse(cpi->Source, get_frame_new_buffer(cm)); recon_err = vp9_get_y_sse(cpi->Source, get_frame_new_buffer(cm));
...@@ -3184,7 +3184,7 @@ static void encode_without_recode_loop(VP9_COMP *cpi) { ...@@ -3184,7 +3184,7 @@ static void encode_without_recode_loop(VP9_COMP *cpi) {
VP9_COMMON *const cm = &cpi->common; VP9_COMMON *const cm = &cpi->common;
int q = 0, bottom_index = 0, top_index = 0; // Dummy variables. int q = 0, bottom_index = 0, top_index = 0; // Dummy variables.
vp9_clear_system_state(); vpx_clear_system_state();
set_frame_size(cpi); set_frame_size(cpi);
...@@ -3248,7 +3248,7 @@ static void encode_without_recode_loop(VP9_COMP *cpi) { ...@@ -3248,7 +3248,7 @@ static void encode_without_recode_loop(VP9_COMP *cpi) {
// Update the skip mb flag probabilities based on the distribution // Update the skip mb flag probabilities based on the distribution
// seen in the last encoder iteration. // seen in the last encoder iteration.
// update_base_skip_probs(cpi); // update_base_skip_probs(cpi);
vp9_clear_system_state(); vpx_clear_system_state();
} }
static void encode_with_recode_loop(VP9_COMP *cpi, static void encode_with_recode_loop(VP9_COMP *cpi,
...@@ -3269,7 +3269,7 @@ static void encode_with_recode_loop(VP9_COMP *cpi, ...@@ -3269,7 +3269,7 @@ static void encode_with_recode_loop(VP9_COMP *cpi,
set_size_independent_vars(cpi); set_size_independent_vars(cpi);
do { do {
vp9_clear_system_state(); vpx_clear_system_state();
set_frame_size(cpi); set_frame_size(cpi);
...@@ -3333,7 +3333,7 @@ static void encode_with_recode_loop(VP9_COMP *cpi, ...@@ -3333,7 +3333,7 @@ static void encode_with_recode_loop(VP9_COMP *cpi,
// seen in the last encoder iteration. // seen in the last encoder iteration.
// update_base_skip_probs(cpi); // update_base_skip_probs(cpi);
vp9_clear_system_state(); vpx_clear_system_state();
// Dummy pack of the bitstream using up to date stats to get an // Dummy pack of the bitstream using up to date stats to get an
// accurate estimate of output frame size to determine if we need // accurate estimate of output frame size to determine if we need
...@@ -3637,7 +3637,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, ...@@ -3637,7 +3637,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
TX_SIZE t; TX_SIZE t;
set_ext_overrides(cpi); set_ext_overrides(cpi);
vp9_clear_system_state(); vpx_clear_system_state();
// Set the arf sign bias for this frame. // Set the arf sign bias for this frame.
set_arf_sign_bias(cpi); set_arf_sign_bias(cpi);
...@@ -3728,7 +3728,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, ...@@ -3728,7 +3728,7 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi,
} }
} }
vp9_clear_system_state(); vpx_clear_system_state();
#if CONFIG_INTERNAL_STATS #if CONFIG_INTERNAL_STATS
memset(cpi->mode_chosen_counts, 0, memset(cpi->mode_chosen_counts, 0,
...@@ -4248,7 +4248,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, ...@@ -4248,7 +4248,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
} }
// Clear down mmx registers // Clear down mmx registers
vp9_clear_system_state(); vpx_clear_system_state();
// adjust frame rates based on timestamps given // adjust frame rates based on timestamps given
if (cm->show_frame) { if (cm->show_frame) {
...@@ -4400,7 +4400,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags, ...@@ -4400,7 +4400,7 @@ int vp9_get_compressed_data(VP9_COMP *cpi, unsigned int *frame_flags,
vp9_deblock(cm->frame_to_show, &cm->post_proc_buffer, vp9_deblock(cm->frame_to_show, &cm->post_proc_buffer,
cm->lf.filter_level * 10 / 6); cm->lf.filter_level * 10 / 6);
#endif #endif
vp9_clear_system_state(); vpx_clear_system_state();
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
calc_highbd_psnr(orig, pp, &psnr2, cpi->td.mb.e_mbd.bd, calc_highbd_psnr(orig, pp, &psnr2, cpi->td.mb.e_mbd.bd,
...@@ -4575,7 +4575,7 @@ int vp9_get_preview_raw_frame(VP9_COMP *cpi, YV12_BUFFER_CONFIG *dest, ...@@ -4575,7 +4575,7 @@ int vp9_get_preview_raw_frame(VP9_COMP *cpi, YV12_BUFFER_CONFIG *dest,
ret = -1; ret = -1;
} }
#endif // !CONFIG_VP9_POSTPROC #endif // !CONFIG_VP9_POSTPROC
vp9_clear_system_state();