From 0c3f3bf1d592e72f076ffd3e551909aca4a8b9fe Mon Sep 17 00:00:00 2001 From: Scott LaVarnway Date: Tue, 21 May 2013 13:57:50 -0400 Subject: [PATCH] Removed vp9_recon functions No longer used. Change-Id: Ica5166f7117f4693dffdf7633dcfc1b263103d0d --- vp9/common/vp9_recon.c | 59 ------------------- vp9/common/vp9_rtcd_defs.sh | 12 ---- vp9/common/x86/vp9_recon_mmx.asm | 49 ---------------- vp9/common/x86/vp9_recon_sse2.asm | 116 -------------------------------------- vp9/vp9_common.mk | 1 - 5 files changed, 237 deletions(-) delete mode 100644 vp9/common/vp9_recon.c diff --git a/vp9/common/vp9_recon.c b/vp9/common/vp9_recon.c deleted file mode 100644 index 69a4720..0000000 --- a/vp9/common/vp9_recon.c +++ /dev/null @@ -1,59 +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. - */ - - -#include "./vpx_config.h" -#include "vp9_rtcd.h" -#include "vp9/common/vp9_blockd.h" - -static INLINE void recon(int rows, int cols, - const int16_t *diff_ptr, int diff_stride, - uint8_t *dst_ptr, int dst_stride) { - int r, c; - - for (r = 0; r < rows; r++) { - for (c = 0; c < cols; c++) - dst_ptr[c] = clip_pixel(diff_ptr[c] + dst_ptr[c]); - - dst_ptr += dst_stride; - diff_ptr += diff_stride; - } -} - - -void vp9_recon_b_c(uint8_t *pred_ptr, int16_t *diff_ptr, int diff_stride, - uint8_t *dst_ptr, int stride) { - assert(pred_ptr == dst_ptr); - recon(4, 4, diff_ptr, diff_stride, dst_ptr, stride); -} - -static void recon_plane(MACROBLOCKD *xd, BLOCK_SIZE_TYPE bsize, int plane) { - const int bw = 4 << (b_width_log2(bsize) - xd->plane[plane].subsampling_x); - const int bh = 4 << (b_height_log2(bsize) - xd->plane[plane].subsampling_y); - recon(bh, bw, - xd->plane[plane].diff, bw, - xd->plane[plane].dst.buf, xd->plane[plane].dst.stride); -} - -void vp9_recon_sby_c(MACROBLOCKD *mb, BLOCK_SIZE_TYPE bsize) { - recon_plane(mb, bsize, 0); -} - -void vp9_recon_sbuv_c(MACROBLOCKD *mb, BLOCK_SIZE_TYPE bsize) { - int i; - - for (i = 1; i < MAX_MB_PLANE; i++) - recon_plane(mb, bsize, i); -} - -void vp9_recon_sb_c(MACROBLOCKD *xd, BLOCK_SIZE_TYPE bsize) { - vp9_recon_sby(xd, bsize); - vp9_recon_sbuv(xd, bsize); -} diff --git a/vp9/common/vp9_rtcd_defs.sh b/vp9/common/vp9_rtcd_defs.sh index cb353b1..c68658d 100644 --- a/vp9/common/vp9_rtcd_defs.sh +++ b/vp9/common/vp9_rtcd_defs.sh @@ -60,18 +60,6 @@ vp9_copy_mem8x8_dspr2=vp9_copy_mem8x8_dspr2 prototype void vp9_copy_mem8x4 "const uint8_t *src, int src_pitch, uint8_t *dst, int dst_pitch" specialize vp9_copy_mem8x4 mmx -prototype void vp9_recon_b "uint8_t *pred_ptr, int16_t *diff_ptr, int diff_stride, uint8_t *dst_ptr, int stride" -specialize vp9_recon_b - -prototype void vp9_recon_sb "struct macroblockd *x, enum BLOCK_SIZE_TYPE bsize" -specialize vp9_recon_sb - -prototype void vp9_recon_sby "struct macroblockd *x, enum BLOCK_SIZE_TYPE bsize" -specialize vp9_recon_sby - -prototype void vp9_recon_sbuv "struct macroblockd *x, enum BLOCK_SIZE_TYPE bsize" -specialize void vp9_recon_sbuv - prototype void vp9_build_intra_predictors "uint8_t *src, int src_stride, uint8_t *pred, int y_stride, int mode, int bw, int bh, int up_available, int left_available, int right_available" specialize void vp9_build_intra_predictors diff --git a/vp9/common/x86/vp9_recon_mmx.asm b/vp9/common/x86/vp9_recon_mmx.asm index fc03d3f..6fbbe48 100644 --- a/vp9/common/x86/vp9_recon_mmx.asm +++ b/vp9/common/x86/vp9_recon_mmx.asm @@ -10,55 +10,6 @@ %include "vpx_ports/x86_abi_support.asm" -;void vp9_recon_b_mmx(unsigned char *s, short *q, unsigned char *d, int stride) -global sym(vp9_recon_b_mmx) PRIVATE -sym(vp9_recon_b_mmx): - push rbp - mov rbp, rsp - SHADOW_ARGS_TO_STACK 4 - push rsi - push rdi - ; end prolog - - mov rsi, arg(0) ;s - mov rdi, arg(2) ;d - mov rdx, arg(1) ;q - movsxd rax, dword ptr arg(3) ;stride - pxor mm0, mm0 - - movd mm1, [rsi] - punpcklbw mm1, mm0 - paddsw mm1, [rdx] - packuswb mm1, mm0 ; pack and unpack to saturate - movd [rdi], mm1 - - movd mm2, [rsi+16] - punpcklbw mm2, mm0 - paddsw mm2, [rdx+32] - packuswb mm2, mm0 ; pack and unpack to saturate - movd [rdi+rax], mm2 - - movd mm3, [rsi+32] - punpcklbw mm3, mm0 - paddsw mm3, [rdx+64] - packuswb mm3, mm0 ; pack and unpack to saturate - movd [rdi+2*rax], mm3 - - add rdi, rax - movd mm4, [rsi+48] - punpcklbw mm4, mm0 - paddsw mm4, [rdx+96] - packuswb mm4, mm0 ; pack and unpack to saturate - movd [rdi+2*rax], mm4 - - ; begin epilog - pop rdi - pop rsi - UNSHADOW_ARGS - pop rbp - ret - - ;void copy_mem8x8_mmx( ; unsigned char *src, ; int src_stride, diff --git a/vp9/common/x86/vp9_recon_sse2.asm b/vp9/common/x86/vp9_recon_sse2.asm index 154442d..9ee3043 100644 --- a/vp9/common/x86/vp9_recon_sse2.asm +++ b/vp9/common/x86/vp9_recon_sse2.asm @@ -10,122 +10,6 @@ %include "vpx_ports/x86_abi_support.asm" -;void vp9_recon2b_sse2(unsigned char *s, short *q, unsigned char *d, int stride) -global sym(vp9_recon2b_sse2) PRIVATE -sym(vp9_recon2b_sse2): - push rbp - mov rbp, rsp - SHADOW_ARGS_TO_STACK 4 - push rsi - push rdi - ; end prolog - - mov rsi, arg(0) ;s - mov rdi, arg(2) ;d - mov rdx, arg(1) ;q - movsxd rax, dword ptr arg(3) ;stride - pxor xmm0, xmm0 - - movq xmm1, MMWORD PTR [rsi] - punpcklbw xmm1, xmm0 - paddsw xmm1, XMMWORD PTR [rdx] - packuswb xmm1, xmm0 ; pack and unpack to saturate - movq MMWORD PTR [rdi], xmm1 - - - movq xmm2, MMWORD PTR [rsi+8] - punpcklbw xmm2, xmm0 - paddsw xmm2, XMMWORD PTR [rdx+16] - packuswb xmm2, xmm0 ; pack and unpack to saturate - movq MMWORD PTR [rdi+rax], xmm2 - - - movq xmm3, MMWORD PTR [rsi+16] - punpcklbw xmm3, xmm0 - paddsw xmm3, XMMWORD PTR [rdx+32] - packuswb xmm3, xmm0 ; pack and unpack to saturate - movq MMWORD PTR [rdi+rax*2], xmm3 - - add rdi, rax - movq xmm4, MMWORD PTR [rsi+24] - punpcklbw xmm4, xmm0 - paddsw xmm4, XMMWORD PTR [rdx+48] - packuswb xmm4, xmm0 ; pack and unpack to saturate - movq MMWORD PTR [rdi+rax*2], xmm4 - - ; begin epilog - pop rdi - pop rsi - UNSHADOW_ARGS - pop rbp - ret - - -;void vp9_recon4b_sse2(unsigned char *s, short *q, unsigned char *d, int stride) -global sym(vp9_recon4b_sse2) PRIVATE -sym(vp9_recon4b_sse2): - push rbp - mov rbp, rsp - SHADOW_ARGS_TO_STACK 4 - SAVE_XMM 7 - push rsi - push rdi - ; end prolog - - mov rsi, arg(0) ;s - mov rdi, arg(2) ;d - mov rdx, arg(1) ;q - movsxd rax, dword ptr arg(3) ;stride - pxor xmm0, xmm0 - - movdqa xmm1, XMMWORD PTR [rsi] - movdqa xmm5, xmm1 - punpcklbw xmm1, xmm0 - punpckhbw xmm5, xmm0 - paddsw xmm1, XMMWORD PTR [rdx] - paddsw xmm5, XMMWORD PTR [rdx+16] - packuswb xmm1, xmm5 ; pack and unpack to saturate - movdqa XMMWORD PTR [rdi], xmm1 - - - movdqa xmm2, XMMWORD PTR [rsi+16] - movdqa xmm6, xmm2 - punpcklbw xmm2, xmm0 - punpckhbw xmm6, xmm0 - paddsw xmm2, XMMWORD PTR [rdx+32] - paddsw xmm6, XMMWORD PTR [rdx+48] - packuswb xmm2, xmm6 ; pack and unpack to saturate - movdqa XMMWORD PTR [rdi+rax], xmm2 - - - movdqa xmm3, XMMWORD PTR [rsi+32] - movdqa xmm7, xmm3 - punpcklbw xmm3, xmm0 - punpckhbw xmm7, xmm0 - paddsw xmm3, XMMWORD PTR [rdx+64] - paddsw xmm7, XMMWORD PTR [rdx+80] - packuswb xmm3, xmm7 ; pack and unpack to saturate - movdqa XMMWORD PTR [rdi+rax*2], xmm3 - - add rdi, rax - movdqa xmm4, XMMWORD PTR [rsi+48] - movdqa xmm5, xmm4 - punpcklbw xmm4, xmm0 - punpckhbw xmm5, xmm0 - paddsw xmm4, XMMWORD PTR [rdx+96] - paddsw xmm5, XMMWORD PTR [rdx+112] - packuswb xmm4, xmm5 ; pack and unpack to saturate - movdqa XMMWORD PTR [rdi+rax*2], xmm4 - - ; begin epilog - pop rdi - pop rsi - RESTORE_XMM - UNSHADOW_ARGS - pop rbp - ret - - ;void copy_mem16x16_sse2( ; unsigned char *src, ; int src_stride, diff --git a/vp9/vp9_common.mk b/vp9/vp9_common.mk index ace7e6f..0c5ce1d 100644 --- a/vp9/vp9_common.mk +++ b/vp9/vp9_common.mk @@ -70,7 +70,6 @@ VP9_COMMON_SRCS-yes += common/vp9_modecontext.c VP9_COMMON_SRCS-yes += common/vp9_mvref_common.c VP9_COMMON_SRCS-yes += common/vp9_mvref_common.h VP9_COMMON_SRCS-yes += common/vp9_quant_common.c -VP9_COMMON_SRCS-yes += common/vp9_recon.c VP9_COMMON_SRCS-yes += common/vp9_reconinter.c VP9_COMMON_SRCS-yes += common/vp9_reconintra.c VP9_COMMON_SRCS-$(CONFIG_POSTPROC_VISUALIZER) += common/vp9_textblit.c -- 2.7.4