Commit aa909836 authored by Debargha Mukherjee's avatar Debargha Mukherjee

Move range checks into WRAPLOW

Provides more comprehensive coverage for --enable-coefficient-checking.
The intent is to make the --enable-coefficient-checking option
consistent with the VP9 spec.

Change-Id: I12d0120756d17572ca2b2d7e6a2ab9d8071d8d58
parent 6f397b8a
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -15,13 +15,14 @@ ...@@ -15,13 +15,14 @@
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vpx_dsp/txfm_common.h" #include "vpx_dsp/txfm_common.h"
#include "vpx_dsp/inv_txfm.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#ifdef __cplusplus #ifdef __cplusplus
extern "C" { extern "C" {
#endif #endif
static INLINE tran_low_t check_range(tran_high_t input) { static INLINE tran_high_t check_range(tran_high_t input) {
#if CONFIG_COEFFICIENT_RANGE_CHECKING #if CONFIG_COEFFICIENT_RANGE_CHECKING
// For valid VP9 input streams, intermediate stage coefficients should always // For valid VP9 input streams, intermediate stage coefficients should always
// stay within the range of a signed 16 bit integer. Coefficients can go out // stay within the range of a signed 16 bit integer. Coefficients can go out
...@@ -32,17 +33,17 @@ static INLINE tran_low_t check_range(tran_high_t input) { ...@@ -32,17 +33,17 @@ static INLINE tran_low_t check_range(tran_high_t input) {
assert(INT16_MIN <= input); assert(INT16_MIN <= input);
assert(input <= INT16_MAX); assert(input <= INT16_MAX);
#endif // CONFIG_COEFFICIENT_RANGE_CHECKING #endif // CONFIG_COEFFICIENT_RANGE_CHECKING
return (tran_low_t)input; return input;
} }
static INLINE tran_low_t dct_const_round_shift(tran_high_t input) { static INLINE tran_high_t dct_const_round_shift(tran_high_t input) {
tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS); tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS);
return check_range(rv); return rv;
} }
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
static INLINE tran_low_t highbd_check_range(tran_high_t input, static INLINE tran_high_t highbd_check_range(tran_high_t input,
int bd) { int bd) {
#if CONFIG_COEFFICIENT_RANGE_CHECKING #if CONFIG_COEFFICIENT_RANGE_CHECKING
// For valid highbitdepth VP9 streams, intermediate stage coefficients will // For valid highbitdepth VP9 streams, intermediate stage coefficients will
// stay within the ranges: // stay within the ranges:
...@@ -56,13 +57,12 @@ static INLINE tran_low_t highbd_check_range(tran_high_t input, ...@@ -56,13 +57,12 @@ static INLINE tran_low_t highbd_check_range(tran_high_t input,
(void) int_min; (void) int_min;
#endif // CONFIG_COEFFICIENT_RANGE_CHECKING #endif // CONFIG_COEFFICIENT_RANGE_CHECKING
(void) bd; (void) bd;
return (tran_low_t)input; return input;
} }
static INLINE tran_low_t highbd_dct_const_round_shift(tran_high_t input, static INLINE tran_high_t highbd_dct_const_round_shift(tran_high_t input) {
int bd) {
tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS); tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS);
return highbd_check_range(rv, bd); return rv;
} }
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
...@@ -83,9 +83,21 @@ static INLINE tran_low_t highbd_dct_const_round_shift(tran_high_t input, ...@@ -83,9 +83,21 @@ static INLINE tran_low_t highbd_dct_const_round_shift(tran_high_t input,
// bd of 10 uses trans_low with 18bits, need to remove 14bits // bd of 10 uses trans_low with 18bits, need to remove 14bits
// bd of 12 uses trans_low with 20bits, need to remove 12bits // bd of 12 uses trans_low with 20bits, need to remove 12bits
// bd of x uses trans_low with 8+x bits, need to remove 24-x bits // bd of x uses trans_low with 8+x bits, need to remove 24-x bits
#define WRAPLOW(x, bd) ((((int32_t)(x)) << (24 - bd)) >> (24 - bd))
#else #define WRAPLOW(x) ((((int32_t)check_range(x)) << 16) >> 16)
#define WRAPLOW(x, bd) ((int32_t)(x)) #if CONFIG_VP9_HIGHBITDEPTH
#define HIGHBD_WRAPLOW(x, bd) \
((((int32_t)highbd_check_range((x), bd)) << (24 - bd)) >> (24 - bd))
#endif // CONFIG_VP9_HIGHBITDEPTH
#else // CONFIG_EMULATE_HARDWARE
#define WRAPLOW(x) ((int32_t)check_range(x))
#if CONFIG_VP9_HIGHBITDEPTH
#define HIGHBD_WRAPLOW(x, bd) \
((int32_t)highbd_check_range((x), bd))
#endif // CONFIG_VP9_HIGHBITDEPTH
#endif // CONFIG_EMULATE_HARDWARE #endif // CONFIG_EMULATE_HARDWARE
void vp10_idct4_c(const tran_low_t *input, tran_low_t *output); void vp10_idct4_c(const tran_low_t *input, tran_low_t *output);
...@@ -107,14 +119,14 @@ void vp10_highbd_iadst16_c(const tran_low_t *input, tran_low_t *output, int bd); ...@@ -107,14 +119,14 @@ void vp10_highbd_iadst16_c(const tran_low_t *input, tran_low_t *output, int bd);
static INLINE uint16_t highbd_clip_pixel_add(uint16_t dest, tran_high_t trans, static INLINE uint16_t highbd_clip_pixel_add(uint16_t dest, tran_high_t trans,
int bd) { int bd) {
trans = WRAPLOW(trans, bd); trans = HIGHBD_WRAPLOW(trans, bd);
return clip_pixel_highbd(WRAPLOW(dest + trans, bd), bd); return clip_pixel_highbd(dest + trans, bd);
} }
#endif #endif
static INLINE uint8_t clip_pixel_add(uint8_t dest, tran_high_t trans) { static INLINE uint8_t clip_pixel_add(uint8_t dest, tran_high_t trans) {
trans = WRAPLOW(trans, 8); trans = WRAPLOW(trans);
return clip_pixel(WRAPLOW(dest + trans, 8)); return clip_pixel(dest + trans);
} }
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
extern "C" { extern "C" {
#endif #endif
static INLINE tran_low_t check_range(tran_high_t input) { static INLINE tran_high_t check_range(tran_high_t input) {
#if CONFIG_COEFFICIENT_RANGE_CHECKING #if CONFIG_COEFFICIENT_RANGE_CHECKING
// For valid VP9 input streams, intermediate stage coefficients should always // For valid VP9 input streams, intermediate stage coefficients should always
// stay within the range of a signed 16 bit integer. Coefficients can go out // stay within the range of a signed 16 bit integer. Coefficients can go out
...@@ -32,17 +32,17 @@ static INLINE tran_low_t check_range(tran_high_t input) { ...@@ -32,17 +32,17 @@ static INLINE tran_low_t check_range(tran_high_t input) {
assert(INT16_MIN <= input); assert(INT16_MIN <= input);
assert(input <= INT16_MAX); assert(input <= INT16_MAX);
#endif // CONFIG_COEFFICIENT_RANGE_CHECKING #endif // CONFIG_COEFFICIENT_RANGE_CHECKING
return (tran_low_t)input; return input;
} }
static INLINE tran_low_t dct_const_round_shift(tran_high_t input) { static INLINE tran_high_t dct_const_round_shift(tran_high_t input) {
tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS); tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS);
return check_range(rv); return (tran_high_t)rv;
} }
#if CONFIG_VP9_HIGHBITDEPTH #if CONFIG_VP9_HIGHBITDEPTH
static INLINE tran_low_t highbd_check_range(tran_high_t input, static INLINE tran_high_t highbd_check_range(tran_high_t input,
int bd) { int bd) {
#if CONFIG_COEFFICIENT_RANGE_CHECKING #if CONFIG_COEFFICIENT_RANGE_CHECKING
// For valid highbitdepth VP9 streams, intermediate stage coefficients will // For valid highbitdepth VP9 streams, intermediate stage coefficients will
// stay within the ranges: // stay within the ranges:
...@@ -56,13 +56,12 @@ static INLINE tran_low_t highbd_check_range(tran_high_t input, ...@@ -56,13 +56,12 @@ static INLINE tran_low_t highbd_check_range(tran_high_t input,
(void) int_min; (void) int_min;
#endif // CONFIG_COEFFICIENT_RANGE_CHECKING #endif // CONFIG_COEFFICIENT_RANGE_CHECKING
(void) bd; (void) bd;
return (tran_low_t)input; return input;
} }
static INLINE tran_low_t highbd_dct_const_round_shift(tran_high_t input, static INLINE tran_high_t highbd_dct_const_round_shift(tran_high_t input) {
int bd) {
tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS); tran_high_t rv = ROUND_POWER_OF_TWO(input, DCT_CONST_BITS);
return highbd_check_range(rv, bd); return (tran_high_t)rv;
} }
#endif // CONFIG_VP9_HIGHBITDEPTH #endif // CONFIG_VP9_HIGHBITDEPTH
...@@ -83,9 +82,20 @@ static INLINE tran_low_t highbd_dct_const_round_shift(tran_high_t input, ...@@ -83,9 +82,20 @@ static INLINE tran_low_t highbd_dct_const_round_shift(tran_high_t input,
// bd of 10 uses trans_low with 18bits, need to remove 14bits // bd of 10 uses trans_low with 18bits, need to remove 14bits
// bd of 12 uses trans_low with 20bits, need to remove 12bits // bd of 12 uses trans_low with 20bits, need to remove 12bits
// bd of x uses trans_low with 8+x bits, need to remove 24-x bits // bd of x uses trans_low with 8+x bits, need to remove 24-x bits
#define WRAPLOW(x, bd) ((((int32_t)(x)) << (24 - bd)) >> (24 - bd))
#else #define WRAPLOW(x) ((((int32_t)check_range(x)) << 16) >> 16)
#define WRAPLOW(x, bd) ((int32_t)(x)) #if CONFIG_VP9_HIGHBITDEPTH
#define HIGHBD_WRAPLOW(x, bd) \
((((int32_t)highbd_check_range((x), bd)) << (24 - bd)) >> (24 - bd))
#endif // CONFIG_VP9_HIGHBITDEPTH
#else // CONFIG_EMULATE_HARDWARE
#define WRAPLOW(x) ((int32_t)check_range(x))
#if CONFIG_VP9_HIGHBITDEPTH
#define HIGHBD_WRAPLOW(x, bd) \
((int32_t)highbd_check_range((x), bd))
#endif // CONFIG_VP9_HIGHBITDEPTH
#endif // CONFIG_EMULATE_HARDWARE #endif // CONFIG_EMULATE_HARDWARE
void idct4_c(const tran_low_t *input, tran_low_t *output); void idct4_c(const tran_low_t *input, tran_low_t *output);
...@@ -107,14 +117,14 @@ void vpx_highbd_iadst16_c(const tran_low_t *input, tran_low_t *output, int bd); ...@@ -107,14 +117,14 @@ void vpx_highbd_iadst16_c(const tran_low_t *input, tran_low_t *output, int bd);
static INLINE uint16_t highbd_clip_pixel_add(uint16_t dest, tran_high_t trans, static INLINE uint16_t highbd_clip_pixel_add(uint16_t dest, tran_high_t trans,
int bd) { int bd) {
trans = WRAPLOW(trans, bd); trans = HIGHBD_WRAPLOW(trans, bd);
return clip_pixel_highbd(WRAPLOW(dest + trans, bd), bd); return clip_pixel_highbd(dest + trans, bd);
} }
#endif #endif
static INLINE uint8_t clip_pixel_add(uint8_t dest, tran_high_t trans) { static INLINE uint8_t clip_pixel_add(uint8_t dest, tran_high_t trans) {
trans = WRAPLOW(trans, 8); trans = WRAPLOW(trans);
return clip_pixel(WRAPLOW(dest + trans, 8)); return clip_pixel(dest + trans);
} }
#ifdef __cplusplus #ifdef __cplusplus
} // extern "C" } // extern "C"
......
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