Commit 926d95cd authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review

Merge "remove postproc invokes" into experimental

parents 00e2c6bf 85cba19e
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
extern void vp8_recon16x16mb_neon(unsigned char *pred_ptr, short *diff_ptr, unsigned char *dst_ptr, int ystride, unsigned char *udst_ptr, unsigned char *vdst_ptr); extern void vp8_recon16x16mb_neon(unsigned char *pred_ptr, short *diff_ptr, unsigned char *dst_ptr, int ystride, unsigned char *udst_ptr, unsigned char *vdst_ptr);
void vp8_recon_mb_neon(const vp8_recon_rtcd_vtable_t *rtcd, MACROBLOCKD *xd) { void vp8_recon_mb_neon(MACROBLOCKD *xd) {
unsigned char *pred_ptr = &xd->predictor[0]; unsigned char *pred_ptr = &xd->predictor[0];
short *diff_ptr = &xd->diff[0]; short *diff_ptr = &xd->diff[0];
unsigned char *dst_ptr = xd->dst.y_buffer; unsigned char *dst_ptr = xd->dst.y_buffer;
......
...@@ -22,16 +22,6 @@ void vp9_machine_specific_config(VP9_COMMON *ctx) { ...@@ -22,16 +22,6 @@ void vp9_machine_specific_config(VP9_COMMON *ctx) {
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
VP9_COMMON_RTCD *rtcd = &ctx->rtcd; VP9_COMMON_RTCD *rtcd = &ctx->rtcd;
#if CONFIG_POSTPROC || (CONFIG_VP9_ENCODER && CONFIG_INTERNAL_STATS)
rtcd->postproc.down = vp9_mbpost_proc_down_c;
rtcd->postproc.across = vp9_mbpost_proc_across_ip_c;
rtcd->postproc.downacross = vp9_post_proc_down_and_across_c;
rtcd->postproc.addnoise = vp9_plane_add_noise_c;
rtcd->postproc.blend_mb_inner = vp9_blend_mb_inner_c;
rtcd->postproc.blend_mb_outer = vp9_blend_mb_outer_c;
rtcd->postproc.blend_b = vp9_blend_b_c;
#endif
#endif #endif
#if ARCH_X86 || ARCH_X86_64 #if ARCH_X86 || ARCH_X86_64
......
...@@ -145,9 +145,6 @@ typedef enum { ...@@ -145,9 +145,6 @@ typedef enum {
typedef struct VP9_COMMON_RTCD { typedef struct VP9_COMMON_RTCD {
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
#if CONFIG_POSTPROC
vp9_postproc_rtcd_vtable_t postproc;
#endif
int flags; int flags;
#else #else
int unused; int unused;
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
#include "vp9/common/vp9_textblit.h" #include "vp9/common/vp9_textblit.h"
#include "vpx_scale/vpxscale.h" #include "vpx_scale/vpxscale.h"
#include "vp9_systemdependent.h" #include "vp9_systemdependent.h"
#include "./vp9_rtcd.h"
#include <math.h> #include <math.h>
#include <stdlib.h> #include <stdlib.h>
...@@ -286,82 +288,78 @@ static void deblock_and_de_macro_block(YV12_BUFFER_CONFIG *source, ...@@ -286,82 +288,78 @@ static void deblock_and_de_macro_block(YV12_BUFFER_CONFIG *source,
YV12_BUFFER_CONFIG *post, YV12_BUFFER_CONFIG *post,
int q, int q,
int low_var_thresh, int low_var_thresh,
int flag, int flag) {
vp9_postproc_rtcd_vtable_t *rtcd) {
double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
int ppl = (int)(level + .5); int ppl = (int)(level + .5);
(void) low_var_thresh; (void) low_var_thresh;
(void) flag; (void) flag;
POSTPROC_INVOKE(rtcd, downacross)(source->y_buffer, post->y_buffer, vp9_post_proc_down_and_across(source->y_buffer, post->y_buffer,
source->y_stride, post->y_stride, source->y_stride, post->y_stride,
source->y_height, source->y_width, ppl); source->y_height, source->y_width, ppl);
POSTPROC_INVOKE(rtcd, across)(post->y_buffer, post->y_stride,
post->y_height, post->y_width, q2mbl(q)); vp9_mbpost_proc_across_ip(post->y_buffer, post->y_stride, post->y_height,
POSTPROC_INVOKE(rtcd, down)(post->y_buffer, post->y_stride, post->y_width, q2mbl(q));
post->y_height, post->y_width, q2mbl(q));
vp9_mbpost_proc_down(post->y_buffer, post->y_stride, post->y_height,
POSTPROC_INVOKE(rtcd, downacross)(source->u_buffer, post->u_buffer, post->y_width, q2mbl(q));
source->uv_stride, post->uv_stride,
source->uv_height, source->uv_width, ppl); vp9_post_proc_down_and_across(source->u_buffer, post->u_buffer,
POSTPROC_INVOKE(rtcd, downacross)(source->v_buffer, post->v_buffer, source->uv_stride, post->uv_stride,
source->uv_stride, post->uv_stride, source->uv_height, source->uv_width, ppl);
source->uv_height, source->uv_width, ppl); vp9_post_proc_down_and_across(source->v_buffer, post->v_buffer,
source->uv_stride, post->uv_stride,
source->uv_height, source->uv_width, ppl);
} }
void vp9_deblock(YV12_BUFFER_CONFIG *source, void vp9_deblock(YV12_BUFFER_CONFIG *source,
YV12_BUFFER_CONFIG *post, YV12_BUFFER_CONFIG *post,
int q, int q,
int low_var_thresh, int low_var_thresh,
int flag, int flag) {
vp9_postproc_rtcd_vtable_t *rtcd) {
double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
int ppl = (int)(level + .5); int ppl = (int)(level + .5);
(void) low_var_thresh; (void) low_var_thresh;
(void) flag; (void) flag;
POSTPROC_INVOKE(rtcd, downacross)(source->y_buffer, post->y_buffer, vp9_post_proc_down_and_across(source->y_buffer, post->y_buffer,
source->y_stride, post->y_stride, source->y_stride, post->y_stride,
source->y_height, source->y_width, ppl); source->y_height, source->y_width, ppl);
POSTPROC_INVOKE(rtcd, downacross)(source->u_buffer, post->u_buffer,
source->uv_stride, post->uv_stride, vp9_post_proc_down_and_across(source->u_buffer, post->u_buffer,
source->uv_height, source->uv_width, ppl); source->uv_stride, post->uv_stride,
POSTPROC_INVOKE(rtcd, downacross)(source->v_buffer, post->v_buffer, source->uv_height, source->uv_width, ppl);
source->uv_stride, post->uv_stride,
source->uv_height, source->uv_width, ppl); vp9_post_proc_down_and_across(source->v_buffer, post->v_buffer,
source->uv_stride, post->uv_stride,
source->uv_height, source->uv_width, ppl);
} }
void vp9_de_noise(YV12_BUFFER_CONFIG *src, void vp9_de_noise(YV12_BUFFER_CONFIG *src,
YV12_BUFFER_CONFIG *post, YV12_BUFFER_CONFIG *post,
int q, int q,
int low_var_thresh, int low_var_thresh,
int flag, int flag) {
vp9_postproc_rtcd_vtable_t *rtcd) {
double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065;
int ppl = (int)(level + .5); int ppl = (int)(level + .5);
(void) post; (void) post;
(void) low_var_thresh; (void) low_var_thresh;
(void) flag; (void) flag;
POSTPROC_INVOKE(rtcd, downacross)(src->y_buffer + 2 * src->y_stride + 2, vp9_post_proc_down_and_across(src->y_buffer + 2 * src->y_stride + 2,
src->y_buffer + 2 * src->y_stride + 2, src->y_buffer + 2 * src->y_stride + 2,
src->y_stride, src->y_stride, src->y_stride, src->y_height - 4,
src->y_stride, src->y_width - 4, ppl);
src->y_height - 4,
src->y_width - 4, vp9_post_proc_down_and_across(src->u_buffer + 2 * src->uv_stride + 2,
ppl); src->u_buffer + 2 * src->uv_stride + 2,
POSTPROC_INVOKE(rtcd, downacross)(src->u_buffer + 2 * src->uv_stride + 2, src->uv_stride, src->uv_stride,
src->u_buffer + 2 * src->uv_stride + 2, src->uv_height - 4, src->uv_width - 4, ppl);
src->uv_stride,
src->uv_stride, vp9_post_proc_down_and_across(src->v_buffer + 2 * src->uv_stride + 2,
src->uv_height - 4, src->v_buffer + 2 * src->uv_stride + 2,
src->uv_width - 4, ppl); src->uv_stride, src->uv_stride,
POSTPROC_INVOKE(rtcd, downacross)(src->v_buffer + 2 * src->uv_stride + 2, src->uv_height - 4, src->uv_width - 4, ppl);
src->v_buffer + 2 * src->uv_stride + 2,
src->uv_stride,
src->uv_stride,
src->uv_height - 4,
src->uv_width - 4, ppl);
} }
double vp9_gaussian(double sigma, double mu, double x) { double vp9_gaussian(double sigma, double mu, double x) {
...@@ -620,13 +618,6 @@ static void constrain_line(int x0, int *x1, int y0, int *y1, ...@@ -620,13 +618,6 @@ static void constrain_line(int x0, int *x1, int y0, int *y1,
} }
} }
#if CONFIG_RUNTIME_CPU_DETECT
#define RTCD_VTABLE(oci) (&(oci)->rtcd.postproc)
#else
#define RTCD_VTABLE(oci) NULL
#endif
int vp9_post_proc_frame(VP9_COMMON *oci, YV12_BUFFER_CONFIG *dest, int vp9_post_proc_frame(VP9_COMMON *oci, YV12_BUFFER_CONFIG *dest,
vp9_ppflags_t *ppflags) { vp9_ppflags_t *ppflags) {
int q = oci->filter_level * 10 / 6; int q = oci->filter_level * 10 / 6;
...@@ -657,11 +648,9 @@ int vp9_post_proc_frame(VP9_COMMON *oci, YV12_BUFFER_CONFIG *dest, ...@@ -657,11 +648,9 @@ int vp9_post_proc_frame(VP9_COMMON *oci, YV12_BUFFER_CONFIG *dest,
if (flags & VP9D_DEMACROBLOCK) { if (flags & VP9D_DEMACROBLOCK) {
deblock_and_de_macro_block(oci->frame_to_show, &oci->post_proc_buffer, deblock_and_de_macro_block(oci->frame_to_show, &oci->post_proc_buffer,
q + (deblock_level - 5) * 10, 1, 0, q + (deblock_level - 5) * 10, 1, 0);
RTCD_VTABLE(oci));
} else if (flags & VP9D_DEBLOCK) { } else if (flags & VP9D_DEBLOCK) {
vp9_deblock(oci->frame_to_show, &oci->post_proc_buffer, vp9_deblock(oci->frame_to_show, &oci->post_proc_buffer, q, 1, 0);
q, 1, 0, RTCD_VTABLE(oci));
} else { } else {
vp8_yv12_copy_frame(oci->frame_to_show, &oci->post_proc_buffer); vp8_yv12_copy_frame(oci->frame_to_show, &oci->post_proc_buffer);
} }
...@@ -672,14 +661,14 @@ int vp9_post_proc_frame(VP9_COMMON *oci, YV12_BUFFER_CONFIG *dest, ...@@ -672,14 +661,14 @@ int vp9_post_proc_frame(VP9_COMMON *oci, YV12_BUFFER_CONFIG *dest,
fillrd(&oci->postproc_state, 63 - q, noise_level); fillrd(&oci->postproc_state, 63 - q, noise_level);
} }
POSTPROC_INVOKE(RTCD_VTABLE(oci), addnoise)(oci->post_proc_buffer.y_buffer, vp9_plane_add_noise(oci->post_proc_buffer.y_buffer,
oci->postproc_state.noise, oci->postproc_state.noise,
oci->postproc_state.blackclamp, oci->postproc_state.blackclamp,
oci->postproc_state.whiteclamp, oci->postproc_state.whiteclamp,
oci->postproc_state.bothclamp, oci->postproc_state.bothclamp,
oci->post_proc_buffer.y_width, oci->post_proc_buffer.y_width,
oci->post_proc_buffer.y_height, oci->post_proc_buffer.y_height,
oci->post_proc_buffer.y_stride); oci->post_proc_buffer.y_stride);
} }
#if CONFIG_POSTPROC_VISUALIZER #if CONFIG_POSTPROC_VISUALIZER
...@@ -945,11 +934,8 @@ int vp9_post_proc_frame(VP9_COMMON *oci, YV12_BUFFER_CONFIG *dest, ...@@ -945,11 +934,8 @@ int vp9_post_proc_frame(VP9_COMMON *oci, YV12_BUFFER_CONFIG *dest,
U = B_PREDICTION_MODE_colors[bmi->as_mode.first][1]; U = B_PREDICTION_MODE_colors[bmi->as_mode.first][1];
V = B_PREDICTION_MODE_colors[bmi->as_mode.first][2]; V = B_PREDICTION_MODE_colors[bmi->as_mode.first][2];
POSTPROC_INVOKE(RTCD_VTABLE(oci), blend_b)(yl + bx, vp9_blend_b(yl + bx, ul + (bx >> 1), vl + (bx >> 1), Y, U, V,
ul + (bx >> 1), 0xc000, y_stride);
vl + (bx >> 1),
Y, U, V,
0xc000, y_stride);
} }
bmi++; bmi++;
} }
...@@ -963,11 +949,8 @@ int vp9_post_proc_frame(VP9_COMMON *oci, YV12_BUFFER_CONFIG *dest, ...@@ -963,11 +949,8 @@ int vp9_post_proc_frame(VP9_COMMON *oci, YV12_BUFFER_CONFIG *dest,
U = MB_PREDICTION_MODE_colors[mi->mbmi.mode][1]; U = MB_PREDICTION_MODE_colors[mi->mbmi.mode][1];
V = MB_PREDICTION_MODE_colors[mi->mbmi.mode][2]; V = MB_PREDICTION_MODE_colors[mi->mbmi.mode][2];
POSTPROC_INVOKE(RTCD_VTABLE(oci), blend_mb_inner)(y_ptr + x, vp9_blend_mb_inner(y_ptr + x, u_ptr + (x >> 1), v_ptr + (x >> 1),
u_ptr + (x >> 1), Y, U, V, 0xc000, y_stride);
v_ptr + (x >> 1),
Y, U, V,
0xc000, y_stride);
} }
mi++; mi++;
...@@ -1002,11 +985,8 @@ int vp9_post_proc_frame(VP9_COMMON *oci, YV12_BUFFER_CONFIG *dest, ...@@ -1002,11 +985,8 @@ int vp9_post_proc_frame(VP9_COMMON *oci, YV12_BUFFER_CONFIG *dest,
U = MV_REFERENCE_FRAME_colors[mi->mbmi.ref_frame][1]; U = MV_REFERENCE_FRAME_colors[mi->mbmi.ref_frame][1];
V = MV_REFERENCE_FRAME_colors[mi->mbmi.ref_frame][2]; V = MV_REFERENCE_FRAME_colors[mi->mbmi.ref_frame][2];
POSTPROC_INVOKE(RTCD_VTABLE(oci), blend_mb_outer)(y_ptr + x, vp9_blend_mb_outer(y_ptr + x, u_ptr + (x >> 1), v_ptr + (x >> 1),
u_ptr + (x >> 1), Y, U, V, 0xc000, y_stride);
v_ptr + (x >> 1),
Y, U, V,
0xc000, y_stride);
} }
mi++; mi++;
......
...@@ -12,91 +12,6 @@ ...@@ -12,91 +12,6 @@
#ifndef POSTPROC_H #ifndef POSTPROC_H
#define POSTPROC_H #define POSTPROC_H
#define prototype_postproc_inplace(sym)\
void sym(unsigned char *dst, int pitch, int rows, int cols, int flimit)
#define prototype_postproc(sym)\
void sym(unsigned char *src, unsigned char *dst, int src_pitch, \
int dst_pitch, int rows, int cols, int flimit)
#define prototype_postproc_addnoise(sym) \
void sym(unsigned char *s, char *noise, char blackclamp[16], \
char whiteclamp[16], char bothclamp[16], \
unsigned int w, unsigned int h, int pitch)
#define prototype_postproc_blend_mb_inner(sym)\
void sym(unsigned char *y, unsigned char *u, unsigned char *v, \
int y1, int u1, int v1, int alpha, int stride)
#define prototype_postproc_blend_mb_outer(sym)\
void sym(unsigned char *y, unsigned char *u, unsigned char *v, \
int y1, int u1, int v1, int alpha, int stride)
#define prototype_postproc_blend_b(sym)\
void sym(unsigned char *y, unsigned char *u, unsigned char *v, \
int y1, int u1, int v1, int alpha, int stride)
#if ARCH_X86 || ARCH_X86_64
#include "x86/vp9_postproc_x86.h"
#endif
#ifndef vp9_postproc_down
#define vp9_postproc_down vp9_mbpost_proc_down_c
#endif
extern prototype_postproc_inplace(vp9_postproc_down);
#ifndef vp9_postproc_across
#define vp9_postproc_across vp9_mbpost_proc_across_ip_c
#endif
extern prototype_postproc_inplace(vp9_postproc_across);
#ifndef vp9_postproc_downacross
#define vp9_postproc_downacross vp9_post_proc_down_and_across_c
#endif
extern prototype_postproc(vp9_postproc_downacross);
#ifndef vp9_postproc_addnoise
#define vp9_postproc_addnoise vp9_plane_add_noise_c
#endif
extern prototype_postproc_addnoise(vp9_postproc_addnoise);
#ifndef vp9_postproc_blend_mb_inner
#define vp9_postproc_blend_mb_inner vp9_blend_mb_inner_c
#endif
extern prototype_postproc_blend_mb_inner(vp9_postproc_blend_mb_inner);
#ifndef vp9_postproc_blend_mb_outer
#define vp9_postproc_blend_mb_outer vp9_blend_mb_outer_c
#endif
extern prototype_postproc_blend_mb_outer(vp9_postproc_blend_mb_outer);
#ifndef vp9_postproc_blend_b
#define vp9_postproc_blend_b vp9_blend_b_c
#endif
extern prototype_postproc_blend_b(vp9_postproc_blend_b);
typedef prototype_postproc((*vp9_postproc_fn_t));
typedef prototype_postproc_inplace((*vp9_postproc_inplace_fn_t));
typedef prototype_postproc_addnoise((*vp9_postproc_addnoise_fn_t));
typedef prototype_postproc_blend_mb_inner((*vp9_postproc_blend_mb_inner_fn_t));
typedef prototype_postproc_blend_mb_outer((*vp9_postproc_blend_mb_outer_fn_t));
typedef prototype_postproc_blend_b((*vp9_postproc_blend_b_fn_t));
typedef struct {
vp9_postproc_inplace_fn_t down;
vp9_postproc_inplace_fn_t across;
vp9_postproc_fn_t downacross;
vp9_postproc_addnoise_fn_t addnoise;
vp9_postproc_blend_mb_inner_fn_t blend_mb_inner;
vp9_postproc_blend_mb_outer_fn_t blend_mb_outer;
vp9_postproc_blend_b_fn_t blend_b;
} vp9_postproc_rtcd_vtable_t;
#if CONFIG_RUNTIME_CPU_DETECT
#define POSTPROC_INVOKE(ctx,fn) (ctx)->fn
#else
#define POSTPROC_INVOKE(ctx,fn) vp9_postproc_##fn
#endif
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
struct postproc_state { struct postproc_state {
int last_q; int last_q;
...@@ -116,13 +31,11 @@ void vp9_de_noise(YV12_BUFFER_CONFIG *source, ...@@ -116,13 +31,11 @@ void vp9_de_noise(YV12_BUFFER_CONFIG *source,
YV12_BUFFER_CONFIG *post, YV12_BUFFER_CONFIG *post,
int q, int q,
int low_var_thresh, int low_var_thresh,
int flag, int flag);
vp9_postproc_rtcd_vtable_t *rtcd);
void vp9_deblock(YV12_BUFFER_CONFIG *source, void vp9_deblock(YV12_BUFFER_CONFIG *source,
YV12_BUFFER_CONFIG *post, YV12_BUFFER_CONFIG *post,
int q, int q,
int low_var_thresh, int low_var_thresh,
int flag, int flag);
vp9_postproc_rtcd_vtable_t *rtcd);
#endif #endif
...@@ -218,6 +218,34 @@ vp9_loop_filter_simple_bh_sse2=vp9_loop_filter_bhs_sse2 ...@@ -218,6 +218,34 @@ vp9_loop_filter_simple_bh_sse2=vp9_loop_filter_bhs_sse2
vp9_loop_filter_simple_bh_media=vp9_loop_filter_bhs_armv6 vp9_loop_filter_simple_bh_media=vp9_loop_filter_bhs_armv6
vp9_loop_filter_simple_bh_neon=vp9_loop_filter_bhs_neon vp9_loop_filter_simple_bh_neon=vp9_loop_filter_bhs_neon
#
# post proc
#
prototype void vp9_mbpost_proc_down "unsigned char *dst, int pitch, int rows, int cols, int flimit"
specialize vp9_mbpost_proc_down mmx sse2
vp9_mbpost_proc_down_sse2=vp9_mbpost_proc_down_xmm
prototype void vp9_mbpost_proc_across_ip "unsigned char *src, int pitch, int rows, int cols, int flimit"
specialize vp9_mbpost_proc_across_ip sse2
vp9_mbpost_proc_across_ip_sse2=vp9_mbpost_proc_across_ip_xmm
prototype void vp9_post_proc_down_and_across "unsigned char *src_ptr, unsigned char *dst_ptr, int src_pixels_per_line, int dst_pixels_per_line, int rows, int cols, int flimit"
specialize vp9_post_proc_down_and_across mmx sse2
vp9_post_proc_down_and_across_sse2=vp9_post_proc_down_and_across_xmm
prototype void vp9_plane_add_noise "unsigned char *Start, char *noise, char blackclamp[16], char whiteclamp[16], char bothclamp[16], unsigned int Width, unsigned int Height, int Pitch"
specialize vp9_plane_add_noise mmx sse2
vp9_plane_add_noise_sse2=vp9_plane_add_noise_wmt
prototype void vp9_blend_mb_inner "unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride"
specialize vp9_blend_mb_inner
prototype void vp9_blend_mb_outer "unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride"
specialize vp9_blend_mb_outer
prototype void vp9_blend_b "unsigned char *y, unsigned char *u, unsigned char *v, int y1, int u1, int v1, int alpha, int stride"
specialize vp9_blend_b
# #
# sad 16x3, 3x16 # sad 16x3, 3x16
# #
......
...@@ -31,12 +31,6 @@ void vp9_arch_x86_common_init(VP9_COMMON *ctx) { ...@@ -31,12 +31,6 @@ void vp9_arch_x86_common_init(VP9_COMMON *ctx) {
// The commented functions need to be re-written for vpx. // The commented functions need to be re-written for vpx.
if (flags & HAS_MMX) { if (flags & HAS_MMX) {
#if CONFIG_POSTPROC
rtcd->postproc.down = vp9_mbpost_proc_down_mmx;
/*rtcd->postproc.across = vp9_mbpost_proc_across_ip_c;*/
rtcd->postproc.downacross = vp9_post_proc_down_and_across_mmx;
rtcd->postproc.addnoise = vp9_plane_add_noise_mmx;
#endif
} }
#endif #endif
...@@ -47,12 +41,6 @@ void vp9_arch_x86_common_init(VP9_COMMON *ctx) { ...@@ -47,12 +41,6 @@ void vp9_arch_x86_common_init(VP9_COMMON *ctx) {
// rtcd->idct.iwalsh16 = vp9_short_inv_walsh4x4_sse2; // rtcd->idct.iwalsh16 = vp9_short_inv_walsh4x4_sse2;
#if CONFIG_POSTPROC
rtcd->postproc.down = vp9_mbpost_proc_down_xmm;
rtcd->postproc.across = vp9_mbpost_proc_across_ip_xmm;
rtcd->postproc.downacross = vp9_post_proc_down_and_across_xmm;
rtcd->postproc.addnoise = vp9_plane_add_noise_wmt;
#endif
} }
#endif #endif
......
...@@ -25,14 +25,6 @@ typedef struct { ...@@ -25,14 +25,6 @@ typedef struct {
} MODE_DEFINITION; } 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" #include "vp9_onyx_int.h"
struct VP9_ENCODER_RTCD; struct VP9_ENCODER_RTCD;
void vp9_encode_inter16x16(MACROBLOCK *x); void vp9_encode_inter16x16(MACROBLOCK *x);
......
...@@ -184,7 +184,6 @@ static int do_16x16_zerozero_search ...@@ -184,7 +184,6 @@ static int do_16x16_zerozero_search
// FIXME should really use something like near/nearest MV and/or MV prediction // 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_buffer = ref->y_buffer + mb_y_offset;
xd->pre.y_stride = ref->y_stride; 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, err = vp9_sad16x16(ref->y_buffer + mb_y_offset, ref->y_stride,
xd->dst.y_buffer, xd->dst.y_stride, INT_MAX); xd->dst.y_buffer, xd->dst.y_stride, INT_MAX);
......
...@@ -82,10 +82,4 @@ typedef int (*vp9_diamond_search_fn_t)(MACROBLOCK *x, BLOCK *b, BLOCKD *d, ...@@ -82,10 +82,4 @@ typedef int (*vp9_diamond_search_fn_t)(MACROBLOCK *x, BLOCK *b, BLOCKD *d,
int_mv *center_mv); 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 #endif
...@@ -30,7 +30,6 @@ ...@@ -30,7 +30,6 @@
#include "vpx_mem/vpx_mem.h" #include "vpx_mem/vpx_mem.h"
#include "vp9/common/vp9_swapyv12buffer.h" #include "vp9/common/vp9_swapyv12buffer.h"
#include "vpx_ports/vpx_timer.h" #include "vpx_ports/vpx_timer.h"
#include "vp9_temporal_filter.h"
#include "vp9/common/vp9_seg_common.h" #include "vp9/common/vp9_seg_common.h"
#include "vp9_mbgraph.h" #include "vp9_mbgraph.h"
...@@ -3272,9 +3271,9 @@ static void encode_frame_to_data_rate ...@@ -3272,9 +3271,9 @@ static void encode_frame_to_data_rate
if (cm->frame_type == KEY_FRAME) { 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 { } 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; src = cpi->Source->y_buffer;
...@@ -4384,7 +4383,8 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags, ...@@ -4384,7 +4383,8 @@ int vp9_get_compressed_data(VP9_PTR ptr, unsigned int *frame_flags,
double frame_psnr2, frame_ssim2 = 0;