generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add common_dspr2.c file to vpx_dsp/mips

Browse Source 
Move the declaration of commonly referenced variable to
vpx_dsp/mips/common_dspr2.c.

Change-Id: Ia51287b02e2ac5cfae0fba98c721f0810618f28e
This commit is contained in:
Jingning Han 2015-08-03 10:17:45 -07:00
parent a68356202d
commit 92b08f516a
7 changed files with 33 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/make/rtcd.pl
View File

@ -323,17 +323,11 @@ void vpx_dsputil_static_init();
#if CONFIG_VP8 #if CONFIG_VP8
void dsputil_static_init(); void dsputil_static_init();
#endif #endif
#if CONFIG_VP9
void vp9_dsputil_static_init();
#endif
vpx_dsputil_static_init(); vpx_dsputil_static_init();
#if CONFIG_VP8 #if CONFIG_VP8
dsputil_static_init(); dsputil_static_init();
#endif #endif
#if CONFIG_VP9
vp9_dsputil_static_init();
#endif
#endif #endif
} }
#endif #endif

32
vp9/common/mips/dspr2/vp9_common_dspr2.c
View File

@ -1,32 +0,0 @@
/*
* Copyright (c) 2013 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 "vp9/common/mips/dspr2/vp9_common_dspr2.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h"
#if HAVE_DSPR2
uint8_t vp9_ff_cropTbl_a[256 + 2 * CROP_WIDTH];
uint8_t *vp9_ff_cropTbl;
void vp9_dsputil_static_init(void) {
int i;
for (i = 0; i < 256; i++) vp9_ff_cropTbl_a[i + CROP_WIDTH] = i;
for (i = 0; i < CROP_WIDTH; i++) {
vp9_ff_cropTbl_a[i] = 0;
vp9_ff_cropTbl_a[i + CROP_WIDTH + 256] = 255;
}
vp9_ff_cropTbl = &vp9_ff_cropTbl_a[CROP_WIDTH];
}
#endif

3
vp9/common/mips/dspr2/vp9_common_dspr2.h
View File

@ -22,9 +22,6 @@ extern "C" {
#endif #endif
#if HAVE_DSPR2 #if HAVE_DSPR2
extern uint8_t *vpx_ff_cropTbl;
#define DCT_CONST_ROUND_SHIFT_TWICE_COSPI_16_64(input) ({ \ #define DCT_CONST_ROUND_SHIFT_TWICE_COSPI_16_64(input) ({ \
\ \
int32_t tmp, out; \ int32_t tmp, out; \

1
vp9/vp9_common.mk
View File

@ -73,7 +73,6 @@ endif
# common (c) # common (c)
VP9_COMMON_SRCS-$(HAVE_DSPR2) += common/mips/dspr2/vp9_common_dspr2.h VP9_COMMON_SRCS-$(HAVE_DSPR2) += common/mips/dspr2/vp9_common_dspr2.h
VP9_COMMON_SRCS-$(HAVE_DSPR2) += common/mips/dspr2/vp9_common_dspr2.c
ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes) ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
VP9_COMMON_SRCS-$(HAVE_DSPR2) += common/mips/dspr2/vp9_itrans4_dspr2.c VP9_COMMON_SRCS-$(HAVE_DSPR2) += common/mips/dspr2/vp9_itrans4_dspr2.c

30
vpx_dsp/mips/common_dspr2.c Normal file
View File

@ -0,0 +1,30 @@
/*
* Copyright (c) 2015 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_dsp/mips/common_dspr2.h"
#if HAVE_DSPR2
uint8_t vpx_ff_cropTbl_a[256 + 2 * CROP_WIDTH];
uint8_t *vpx_ff_cropTbl;
void vpx_dsputil_static_init(void) {
int i;
for (i = 0; i < 256; i++) vpx_ff_cropTbl_a[i + CROP_WIDTH] = i;
for (i = 0; i < CROP_WIDTH; i++) {
vpx_ff_cropTbl_a[i] = 0;
vpx_ff_cropTbl_a[i + CROP_WIDTH + 256] = 255;
}
vpx_ff_cropTbl = &vpx_ff_cropTbl_a[CROP_WIDTH];
}
#endif

16
vpx_dsp/mips/convolve8_dspr2.c
View File

@ -18,22 +18,6 @@
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#if HAVE_DSPR2 #if HAVE_DSPR2
uint8_t vpx_ff_cropTbl_a[256 + 2 * CROP_WIDTH];
uint8_t *vpx_ff_cropTbl;
void vpx_dsputil_static_init(void) {
int i;
for (i = 0; i < 256; i++) vpx_ff_cropTbl_a[i + CROP_WIDTH] = i;
for (i = 0; i < CROP_WIDTH; i++) {
vpx_ff_cropTbl_a[i] = 0;
vpx_ff_cropTbl_a[i + CROP_WIDTH + 256] = 255;
}
vpx_ff_cropTbl = &vpx_ff_cropTbl_a[CROP_WIDTH];
}
static void convolve_horiz_4_transposed_dspr2(const uint8_t *src, static void convolve_horiz_4_transposed_dspr2(const uint8_t *src,
int32_t src_stride, int32_t src_stride,
uint8_t *dst, uint8_t *dst,

3
vpx_dsp/vpx_dsp.mk
View File

@ -54,6 +54,9 @@ DSP_SRCS-$(HAVE_DSPR2) += mips/intrapred8_dspr2.c
DSP_SRCS-$(HAVE_DSPR2) += mips/intrapred16_dspr2.c DSP_SRCS-$(HAVE_DSPR2) += mips/intrapred16_dspr2.c
endif # CONFIG_VP9 endif # CONFIG_VP9
DSP_SRCS-$(HAVE_DSPR2) += mips/common_dspr2.h
DSP_SRCS-$(HAVE_DSPR2) += mips/common_dspr2.c
# interpolation filters # interpolation filters
DSP_SRCS-yes += vpx_convolve.c DSP_SRCS-yes += vpx_convolve.c
DSP_SRCS-yes += vpx_convolve.h DSP_SRCS-yes += vpx_convolve.h