提交 b644421c authored 作者: Anthony Minessale's avatar Anthony Minessale 提交者: Andrey Volk

core side of vpx update

上级 f49279b4
...@@ -195,49 +195,55 @@ CORE_LIBS+=libfreeswitch_spandsp.la ...@@ -195,49 +195,55 @@ CORE_LIBS+=libfreeswitch_spandsp.la
if ENABLE_LIBYUV if ENABLE_LIBYUV
libfreeswitch_libyuv_la_SOURCES = \ libfreeswitch_libyuv_la_SOURCES = \
libs/libyuv/source/compare.cc \ libs/libyuv/source/compare.cc \
libs/libyuv/source/compare_common.cc \ libs/libyuv/source/compare_common.cc \
libs/libyuv/source/compare_gcc.cc \ libs/libyuv/source/compare_gcc.cc \
libs/libyuv/source/convert.cc \ libs/libyuv/source/compare_mmi.cc \
libs/libyuv/source/convert_argb.cc \ libs/libyuv/source/compare_msa.cc \
libs/libyuv/source/convert_from.cc \ libs/libyuv/source/compare_neon64.cc \
libs/libyuv/source/convert_from_argb.cc \ libs/libyuv/source/compare_neon.cc \
libs/libyuv/source/convert_to_argb.cc \ libs/libyuv/source/compare_win.cc \
libs/libyuv/source/convert_to_i420.cc \ libs/libyuv/source/convert_argb.cc \
libs/libyuv/source/cpu_id.cc \ libs/libyuv/source/convert.cc \
libs/libyuv/source/planar_functions.cc \ libs/libyuv/source/convert_from_argb.cc \
libs/libyuv/source/rotate.cc \ libs/libyuv/source/convert_from.cc \
libs/libyuv/source/rotate_any.cc \ libs/libyuv/source/convert_jpeg.cc \
libs/libyuv/source/rotate_argb.cc \ libs/libyuv/source/convert_to_argb.cc \
libs/libyuv/source/rotate_common.cc \ libs/libyuv/source/convert_to_i420.cc \
libs/libyuv/source/rotate_gcc.cc \ libs/libyuv/source/cpu_id.cc \
libs/libyuv/source/rotate_mips.cc \ libs/libyuv/source/mjpeg_decoder.cc \
libs/libyuv/source/row_any.cc \ libs/libyuv/source/mjpeg_validate.cc \
libs/libyuv/source/row_common.cc \ libs/libyuv/source/planar_functions.cc \
libs/libyuv/source/row_mips.cc \ libs/libyuv/source/rotate_any.cc \
libs/libyuv/source/row_gcc.cc \ libs/libyuv/source/rotate_argb.cc \
libs/libyuv/source/scale.cc \ libs/libyuv/source/rotate.cc \
libs/libyuv/source/scale_any.cc \ libs/libyuv/source/rotate_common.cc \
libs/libyuv/source/scale_argb.cc \ libs/libyuv/source/rotate_gcc.cc \
libs/libyuv/source/scale_common.cc \ libs/libyuv/source/rotate_mmi.cc \
libs/libyuv/source/scale_gcc.cc \ libs/libyuv/source/rotate_msa.cc \
libs/libyuv/source/scale_mips.cc \ libs/libyuv/source/rotate_neon64.cc \
libs/libyuv/source/video_common.cc \ libs/libyuv/source/rotate_neon.cc \
libs/libyuv/source/compare_neon64.cc \ libs/libyuv/source/rotate_win.cc \
libs/libyuv/source/compare_neon.cc \ libs/libyuv/source/row_any.cc \
libs/libyuv/source/compare_win.cc \ libs/libyuv/source/row_common.cc \
libs/libyuv/source/convert_jpeg.cc \ libs/libyuv/source/row_gcc.cc \
libs/libyuv/source/mjpeg_decoder.cc \ libs/libyuv/source/row_mmi.cc \
libs/libyuv/source/mjpeg_validate.cc \ libs/libyuv/source/row_msa.cc \
libs/libyuv/source/rotate_neon64.cc \ libs/libyuv/source/row_neon64.cc \
libs/libyuv/source/rotate_neon.cc \ libs/libyuv/source/row_neon.cc \
libs/libyuv/source/rotate_win.cc \ libs/libyuv/source/row_win.cc \
libs/libyuv/source/row_neon64.cc \ libs/libyuv/source/scale_any.cc \
libs/libyuv/source/row_neon.cc \ libs/libyuv/source/scale_argb.cc \
libs/libyuv/source/row_win.cc \ libs/libyuv/source/scale.cc \
libs/libyuv/source/scale_neon64.cc \ libs/libyuv/source/scale_common.cc \
libs/libyuv/source/scale_neon.cc \ libs/libyuv/source/scale_gcc.cc \
libs/libyuv/source/scale_win.cc libs/libyuv/source/scale_mmi.cc \
libs/libyuv/source/scale_msa.cc \
libs/libyuv/source/scale_neon64.cc \
libs/libyuv/source/scale_neon.cc \
libs/libyuv/source/scale_win.cc \
libs/libyuv/source/video_common.cc
libfreeswitch_libyuv_la_CPPFLAGS = -O2 -fomit-frame-pointer -Ilibs/libyuv/include libfreeswitch_libyuv_la_CPPFLAGS = -O2 -fomit-frame-pointer -Ilibs/libyuv/include
CORE_LIBS+=libfreeswitch_libyuv.la CORE_LIBS+=libfreeswitch_libyuv.la
......
差异被折叠。
...@@ -384,15 +384,15 @@ SWITCH_DECLARE(void) switch_img_patch_rgb(switch_image_t *IMG, switch_image_t *i ...@@ -384,15 +384,15 @@ SWITCH_DECLARE(void) switch_img_patch_rgb(switch_image_t *IMG, switch_image_t *i
} }
if (img->fmt == SWITCH_IMG_FMT_ARGB && IMG->fmt == SWITCH_IMG_FMT_ARGB) { if (img->fmt == SWITCH_IMG_FMT_ARGB && IMG->fmt == SWITCH_IMG_FMT_ARGB) {
uint8* src_argb0 = img->planes[SWITCH_PLANE_PACKED]; uint8_t* src_argb0 = img->planes[SWITCH_PLANE_PACKED];
int src_stride_argb0 = img->stride[SWITCH_PLANE_PACKED]; int src_stride_argb0 = img->stride[SWITCH_PLANE_PACKED];
uint8* src_argb1 = IMG->planes[SWITCH_PLANE_PACKED]; uint8_t* src_argb1 = IMG->planes[SWITCH_PLANE_PACKED];
int src_stride_argb1 = IMG->stride[SWITCH_PLANE_PACKED]; int src_stride_argb1 = IMG->stride[SWITCH_PLANE_PACKED];
uint8* dst_argb = IMG->planes[SWITCH_PLANE_PACKED]; uint8_t* dst_argb = IMG->planes[SWITCH_PLANE_PACKED];
int dst_stride_argb = IMG->stride[SWITCH_PLANE_PACKED]; int dst_stride_argb = IMG->stride[SWITCH_PLANE_PACKED];
int width = MIN(img->d_w, IMG->d_w - abs(x)); int width = MIN(img->d_w, IMG->d_w - abs(x));
int height = MIN(img->d_h, IMG->d_h - abs(y)); int height = MIN(img->d_h, IMG->d_h - abs(y));
void (*ARGBBlendRow)(const uint8* src_argb, const uint8* src_argb1, uint8* dst_argb, int width) = GetARGBBlend(); void (*ARGBBlendRow)(const uint8_t* src_argb, const uint8_t* src_argb1, uint8_t* dst_argb, int width) = GetARGBBlend();
switch_img_attenuate(img); switch_img_attenuate(img);
...@@ -3277,10 +3277,10 @@ SWITCH_DECLARE(switch_status_t) switch_img_from_raw(switch_image_t *dest, void * ...@@ -3277,10 +3277,10 @@ SWITCH_DECLARE(switch_status_t) switch_img_from_raw(switch_image_t *dest, void *
} }
/* /*
int ConvertToI420(const uint8* src_frame, size_t src_size, int ConvertToI420(const uint8_t* src_frame, size_t src_size,
uint8* dst_y, int dst_stride_y, uint8_t* dst_y, int dst_stride_y,
uint8* dst_u, int dst_stride_u, uint8_t* dst_u, int dst_stride_u,
uint8* dst_v, int dst_stride_v, uint8_t* dst_v, int dst_stride_v,
int crop_x, int crop_y, int crop_x, int crop_y,
int src_width, int src_height, int src_width, int src_height,
int crop_width, int crop_height, int crop_width, int crop_height,
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论