diff options
| author | Aℓex Converse <aconverse@google.com> | 2015-08-11 01:18:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-11 01:18:39 +0000 |
| commit | b152472ba7164d6fbce6e2e7df2fcd0d9c57e665 (patch) | |
| tree | 3c5aa1f6c212773e2d3d13c8ba90ee36d25e8253 /vpx_dsp | |
| parent | 1d723572b9de9a26151a877c3f28a4fa83c5e7d9 (diff) | |
| parent | a8a08ce57ed2fa121a296431c126a5b496be193f (diff) | |
| download | libvpx-b152472ba7164d6fbce6e2e7df2fcd0d9c57e665.tar libvpx-b152472ba7164d6fbce6e2e7df2fcd0d9c57e665.tar.gz libvpx-b152472ba7164d6fbce6e2e7df2fcd0d9c57e665.tar.bz2 libvpx-b152472ba7164d6fbce6e2e7df2fcd0d9c57e665.zip | |
Merge "Move vp9_systemdependent.h to vpx_ports bitops.h and system_state.h"
Diffstat (limited to 'vpx_dsp')
| -rw-r--r-- | vpx_dsp/fastssim.c | 1 | ||||
| -rw-r--r-- | vpx_dsp/psnrhvs.c | 1 | ||||
| -rw-r--r-- | vpx_dsp/ssim.c | 1 | ||||
| -rw-r--r-- | vpx_dsp/ssim.h | 8 |
4 files changed, 3 insertions, 8 deletions
diff --git a/vpx_dsp/fastssim.c b/vpx_dsp/fastssim.c index 97dba336a..1405a30e0 100644 --- a/vpx_dsp/fastssim.c +++ b/vpx_dsp/fastssim.c @@ -16,6 +16,7 @@ #include "./vpx_config.h" #include "./vpx_dsp_rtcd.h" #include "vpx_dsp/ssim.h" +#include "vpx_ports/system_state.h" /* TODO(jbb): High bit depth version of this code needed */ typedef struct fs_level fs_level; typedef struct fs_ctx fs_ctx; diff --git a/vpx_dsp/psnrhvs.c b/vpx_dsp/psnrhvs.c index 4d723e441..2de77c051 100644 --- a/vpx_dsp/psnrhvs.c +++ b/vpx_dsp/psnrhvs.c @@ -17,6 +17,7 @@ #include "./vpx_config.h" #include "./vpx_dsp_rtcd.h" #include "vpx_dsp/ssim.h" +#include "vpx_ports/system_state.h" #if !defined(M_PI) # define M_PI (3.141592653589793238462643) diff --git a/vpx_dsp/ssim.c b/vpx_dsp/ssim.c index e69c8131b..cfe5bb331 100644 --- a/vpx_dsp/ssim.c +++ b/vpx_dsp/ssim.c @@ -12,6 +12,7 @@ #include "./vpx_dsp_rtcd.h" #include "vpx_dsp/ssim.h" #include "vpx_ports/mem.h" +#include "vpx_ports/system_state.h" void vpx_ssim_parms_16x16_c(const uint8_t *s, int sp, const uint8_t *r, int rp, uint32_t *sum_s, uint32_t *sum_r, diff --git a/vpx_dsp/ssim.h b/vpx_dsp/ssim.h index 19f4df281..132f7f9e1 100644 --- a/vpx_dsp/ssim.h +++ b/vpx_dsp/ssim.h @@ -18,14 +18,6 @@ extern "C" { #include "./vpx_config.h" #include "vpx_scale/yv12config.h" -// TODO(aconverse): Unify vp8/vp9_clear_system_state -#if ARCH_X86 || ARCH_X86_64 -void vpx_reset_mmx_state(void); -#define vpx_clear_system_state() vpx_reset_mmx_state() -#else -#define vpx_clear_system_state() -#endif - // metrics used for calculating ssim, ssim2, dssim, and ssimc typedef struct { // source sum ( over 8x8 region ) |