提交 af034b27 authored 作者: Seven Du's avatar Seven Du 提交者: Michael Jerris

FS-7513: fix compile w/o openal

上级 39253d9f
...@@ -301,6 +301,7 @@ typedef struct al_handle_s { ...@@ -301,6 +301,7 @@ typedef struct al_handle_s {
#else #else
typedef struct al_handle_s { typedef struct al_handle_s {
int unsupported; int unsupported;
switch_mutex_t *mutex;
} al_handle_t; } al_handle_t;
#endif #endif
...@@ -1011,7 +1012,7 @@ static void scale_and_patch(conference_obj_t *conference, mcu_layer_t *layer) ...@@ -1011,7 +1012,7 @@ static void scale_and_patch(conference_obj_t *conference, mcu_layer_t *layer)
switch_assert(layer->img); switch_assert(layer->img);
//switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "RESIZE %dx%d to %dx%d to fit in %dx%d and insert at %d,%d\n", //switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "RESIZE %dx%d to %dx%d to fit in %dx%d and insert at %d,%d\n",
// img->d_w, img->d_h, img_w, img_h, screen_w, screen_h, x, y); // img->d_w, img->d_h, img_w, img_h, screen_w, screen_h, x, y);
ret = I420Scale(img->planes[0], img->stride[0], ret = I420Scale(img->planes[0], img->stride[0],
...@@ -1466,10 +1467,10 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread ...@@ -1466,10 +1467,10 @@ static void *SWITCH_THREAD_FUNC conference_video_muxing_thread_run(switch_thread
if (remaining) goto top; if (remaining) goto top;
for (i = 0; i < conference->canvas->total_layers; i++) { for (i = 0; i < conference->canvas->total_layers; i++) {
mcu_layer_t *layer = &conference->canvas->layers[i]; mcu_layer_t *layer = &conference->canvas->layers[i];
if (layer->member_id > -1 && layer->cur_img && layer->tagged) { if (layer->member_id > -1 && layer->cur_img && layer->tagged) {
scale_and_patch(conference, layer); scale_and_patch(conference, layer);
layer->tagged = 0; layer->tagged = 0;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论