Commit cb98b832 authored by Jim Bankoski's avatar Jim Bankoski

removal of temporal invoke

Change-Id: I18ca713b02a5241bdb20dddcde0216467b55b596
parent 0eb55904
...@@ -501,8 +501,13 @@ specialize vp9_refining_search_sad sse3 ...@@ -501,8 +501,13 @@ specialize vp9_refining_search_sad sse3
vp9_refining_search_sad_sse3=vp9_refining_search_sadx4 vp9_refining_search_sad_sse3=vp9_refining_search_sadx4
prototype int vp9_diamond_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv" prototype int vp9_diamond_search_sad "struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, DEC_MVCOSTS, union int_mv *center_mv"
specialize vp9_diamond_search_sad sse3
vp9_diamond_search_sad_sse3=vp9_diamond_search_sadx4 vp9_diamond_search_sad_sse3=vp9_diamond_search_sadx4
prototype void vp9_temporal_filter_apply "unsigned char *frame1, unsigned int stride, unsigned char *frame2, unsigned int block_size, int strength, int filter_weight, unsigned int *accumulator, unsigned short *count"
specialize vp9_temporal_filter_apply sse2
fi fi
# end encoder functions # end encoder functions
......
...@@ -27,7 +27,6 @@ extern void vp9_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc, ...@@ -27,7 +27,6 @@ extern void vp9_yv12_copy_partial_frame(YV12_BUFFER_CONFIG *src_ybc,
void vp9_cmachine_specific_config(VP9_COMP *cpi) { void vp9_cmachine_specific_config(VP9_COMP *cpi) {
#if CONFIG_RUNTIME_CPU_DETECT #if CONFIG_RUNTIME_CPU_DETECT
cpi->rtcd.common = &cpi->common.rtcd; cpi->rtcd.common = &cpi->common.rtcd;
cpi->rtcd.temporal.apply = vp9_temporal_filter_apply_c;
#endif #endif
vp9_yv12_copy_partial_frame_ptr = vp9_yv12_copy_partial_frame; vp9_yv12_copy_partial_frame_ptr = vp9_yv12_copy_partial_frame;
......
...@@ -317,35 +317,17 @@ static void temporal_filter_iterate_c ...@@ -317,35 +317,17 @@ static void temporal_filter_iterate_c
predictor); predictor);
// Apply the filter (YUV) // Apply the filter (YUV)
TEMPORAL_INVOKE(&cpi->rtcd.temporal, apply) vp9_temporal_filter_apply(f->y_buffer + mb_y_offset, f->y_stride,
(f->y_buffer + mb_y_offset, predictor, 16, strength, filter_weight,
f->y_stride, accumulator, count);
predictor,
16, vp9_temporal_filter_apply(f->u_buffer + mb_uv_offset, f->uv_stride,
strength, predictor + 256, 8, strength, filter_weight,
filter_weight, accumulator + 256, count + 256);
accumulator,
count); vp9_temporal_filter_apply(f->v_buffer + mb_uv_offset, f->uv_stride,
predictor + 320, 8, strength, filter_weight,
TEMPORAL_INVOKE(&cpi->rtcd.temporal, apply) accumulator + 320, count + 320);
(f->u_buffer + mb_uv_offset,
f->uv_stride,
predictor + 256,
8,
strength,
filter_weight,
accumulator + 256,
count + 256);
TEMPORAL_INVOKE(&cpi->rtcd.temporal, apply)
(f->v_buffer + mb_uv_offset,
f->uv_stride,
predictor + 320,
8,
strength,
filter_weight,
accumulator + 320,
count + 320);
} }
} }
......
...@@ -90,8 +90,6 @@ void vp9_arch_x86_encoder_init(VP9_COMP *cpi) { ...@@ -90,8 +90,6 @@ void vp9_arch_x86_encoder_init(VP9_COMP *cpi) {
/* Override default functions with fastest ones for this CPU. */ /* Override default functions with fastest ones for this CPU. */
#if HAVE_SSE2 #if HAVE_SSE2
if (flags & HAS_SSE2) { if (flags & HAS_SSE2) {
cpi->rtcd.temporal.apply = vp9_temporal_filter_apply_sse2;
} }
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment