7 files changed, 4 insertions, 99 deletions
diff --git a/vp9/encoder/vp9_encodemb.h b/vp9/encoder/vp9_encodemb.h
index 38d7c73d4..3857c6648 100644
--- a/vp9/encoder/vp9_encodemb.h
+++ b/vp9/encoder/vp9_encodemb.h
@@ -25,14 +25,6 @@ typedef struct {
 } MODE_DEFINITION;
 
 
-#if CONFIG_RUNTIME_CPU_DETECT
-#define ENCODEMB_INVOKE(ctx,fn) (ctx)->fn
-#else
-#define ENCODEMB_INVOKE(ctx,fn) vp9_encodemb_##fn
-#endif
-
-
-
 #include "vp9_onyx_int.h"
 struct VP9_ENCODER_RTCD;
 void vp9_encode_inter16x16(MACROBLOCK *x);
diff --git a/vp9/encoder/vp9_mbgraph.c b/vp9/encoder/vp9_mbgraph.c
index 0a3e24671..059572e24 100644
--- a/vp9/encoder/vp9_mbgraph.c
+++ b/vp9/encoder/vp9_mbgraph.c
@@ -184,7 +184,6 @@ static int do_16x16_zerozero_search
   // FIXME should really use something like near/nearest MV and/or MV prediction
   xd->pre.y_buffer = ref->y_buffer + mb_y_offset;
   xd->pre.y_stride = ref->y_stride;
-  // VARIANCE_INVOKE(&cpi->rtcd.variance, satd16x16)
   err = vp9_sad16x16(ref->y_buffer + mb_y_offset, ref->y_stride,
                      xd->dst.y_buffer, xd->dst.y_stride, INT_MAX);
 
diff --git a/vp9/encoder/vp9_mcomp.h b/vp9/encoder/vp9_mcomp.h
index accb47b7b..41ba3f8c7 100644
--- a/vp9/encoder/vp9_mcomp.h
+++ b/vp9/encoder/vp9_mcomp.h
@@ -82,10 +82,4 @@ typedef int (*vp9_diamond_search_fn_t)(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
                                        int_mv *center_mv);
 
 
-#if CONFIG_RUNTIME_CPU_DETECT
-#define SEARCH_INVOKE(ctx,fn) (ctx)->fn
-#else
-#define SEARCH_INVOKE(ctx,fn) vp9_search_##fn
-#endif
-
 #endif
diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c
index 4bf39105b..31fc126eb 100644
--- a/vp9/encoder/vp9_onyx_if.c
+++ b/vp9/encoder/vp9_onyx_if.c
@@ -30,7 +30,6 @@
 #include "vpx_mem/vpx_mem.h"
 #include "vp9/common/vp9_swapyv12buffer.h"
 #include "vpx_ports/vpx_timer.h"
-#include "vp9_temporal_filter.h"
 
 #include "vp9/common/vp9_seg_common.h"
 #include "vp9_mbgraph.h"
@@ -3272,9 +3271,9 @@ static void encode_frame_to_data_rate
 
 
     if (cm->frame_type == KEY_FRAME) {
-      vp9_de_noise(cpi->Source, cpi->Source, l, 1,  0, RTCD(postproc));
+      vp9_de_noise(cpi->Source, cpi->Source, l, 1,  0);
     } else {
-      vp9_de_noise(cpi->Source, cpi->Source, l, 1,  0, RTCD(postproc));
+      vp9_de_noise(cpi->Source, cpi->Source, l, 1,  0);
 
       src = cpi->Source->y_buffer;
 
@@ -4384,7 +4383,8 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags,
           double frame_psnr2, frame_ssim2 = 0;
           double weight = 0;
 #if CONFIG_POSTPROC
-          vp9_deblock(cm->frame_to_show, &cm->post_proc_buffer, cm->filter_level * 10 / 6, 1, 0, IF_RTCD(&cm->rtcd.postproc));
+          vp9_deblock(cm->frame_to_show, &cm->post_proc_buffer,
+                      cm->filter_level * 10 / 6, 1, 0);
 #endif
           vp9_clear_system_state();
 
diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h
index b01cf2125..79b35b41e 100644
--- a/vp9/encoder/vp9_onyx_int.h
+++ b/vp9/encoder/vp9_onyx_int.h
@@ -26,7 +26,6 @@
 #include "vpx_ports/mem.h"
 #include "vpx/internal/vpx_codec_internal.h"
 #include "vp9_mcomp.h"
-#include "vp9_temporal_filter.h"
 #include "vp9/common/vp9_findnearmv.h"
 #include "vp9_lookahead.h"
 
@@ -393,7 +392,6 @@ typedef struct {
 
 typedef struct VP9_ENCODER_RTCD {
   VP9_COMMON_RTCD            *common;
-  vp9_temporal_rtcd_vtable_t  temporal;
 } VP9_ENCODER_RTCD;
 
 enum BlockSize {
diff --git a/vp9/encoder/vp9_temporal_filter.h b/vp9/encoder/vp9_temporal_filter.h
deleted file mode 100644
index c22ff2bab..000000000
--- a/vp9/encoder/vp9_temporal_filter.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-#ifndef __INC_TEMPORAL_FILTER_H
-#define __INC_TEMPORAL_FILTER_H
-
-#define prototype_apply(sym)\
-  void (sym) \
-  ( \
-    unsigned char *frame1, \
-    unsigned int stride, \
-    unsigned char *frame2, \
-    unsigned int block_size, \
-    int strength, \
-    int filter_weight, \
-    unsigned int *accumulator, \
-    unsigned short *count \
-  )
-
-#if ARCH_X86 || ARCH_X86_64
-#include "x86/vp9_temporal_filter_x86.h"
-#endif
-
-#ifndef vp9_temporal_filter_apply
-#define vp9_temporal_filter_apply vp9_temporal_filter_apply_c
-#endif
-extern prototype_apply(vp9_temporal_filter_apply);
-
-typedef struct {
-  prototype_apply(*apply);
-} vp9_temporal_rtcd_vtable_t;
-
-#if CONFIG_RUNTIME_CPU_DETECT
-#define TEMPORAL_INVOKE(ctx,fn) (ctx)->fn
-#else
-#define TEMPORAL_INVOKE(ctx,fn) vp9_temporal_filter_##fn
-#endif
-
-struct VP9_COMP;
-
-extern void vp9_temporal_filter_prepare_c(struct VP9_COMP *cpi, int distance);
-
-#endif // __INC_TEMPORAL_FILTER_H
diff --git a/vp9/encoder/x86/vp9_temporal_filter_x86.h b/vp9/encoder/x86/vp9_temporal_filter_x86.h
deleted file mode 100644
index 8fae2200d..000000000
--- a/vp9/encoder/x86/vp9_temporal_filter_x86.h
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
- *
- *  Use of this source code is governed by a BSD-style license
- *  that can be found in the LICENSE file in the root of the source
- *  tree. An additional intellectual property rights grant can be found
- *  in the file PATENTS.  All contributing project authors may
- *  be found in the AUTHORS file in the root of the source tree.
- */
-
-
-#ifndef __INC_TEMPORAL_FILTER_X86_H
-#define __INC_TEMPORAL_FILTER_X86_H
-
-#if HAVE_SSE2
-extern prototype_apply(vp9_temporal_filter_apply_sse2);
-
-#if !CONFIG_RUNTIME_CPU_DETECT
-
-#undef  vp9_temporal_filter_apply
-#define vp9_temporal_filter_apply vp9_temporal_filter_apply_sse2
-
-#endif
-
-#endif
-
-#endif // __INC_TEMPORAL_FILTER_X86_H