mirror of
https://github.com/signalwire/freeswitch.git
synced 2025-08-13 09:36:46 +00:00
[libvpx] Update to v1.8.1 from https://chromium.googlesource.com/webm/libvpx
This commit is contained in:
Anthony Minessale
committed by
Andrey Volk
Andrey Volk
parent
34fcadbd53
commit
ceb051af4e
@@ -7,8 +7,8 @@
|
||||
* 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_X86_CONVOLVE_H_
|
||||
#define VPX_DSP_X86_CONVOLVE_H_
|
||||
#ifndef VPX_VPX_DSP_X86_CONVOLVE_H_
|
||||
#define VPX_VPX_DSP_X86_CONVOLVE_H_
|
||||
|
||||
#include <assert.h>
|
||||
|
||||
@@ -16,56 +16,83 @@
|
||||
#include "vpx/vpx_integer.h"
|
||||
#include "vpx_ports/mem.h"
|
||||
|
||||
// TODO(chiyotsai@google.com): Refactor the code here. Currently this is pretty
|
||||
// hacky and awful to read. Note that there is a filter_x[3] == 128 check in
|
||||
// HIGHBD_FUN_CONV_2D to avoid seg fault due to the fact that the c function
|
||||
// assumes the filter is always 8 tap.
|
||||
typedef void filter8_1dfunction(const uint8_t *src_ptr, ptrdiff_t src_pitch,
|
||||
uint8_t *output_ptr, ptrdiff_t out_pitch,
|
||||
uint32_t output_height, const int16_t *filter);
|
||||
|
||||
#define FUN_CONV_1D(name, offset, step_q4, dir, src_start, avg, opt) \
|
||||
// TODO(chiyotsai@google.com): Remove the is_avg argument to the MACROS once we
|
||||
// have 4-tap vert avg filter.
|
||||
#define FUN_CONV_1D(name, offset, step_q4, dir, src_start, avg, opt, is_avg) \
|
||||
void vpx_convolve8_##name##_##opt( \
|
||||
const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, \
|
||||
ptrdiff_t dst_stride, const InterpKernel *filter_kernel, int x0_q4, \
|
||||
ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, \
|
||||
int x_step_q4, int y0_q4, int y_step_q4, int w, int h) { \
|
||||
const int16_t *filter = filter_kernel[offset]; \
|
||||
const int16_t *filter_row = filter[offset]; \
|
||||
(void)x0_q4; \
|
||||
(void)x_step_q4; \
|
||||
(void)y0_q4; \
|
||||
(void)y_step_q4; \
|
||||
assert(filter[3] != 128); \
|
||||
assert(filter_row[3] != 128); \
|
||||
assert(step_q4 == 16); \
|
||||
if (filter[0] | filter[1] | filter[2]) { \
|
||||
if (filter_row[0] | filter_row[1] | filter_row[6] | filter_row[7]) { \
|
||||
const int num_taps = 8; \
|
||||
while (w >= 16) { \
|
||||
vpx_filter_block1d16_##dir##8_##avg##opt(src_start, src_stride, dst, \
|
||||
dst_stride, h, filter); \
|
||||
dst_stride, h, filter_row); \
|
||||
src += 16; \
|
||||
dst += 16; \
|
||||
w -= 16; \
|
||||
} \
|
||||
if (w == 8) { \
|
||||
vpx_filter_block1d8_##dir##8_##avg##opt(src_start, src_stride, dst, \
|
||||
dst_stride, h, filter); \
|
||||
dst_stride, h, filter_row); \
|
||||
} else if (w == 4) { \
|
||||
vpx_filter_block1d4_##dir##8_##avg##opt(src_start, src_stride, dst, \
|
||||
dst_stride, h, filter); \
|
||||
dst_stride, h, filter_row); \
|
||||
} \
|
||||
} else { \
|
||||
(void)num_taps; \
|
||||
} else if (filter_row[2] | filter_row[5]) { \
|
||||
const int num_taps = is_avg ? 8 : 4; \
|
||||
while (w >= 16) { \
|
||||
vpx_filter_block1d16_##dir##2_##avg##opt(src, src_stride, dst, \
|
||||
dst_stride, h, filter); \
|
||||
vpx_filter_block1d16_##dir##4_##avg##opt(src_start, src_stride, dst, \
|
||||
dst_stride, h, filter_row); \
|
||||
src += 16; \
|
||||
dst += 16; \
|
||||
w -= 16; \
|
||||
} \
|
||||
if (w == 8) { \
|
||||
vpx_filter_block1d8_##dir##2_##avg##opt(src, src_stride, dst, \
|
||||
dst_stride, h, filter); \
|
||||
vpx_filter_block1d8_##dir##4_##avg##opt(src_start, src_stride, dst, \
|
||||
dst_stride, h, filter_row); \
|
||||
} else if (w == 4) { \
|
||||
vpx_filter_block1d4_##dir##2_##avg##opt(src, src_stride, dst, \
|
||||
dst_stride, h, filter); \
|
||||
vpx_filter_block1d4_##dir##4_##avg##opt(src_start, src_stride, dst, \
|
||||
dst_stride, h, filter_row); \
|
||||
} \
|
||||
(void)num_taps; \
|
||||
} else { \
|
||||
const int num_taps = 2; \
|
||||
while (w >= 16) { \
|
||||
vpx_filter_block1d16_##dir##2_##avg##opt(src_start, src_stride, dst, \
|
||||
dst_stride, h, filter_row); \
|
||||
src += 16; \
|
||||
dst += 16; \
|
||||
w -= 16; \
|
||||
} \
|
||||
if (w == 8) { \
|
||||
vpx_filter_block1d8_##dir##2_##avg##opt(src_start, src_stride, dst, \
|
||||
dst_stride, h, filter_row); \
|
||||
} else if (w == 4) { \
|
||||
vpx_filter_block1d4_##dir##2_##avg##opt(src_start, src_stride, dst, \
|
||||
dst_stride, h, filter_row); \
|
||||
} \
|
||||
(void)num_taps; \
|
||||
} \
|
||||
}
|
||||
|
||||
#define FUN_CONV_2D(avg, opt) \
|
||||
#define FUN_CONV_2D(avg, opt, is_avg) \
|
||||
void vpx_convolve8_##avg##opt( \
|
||||
const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, \
|
||||
ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, \
|
||||
@@ -79,7 +106,7 @@ typedef void filter8_1dfunction(const uint8_t *src_ptr, ptrdiff_t src_pitch,
|
||||
assert(h <= 64); \
|
||||
assert(x_step_q4 == 16); \
|
||||
assert(y_step_q4 == 16); \
|
||||
if (filter_x[0] | filter_x[1] | filter_x[2]) { \
|
||||
if (filter_x[0] | filter_x[1] | filter_x[6] | filter_x[7]) { \
|
||||
DECLARE_ALIGNED(16, uint8_t, fdata2[64 * 71]); \
|
||||
vpx_convolve8_horiz_##opt(src - 3 * src_stride, src_stride, fdata2, 64, \
|
||||
filter, x0_q4, x_step_q4, y0_q4, y_step_q4, w, \
|
||||
@@ -87,6 +114,15 @@ typedef void filter8_1dfunction(const uint8_t *src_ptr, ptrdiff_t src_pitch,
|
||||
vpx_convolve8_##avg##vert_##opt(fdata2 + 3 * 64, 64, dst, dst_stride, \
|
||||
filter, x0_q4, x_step_q4, y0_q4, \
|
||||
y_step_q4, w, h); \
|
||||
} else if (filter_x[2] | filter_x[5]) { \
|
||||
const int num_taps = is_avg ? 8 : 4; \
|
||||
DECLARE_ALIGNED(16, uint8_t, fdata2[64 * 71]); \
|
||||
vpx_convolve8_horiz_##opt( \
|
||||
src - (num_taps / 2 - 1) * src_stride, src_stride, fdata2, 64, \
|
||||
filter, x0_q4, x_step_q4, y0_q4, y_step_q4, w, h + num_taps - 1); \
|
||||
vpx_convolve8_##avg##vert_##opt(fdata2 + 64 * (num_taps / 2 - 1), 64, \
|
||||
dst, dst_stride, filter, x0_q4, \
|
||||
x_step_q4, y0_q4, y_step_q4, w, h); \
|
||||
} else { \
|
||||
DECLARE_ALIGNED(16, uint8_t, fdata2[64 * 65]); \
|
||||
vpx_convolve8_horiz_##opt(src, src_stride, fdata2, 64, filter, x0_q4, \
|
||||
@@ -106,57 +142,86 @@ typedef void highbd_filter8_1dfunction(const uint16_t *src_ptr,
|
||||
unsigned int output_height,
|
||||
const int16_t *filter, int bd);
|
||||
|
||||
#define HIGH_FUN_CONV_1D(name, offset, step_q4, dir, src_start, avg, opt) \
|
||||
#define HIGH_FUN_CONV_1D(name, offset, step_q4, dir, src_start, avg, opt, \
|
||||
is_avg) \
|
||||
void vpx_highbd_convolve8_##name##_##opt( \
|
||||
const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, \
|
||||
ptrdiff_t dst_stride, const InterpKernel *filter_kernel, int x0_q4, \
|
||||
int x_step_q4, int y0_q4, int y_step_q4, int w, int h, int bd) { \
|
||||
const int16_t *filter = filter_kernel[offset]; \
|
||||
if (step_q4 == 16 && filter[3] != 128) { \
|
||||
if (filter[0] | filter[1] | filter[2]) { \
|
||||
const int16_t *filter_row = filter_kernel[offset]; \
|
||||
if (step_q4 == 16 && filter_row[3] != 128) { \
|
||||
if (filter_row[0] | filter_row[1] | filter_row[6] | filter_row[7]) { \
|
||||
const int num_taps = 8; \
|
||||
while (w >= 16) { \
|
||||
vpx_highbd_filter_block1d16_##dir##8_##avg##opt( \
|
||||
src_start, src_stride, dst, dst_stride, h, filter, bd); \
|
||||
src_start, src_stride, dst, dst_stride, h, filter_row, bd); \
|
||||
src += 16; \
|
||||
dst += 16; \
|
||||
w -= 16; \
|
||||
} \
|
||||
while (w >= 8) { \
|
||||
vpx_highbd_filter_block1d8_##dir##8_##avg##opt( \
|
||||
src_start, src_stride, dst, dst_stride, h, filter, bd); \
|
||||
src_start, src_stride, dst, dst_stride, h, filter_row, bd); \
|
||||
src += 8; \
|
||||
dst += 8; \
|
||||
w -= 8; \
|
||||
} \
|
||||
while (w >= 4) { \
|
||||
vpx_highbd_filter_block1d4_##dir##8_##avg##opt( \
|
||||
src_start, src_stride, dst, dst_stride, h, filter, bd); \
|
||||
src_start, src_stride, dst, dst_stride, h, filter_row, bd); \
|
||||
src += 4; \
|
||||
dst += 4; \
|
||||
w -= 4; \
|
||||
} \
|
||||
(void)num_taps; \
|
||||
} else if (filter_row[2] | filter_row[5]) { \
|
||||
const int num_taps = is_avg ? 8 : 4; \
|
||||
while (w >= 16) { \
|
||||
vpx_highbd_filter_block1d16_##dir##4_##avg##opt( \
|
||||
src_start, src_stride, dst, dst_stride, h, filter_row, bd); \
|
||||
src += 16; \
|
||||
dst += 16; \
|
||||
w -= 16; \
|
||||
} \
|
||||
while (w >= 8) { \
|
||||
vpx_highbd_filter_block1d8_##dir##4_##avg##opt( \
|
||||
src_start, src_stride, dst, dst_stride, h, filter_row, bd); \
|
||||
src += 8; \
|
||||
dst += 8; \
|
||||
w -= 8; \
|
||||
} \
|
||||
while (w >= 4) { \
|
||||
vpx_highbd_filter_block1d4_##dir##4_##avg##opt( \
|
||||
src_start, src_stride, dst, dst_stride, h, filter_row, bd); \
|
||||
src += 4; \
|
||||
dst += 4; \
|
||||
w -= 4; \
|
||||
} \
|
||||
(void)num_taps; \
|
||||
} else { \
|
||||
const int num_taps = 2; \
|
||||
while (w >= 16) { \
|
||||
vpx_highbd_filter_block1d16_##dir##2_##avg##opt( \
|
||||
src, src_stride, dst, dst_stride, h, filter, bd); \
|
||||
src_start, src_stride, dst, dst_stride, h, filter_row, bd); \
|
||||
src += 16; \
|
||||
dst += 16; \
|
||||
w -= 16; \
|
||||
} \
|
||||
while (w >= 8) { \
|
||||
vpx_highbd_filter_block1d8_##dir##2_##avg##opt( \
|
||||
src, src_stride, dst, dst_stride, h, filter, bd); \
|
||||
src_start, src_stride, dst, dst_stride, h, filter_row, bd); \
|
||||
src += 8; \
|
||||
dst += 8; \
|
||||
w -= 8; \
|
||||
} \
|
||||
while (w >= 4) { \
|
||||
vpx_highbd_filter_block1d4_##dir##2_##avg##opt( \
|
||||
src, src_stride, dst, dst_stride, h, filter, bd); \
|
||||
src_start, src_stride, dst, dst_stride, h, filter_row, bd); \
|
||||
src += 4; \
|
||||
dst += 4; \
|
||||
w -= 4; \
|
||||
} \
|
||||
(void)num_taps; \
|
||||
} \
|
||||
} \
|
||||
if (w) { \
|
||||
@@ -166,7 +231,7 @@ typedef void highbd_filter8_1dfunction(const uint16_t *src_ptr,
|
||||
} \
|
||||
}
|
||||
|
||||
#define HIGH_FUN_CONV_2D(avg, opt) \
|
||||
#define HIGH_FUN_CONV_2D(avg, opt, is_avg) \
|
||||
void vpx_highbd_convolve8_##avg##opt( \
|
||||
const uint16_t *src, ptrdiff_t src_stride, uint16_t *dst, \
|
||||
ptrdiff_t dst_stride, const InterpKernel *filter, int x0_q4, \
|
||||
@@ -175,7 +240,8 @@ typedef void highbd_filter8_1dfunction(const uint16_t *src_ptr,
|
||||
assert(w <= 64); \
|
||||
assert(h <= 64); \
|
||||
if (x_step_q4 == 16 && y_step_q4 == 16) { \
|
||||
if ((filter_x[0] | filter_x[1] | filter_x[2]) || filter_x[3] == 128) { \
|
||||
if ((filter_x[0] | filter_x[1] | filter_x[6] | filter_x[7]) || \
|
||||
filter_x[3] == 128) { \
|
||||
DECLARE_ALIGNED(16, uint16_t, fdata2[64 * 71]); \
|
||||
vpx_highbd_convolve8_horiz_##opt(src - 3 * src_stride, src_stride, \
|
||||
fdata2, 64, filter, x0_q4, x_step_q4, \
|
||||
@@ -183,6 +249,16 @@ typedef void highbd_filter8_1dfunction(const uint16_t *src_ptr,
|
||||
vpx_highbd_convolve8_##avg##vert_##opt( \
|
||||
fdata2 + 192, 64, dst, dst_stride, filter, x0_q4, x_step_q4, \
|
||||
y0_q4, y_step_q4, w, h, bd); \
|
||||
} else if (filter_x[2] | filter_x[5]) { \
|
||||
const int num_taps = is_avg ? 8 : 4; \
|
||||
DECLARE_ALIGNED(16, uint16_t, fdata2[64 * 71]); \
|
||||
vpx_highbd_convolve8_horiz_##opt( \
|
||||
src - (num_taps / 2 - 1) * src_stride, src_stride, fdata2, 64, \
|
||||
filter, x0_q4, x_step_q4, y0_q4, y_step_q4, w, h + num_taps - 1, \
|
||||
bd); \
|
||||
vpx_highbd_convolve8_##avg##vert_##opt( \
|
||||
fdata2 + 64 * (num_taps / 2 - 1), 64, dst, dst_stride, filter, \
|
||||
x0_q4, x_step_q4, y0_q4, y_step_q4, w, h, bd); \
|
||||
} else { \
|
||||
DECLARE_ALIGNED(16, uint16_t, fdata2[64 * 65]); \
|
||||
vpx_highbd_convolve8_horiz_##opt(src, src_stride, fdata2, 64, filter, \
|
||||
@@ -198,6 +274,6 @@ typedef void highbd_filter8_1dfunction(const uint16_t *src_ptr,
|
||||
bd); \
|
||||
} \
|
||||
}
|
||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||
|
||||
#endif // VPX_DSP_X86_CONVOLVE_H_
|
||||
#endif // CONFIG_VP9_HIGHBITDEPTH
|
||||
#endif // VPX_VPX_DSP_X86_CONVOLVE_H_
|
||||
|
||||
Reference in New Issue
Block a user