提交 bc7b4900 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-7513: WIP CONF STUFF

上级 0ad1a582
...@@ -5,7 +5,7 @@ mod_LTLIBRARIES = mod_conference.la ...@@ -5,7 +5,7 @@ mod_LTLIBRARIES = mod_conference.la
mod_conference_la_SOURCES = mod_conference.c mod_conference_la_SOURCES = mod_conference.c
mod_conference_la_CFLAGS = $(AM_CFLAGS) mod_conference_la_CFLAGS = $(AM_CFLAGS)
mod_conference_la_LIBADD = $(switch_builddir)/libfreeswitch.la mod_conference_la_LIBADD = $(switch_builddir)/libfreeswitch.la
mod_conference_la_LDFLAGS = -avoid-version -module -no-undefined -shared mod_conference_la_LDFLAGS = -avoid-version -module -no-undefined -shared -lyuv
if HAVE_OPENAL if HAVE_OPENAL
mod_conference_la_LDFLAGS += -lopenal -lm mod_conference_la_LDFLAGS += -lopenal -lm
......
...@@ -76,11 +76,15 @@ SWITCH_DECLARE(void) switch_img_free(switch_image_t **img) ...@@ -76,11 +76,15 @@ SWITCH_DECLARE(void) switch_img_free(switch_image_t **img)
SWITCH_DECLARE(void) switch_img_copy(switch_image_t *img, switch_image_t **new_img) SWITCH_DECLARE(void) switch_img_copy(switch_image_t *img, switch_image_t **new_img)
{ {
switch_assert(img); switch_assert(img);
switch_assert(new_img);
if (!img->fmt == SWITCH_IMG_FMT_I420) return; if (!img->fmt == SWITCH_IMG_FMT_I420) return;
if (*new_img != NULL) {
if (img->d_w != (*new_img)->d_w || img->d_h != (*new_img)->d_w) { if (img->d_w != (*new_img)->d_w || img->d_h != (*new_img)->d_w) {
vpx_img_free((vpx_image_t *)*new_img); switch_img_free(new_img);
}
} }
if (*new_img == NULL) { if (*new_img == NULL) {
...@@ -88,7 +92,7 @@ SWITCH_DECLARE(void) switch_img_copy(switch_image_t *img, switch_image_t **new_i ...@@ -88,7 +92,7 @@ SWITCH_DECLARE(void) switch_img_copy(switch_image_t *img, switch_image_t **new_i
} }
switch_assert(*new_img); switch_assert(*new_img);
memcpy((*new_img)->img_data, img->img_data, img->d_w * img->d_h * 3 / 2); memcpy((*new_img)->img_data, img->img_data, (img->d_w * img->d_h * 3) / 2);
} }
/* For Emacs: /* For Emacs:
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论