Skip to content

GitLab

Commit 3be8c5fc authored by Yaowu Xu's avatar Yaowu Xu Committed by Gerrit Code Review
Browse files

Merge "Replace inline with INLINE" into nextgenv2

parents 2041979a f2512710
Show whitespace changes
Inline Side-by-side
vp10/common/vp10_fwd_txfm2d.c
View file @ 3be8c5fc
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
#include "vp10/common/vp10_fwd_txfm2d_cfg.h" #include "vp10/common/vp10_fwd_txfm2d_cfg.h"
#include "vp10/common/vp10_txfm.h" #include "vp10/common/vp10_txfm.h"
static inline TxfmFunc fwd_txfm_type_to_func(TXFM_TYPE txfm_type) { static INLINE TxfmFunc fwd_txfm_type_to_func(TXFM_TYPE txfm_type) {
switch (txfm_type) { switch (txfm_type) {
case TXFM_TYPE_DCT4: case TXFM_TYPE_DCT4:
return vp10_fdct4_new; return vp10_fdct4_new;
...@@ -50,7 +50,7 @@ static inline TxfmFunc fwd_txfm_type_to_func(TXFM_TYPE txfm_type) { ...@@ -50,7 +50,7 @@ static inline TxfmFunc fwd_txfm_type_to_func(TXFM_TYPE txfm_type) {
} }
} }
static inline void fwd_txfm2d_c(const int16_t *input, int32_t *output, static INLINE void fwd_txfm2d_c(const int16_t *input, int32_t *output,
const int stride, const TXFM_2D_CFG *cfg, const int stride, const TXFM_2D_CFG *cfg,
int32_t *buf) { int32_t *buf) {
int i, j; int i, j;
......
vp10/common/vp10_inv_txfm2d.c
View file @ 3be8c5fc
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "vp10/common/vp10_txfm.h" #include "vp10/common/vp10_txfm.h"
#include "vp10/common/vp10_inv_txfm1d.h" #include "vp10/common/vp10_inv_txfm1d.h"
static inline TxfmFunc inv_txfm_type_to_func(TXFM_TYPE txfm_type) { static INLINE TxfmFunc inv_txfm_type_to_func(TXFM_TYPE txfm_type) {
switch (txfm_type) { switch (txfm_type) {
case TXFM_TYPE_DCT4: case TXFM_TYPE_DCT4:
return vp10_idct4_new; return vp10_idct4_new;
...@@ -46,7 +46,7 @@ static inline TxfmFunc inv_txfm_type_to_func(TXFM_TYPE txfm_type) { ...@@ -46,7 +46,7 @@ static inline TxfmFunc inv_txfm_type_to_func(TXFM_TYPE txfm_type) {
} }
} }
static inline void inv_txfm2d_add_c(const int32_t *input, int16_t *output, static INLINE void inv_txfm2d_add_c(const int32_t *input, int16_t *output,
int stride, const TXFM_2D_CFG *cfg, int stride, const TXFM_2D_CFG *cfg,
int32_t *txfm_buf) { int32_t *txfm_buf) {
const int txfm_size = cfg->txfm_size; const int txfm_size = cfg->txfm_size;
......
vp10/common/x86/vp10_fwd_txfm2d_sse4.c
View file @ 3be8c5fc
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
#include "vp10/common/vp10_fwd_txfm2d_cfg.h" #include "vp10/common/vp10_fwd_txfm2d_cfg.h"
#include "vp10/common/x86/vp10_txfm1d_sse4.h" #include "vp10/common/x86/vp10_txfm1d_sse4.h"
static inline void int16_array_with_stride_to_int32_array_without_stride( static INLINE void int16_array_with_stride_to_int32_array_without_stride(
const int16_t *input, int stride, int32_t *output, int txfm1d_size) { const int16_t *input, int stride, int32_t *output, int txfm1d_size) {
int r, c; int r, c;
for (r = 0; r < txfm1d_size; r++) { for (r = 0; r < txfm1d_size; r++) {
...@@ -24,7 +24,7 @@ static inline void int16_array_with_stride_to_int32_array_without_stride( ...@@ -24,7 +24,7 @@ static inline void int16_array_with_stride_to_int32_array_without_stride(
typedef void (*TxfmFuncSSE2)(const __m128i *input, __m128i *output, typedef void (*TxfmFuncSSE2)(const __m128i *input, __m128i *output,
const int8_t *cos_bit, const int8_t *stage_range); const int8_t *cos_bit, const int8_t *stage_range);
static inline TxfmFuncSSE2 fwd_txfm_type_to_func(TXFM_TYPE txfm_type) { static INLINE TxfmFuncSSE2 fwd_txfm_type_to_func(TXFM_TYPE txfm_type) {
switch (txfm_type) { switch (txfm_type) {
case TXFM_TYPE_DCT4: case TXFM_TYPE_DCT4:
return vp10_fdct4_new_sse4_1; return vp10_fdct4_new_sse4_1;
...@@ -59,7 +59,7 @@ static inline TxfmFuncSSE2 fwd_txfm_type_to_func(TXFM_TYPE txfm_type) { ...@@ -59,7 +59,7 @@ static inline TxfmFuncSSE2 fwd_txfm_type_to_func(TXFM_TYPE txfm_type) {
return NULL; return NULL;
} }
static inline void fwd_txfm2d_sse4_1(const int16_t *input, int32_t *output, static INLINE void fwd_txfm2d_sse4_1(const int16_t *input, int32_t *output,
const int stride, const TXFM_2D_CFG *cfg, const int stride, const TXFM_2D_CFG *cfg,
int32_t *txfm_buf) { int32_t *txfm_buf) {
const int txfm_size = cfg->txfm_size; const int txfm_size = cfg->txfm_size;
......
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