Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Xiph.Org
aom-rav1e
Commits
b946e5ce
Commit
b946e5ce
authored
Jul 15, 2015
by
Jingning Han
Committed by
Gerrit Code Review
Jul 15, 2015
Browse files
Options
Browse Files
Download
Plain Diff
Merge "Add vpx_dsp_common.h file"
parents
de740b25
db8e731b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
46 additions
and
16 deletions
+46
-16
vp9/common/vp9_common.h
vp9/common/vp9_common.h
+1
-15
vp9/common/vp9_loopfilter_filters.c
vp9/common/vp9_loopfilter_filters.c
+1
-1
vpx_dsp/vpx_dsp.mk
vpx_dsp/vpx_dsp.mk
+1
-0
vpx_dsp/vpx_dsp_common.h
vpx_dsp/vpx_dsp_common.h
+43
-0
No files found.
vp9/common/vp9_common.h
View file @
b946e5ce
...
...
@@ -16,6 +16,7 @@
#include <assert.h>
#include "./vpx_config.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_mem/vpx_mem.h"
#include "vpx/vpx_integer.h"
#include "vp9/common/vp9_systemdependent.h"
...
...
@@ -24,9 +25,6 @@
extern
"C"
{
#endif
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
// Only need this for fixed-size arrays, for structs just assign.
#define vp9_copy(dest, src) { \
assert(sizeof(dest) == sizeof(src)); \
...
...
@@ -42,18 +40,6 @@ extern "C" {
#define vp9_zero(dest) memset(&(dest), 0, sizeof(dest))
#define vp9_zero_array(dest, n) memset(dest, 0, n * sizeof(*dest))
static
INLINE
uint8_t
clip_pixel
(
int
val
)
{
return
(
val
>
255
)
?
255
:
(
val
<
0
)
?
0
:
val
;
}
static
INLINE
int
clamp
(
int
value
,
int
low
,
int
high
)
{
return
value
<
low
?
low
:
(
value
>
high
?
high
:
value
);
}
static
INLINE
double
fclamp
(
double
value
,
double
low
,
double
high
)
{
return
value
<
low
?
low
:
(
value
>
high
?
high
:
value
);
}
static
INLINE
int
get_unsigned_bits
(
unsigned
int
num_values
)
{
return
num_values
>
0
?
get_msb
(
num_values
)
+
1
:
0
;
}
...
...
vp9/common/vp9_loopfilter_filters.c
View file @
b946e5ce
...
...
@@ -9,8 +9,8 @@
*/
#include "./vpx_config.h"
#include "vpx_dsp/vpx_dsp_common.h"
#include "vpx_ports/mem.h"
#include "vp9/common/vp9_common.h"
static
INLINE
int8_t
signed_char_clamp
(
int
t
)
{
return
(
int8_t
)
clamp
(
t
,
-
128
,
127
);
...
...
vpx_dsp/vpx_dsp.mk
View file @
b946e5ce
...
...
@@ -9,6 +9,7 @@
##
DSP_SRCS-yes
+=
vpx_dsp.mk
DSP_SRCS-yes
+=
vpx_dsp_common.h
DSP_SRCS-$(HAVE_MSA)
+=
mips/macros_msa.h
...
...
vpx_dsp/vpx_dsp_common.h
0 → 100644
View file @
b946e5ce
/*
* 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.
*/
#ifndef VPX_DSP_COMMON_H_
#define VPX_DSP_COMMON_H_
#include <stdlib.h>
#include "./vpx_config.h"
#include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h"
#ifdef __cplusplus
extern
"C"
{
#endif
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
static
INLINE
uint8_t
clip_pixel
(
int
val
)
{
return
(
val
>
255
)
?
255
:
(
val
<
0
)
?
0
:
val
;
}
static
INLINE
int
clamp
(
int
value
,
int
low
,
int
high
)
{
return
value
<
low
?
low
:
(
value
>
high
?
high
:
value
);
}
static
INLINE
double
fclamp
(
double
value
,
double
low
,
double
high
)
{
return
value
<
low
?
low
:
(
value
>
high
?
high
:
value
);
}
#ifdef __cplusplus
}
// extern "C"
#endif
#endif // VPX_DSP_COMMON_H_
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment