提交 0dc59995 authored 作者: Anthony Minessale's avatar Anthony Minessale

FS-9382

上级 e89b8a48
...@@ -11304,7 +11304,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor ...@@ -11304,7 +11304,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
switch_status_t status = SWITCH_STATUS_FALSE; switch_status_t status = SWITCH_STATUS_FALSE;
switch_time_t now = switch_micro_time_now(); switch_time_t now = switch_micro_time_now();
switch_codec_t *codec = switch_core_session_get_video_write_codec(session); switch_codec_t *codec = switch_core_session_get_video_write_codec(session);
//switch_timer_t *timer; switch_timer_t *timer;
switch_media_handle_t *smh; switch_media_handle_t *smh;
switch_image_t *dup_img = NULL, *img = frame->img; switch_image_t *dup_img = NULL, *img = frame->img;
switch_status_t encode_status; switch_status_t encode_status;
...@@ -11454,7 +11454,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor ...@@ -11454,7 +11454,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
frame = &write_frame; frame = &write_frame;
frame->img = img; frame->img = img;
#if 0
if (!switch_test_flag(frame, SFF_USE_VIDEO_TIMESTAMP)) { if (!switch_test_flag(frame, SFF_USE_VIDEO_TIMESTAMP)) {
if (!(timer = switch_core_media_get_timer(session, SWITCH_MEDIA_TYPE_VIDEO))) { if (!(timer = switch_core_media_get_timer(session, SWITCH_MEDIA_TYPE_VIDEO))) {
...@@ -11468,7 +11468,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor ...@@ -11468,7 +11468,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_session_write_video_frame(switch_cor
frame->timestamp = timer->samplecount; frame->timestamp = timer->samplecount;
} }
#endif
switch_clear_flag(frame, SFF_SAME_IMAGE); switch_clear_flag(frame, SFF_SAME_IMAGE);
frame->m = 0; frame->m = 0;
......
...@@ -195,7 +195,6 @@ static void video_bridge_thread(switch_core_session_t *session, void *obj) ...@@ -195,7 +195,6 @@ static void video_bridge_thread(switch_core_session_t *session, void *obj)
if (switch_channel_media_up(b_channel)) { if (switch_channel_media_up(b_channel)) {
switch_set_flag(read_frame, SFF_PROXY_PACKET);
if (switch_core_session_write_video_frame(vh->session_b, read_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) { if (switch_core_session_write_video_frame(vh->session_b, read_frame, SWITCH_IO_FLAG_NONE, 0) != SWITCH_STATUS_SUCCESS) {
switch_cond_next(); switch_cond_next();
continue; continue;
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论