Commit 7723b8df authored by Jingning Han's avatar Jingning Han Committed by Gerrit Code Review

Merge "Add common_dspr2.c file to vpx_dsp/mips"

parents 9d927372 92b08f51
......@@ -323,17 +323,11 @@ void vpx_dsputil_static_init();
#if CONFIG_VP8
void dsputil_static_init();
#endif
#if CONFIG_VP9
void vp9_dsputil_static_init();
#endif
vpx_dsputil_static_init();
#if CONFIG_VP8
dsputil_static_init();
#endif
#if CONFIG_VP9
vp9_dsputil_static_init();
#endif
#endif
}
#endif
......
......@@ -22,9 +22,6 @@ extern "C" {
#endif
#if HAVE_DSPR2
extern uint8_t *vpx_ff_cropTbl;
#define DCT_CONST_ROUND_SHIFT_TWICE_COSPI_16_64(input) ({ \
\
int32_t tmp, out; \
......
......@@ -73,7 +73,6 @@ endif
# 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.c
ifneq ($(CONFIG_VP9_HIGHBITDEPTH),yes)
VP9_COMMON_SRCS-$(HAVE_DSPR2) += common/mips/dspr2/vp9_itrans4_dspr2.c
......
/*
* Copyright (c) 2013 The WebM project authors. All Rights Reserved.
* 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
......@@ -8,25 +8,23 @@
* 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"
#include "vpx_dsp/mips/common_dspr2.h"
#if HAVE_DSPR2
uint8_t vp9_ff_cropTbl_a[256 + 2 * CROP_WIDTH];
uint8_t *vp9_ff_cropTbl;
uint8_t vpx_ff_cropTbl_a[256 + 2 * CROP_WIDTH];
uint8_t *vpx_ff_cropTbl;
void vp9_dsputil_static_init(void) {
void vpx_dsputil_static_init(void) {
int i;
for (i = 0; i < 256; i++) vp9_ff_cropTbl_a[i + CROP_WIDTH] = i;
for (i = 0; i < 256; i++) vpx_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;
vpx_ff_cropTbl_a[i] = 0;
vpx_ff_cropTbl_a[i + CROP_WIDTH + 256] = 255;
}
vp9_ff_cropTbl = &vp9_ff_cropTbl_a[CROP_WIDTH];
vpx_ff_cropTbl = &vpx_ff_cropTbl_a[CROP_WIDTH];
}
#endif
......@@ -18,22 +18,6 @@
#include "vpx_ports/mem.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];
}
static void convolve_horiz_4_transposed_dspr2(const uint8_t *src,
int32_t src_stride,
uint8_t *dst,
......
......@@ -54,6 +54,9 @@ DSP_SRCS-$(HAVE_DSPR2) += mips/intrapred8_dspr2.c
DSP_SRCS-$(HAVE_DSPR2) += mips/intrapred16_dspr2.c
endif # CONFIG_VP9
DSP_SRCS-$(HAVE_DSPR2) += mips/common_dspr2.h
DSP_SRCS-$(HAVE_DSPR2) += mips/common_dspr2.c
# interpolation filters
DSP_SRCS-yes += vpx_convolve.c
DSP_SRCS-yes += vpx_convolve.h
......
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