From 9ff1a506d0f38b5764178858aba8d1383b9001e3 Mon Sep 17 00:00:00 2001 From: Brian West <brian@freeswitch.org> Date: Tue, 19 Jul 2016 16:25:22 -0500 Subject: [PATCH] FS-9357 #resolve [VP9 codec screenshare on mod_conference (mux/transcode) does not work] --- html5/verto/verto_communicator/src/index.html | 2 +- src/switch_vpx.c | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/html5/verto/verto_communicator/src/index.html b/html5/verto/verto_communicator/src/index.html index e886875756..2f4e2af1f5 100644 --- a/html5/verto/verto_communicator/src/index.html +++ b/html5/verto/verto_communicator/src/index.html @@ -88,7 +88,7 @@ <script src="bower_components/angular-directive.g-signin/google-plus-signin.js"></script> <script src="bower_components/angular-fullscreen/src/angular-fullscreen.js"></script> <script src="bower_components/ngstorage/ngStorage.js"></script> - <script src="bower_components/momentjs/moment.js"></script> + <script src="bower_components/moment/moment.js"></script> <script src="bower_components/humanize-duration/humanize-duration.js"></script> <script src="bower_components/angular-timer/dist/angular-timer.js"></script> <script src="bower_components/angular-tooltips/dist/angular-tooltips.min.js"></script> diff --git a/src/switch_vpx.c b/src/switch_vpx.c index a6a475f577..4427e3f934 100644 --- a/src/switch_vpx.c +++ b/src/switch_vpx.c @@ -1072,12 +1072,12 @@ static switch_status_t buffer_vp9_packets(vpx_context_t *context, switch_frame_t goto end; } - if (switch_buffer_inuse(context->vpx_packet_buffer)) { // middle packet - if (desc->start) { - switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "got invalid vp9 packet, packet loss? resetting buffer\n"); - switch_buffer_zero(context->vpx_packet_buffer); - } - } else { // start packet + if (!switch_buffer_inuse(context->vpx_packet_buffer)) { // middle packet + //if (desc->start) { + // switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG1, "got invalid vp9 packet, packet loss? resetting buffer\n"); + // switch_buffer_zero(context->vpx_packet_buffer); + //} + //} else { // start packet if (!desc->start) { switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "got invalid vp9 packet, packet loss? waiting for a start packet\n"); goto end;