Merge pull request signalwire#2157 from signalwire/revertopus

Revert "[core, mod_opus] more elastic jitterbuffer with Opus codec (signalwire#2069)

Author: andywolk

scripts/lua/hangup_jitterbuffer_metrics.lua

@@ -61,7 +61,6 @@ SWITCH_DECLARE(switch_status_t) switch_jb_get_packet(switch_jb_t *jb, switch_rtp
 SWITCH_DECLARE(uint32_t) switch_jb_pop_nack(switch_jb_t *jb);
 SWITCH_DECLARE(switch_status_t) switch_jb_get_packet_by_seq(switch_jb_t *jb, uint16_t seq, switch_rtp_packet_t *packet, switch_size_t *len);
 SWITCH_DECLARE(void) switch_jb_set_session(switch_jb_t *jb, switch_core_session_t *session);
-SWITCH_DECLARE(void) switch_jb_set_jitter_estimator(switch_jb_t *jb, double *jitter, uint32_t samples_per_frame, uint32_t samples_per_second);
 SWITCH_DECLARE(void) switch_jb_ts_mode(switch_jb_t *jb, uint32_t samples_per_frame, uint32_t samples_per_second);
 SWITCH_DECLARE(void) switch_jb_set_flag(switch_jb_t *jb, switch_jb_flag_t flag);
 SWITCH_DECLARE(void) switch_jb_clear_flag(switch_jb_t *jb, switch_jb_flag_t flag);

src/include/switch_jitterbuffer.h

@@ -2425,7 +2425,6 @@ typedef enum {
 	SCC_VIDEO_RESET,
 	SCC_AUDIO_PACKET_LOSS,
 	SCC_AUDIO_ADJUST_BITRATE,
-	SCC_AUDIO_VAD,
 	SCC_DEBUG,
 	SCC_CODEC_SPECIFIC
 } switch_codec_control_command_t;

src/include/switch_types.h

@@ -4,7 +4,7 @@ MODNAME=mod_opus
 if HAVE_OPUS
 
 mod_LTLIBRARIES = mod_opus.la
-mod_opus_la_SOURCES  = mod_opus.c opus_parse.c
+mod_opus_la_SOURCES  = mod_opus.c
 mod_opus_la_CFLAGS   = $(AM_CFLAGS) $(OPUS_CFLAGS)
 mod_opus_la_LIBADD   = $(switch_builddir)/libfreeswitch.la $(OPUS_LIBS)
 mod_opus_la_LDFLAGS  = -avoid-version -module -no-undefined -shared -lm -lz

src/mod/codecs/mod_opus/Makefile.am

@@ -130,10 +130,6 @@
   </ItemDefinitionGroup>
   <ItemGroup>
     <ClCompile Include="mod_opus.c" />
-    <ClCompile Include="opus_parse.c" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="opus_parse.h" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\libs\win32\opus\opus.2017.vcxproj">

src/mod/codecs/mod_opus/mod_opus.2017.vcxproj

@@ -33,7 +33,6 @@
 
 #include "switch.h"
 #include "opus.h"
-#include "opus_parse.h"
 
 #define SWITCH_OPUS_MIN_BITRATE 6000
 #define SWITCH_OPUS_MAX_BITRATE 510000
@@ -1170,27 +1169,6 @@ static switch_status_t switch_opus_keep_fec_enabled(switch_codec_t *codec)
 	}
 }
 
-static switch_bool_t switch_opus_vad(struct opus_context *context, void *encoded_data, uint32_t encoded_data_len) {
-	const uint8_t *payload = (const uint8_t *) encoded_data;
-	opus_packet_info_t opus_packet_info;
-	switch_bool_t debug = (globals.debug || context->debug > 1);	
-	if (!switch_opus_packet_parse(payload, encoded_data_len, &opus_packet_info, debug)) {
-		if (debug) {
-			switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "OPUS PACKET PARSING ERROR len:%d bytes:%02x %02x\n",
-				 (int)encoded_data_len, payload[0], payload[1]);
-		}
-		return SWITCH_TRUE;
-	}
-	if (debug) {
-		switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "OPUS EXTRACT PAYLOAD VAD len:%d vad_ms:%d bytes:%02x %02x\n",
-			 (int)encoded_data_len, opus_packet_info.vad_ms, payload[0], payload[1]);
-	}
-	if (opus_packet_info.vad_ms == 0) {
-		return SWITCH_FALSE;
-	}
-	return SWITCH_TRUE;
-}
-
 static switch_status_t switch_opus_control(switch_codec_t *codec,
 										   switch_codec_control_command_t cmd,
 										   switch_codec_control_type_t ctype,
@@ -1282,14 +1260,6 @@ static switch_status_t switch_opus_control(switch_codec_t *codec,
 			context->old_plpct = plpct;
 		}
 		break;
-	case SCC_AUDIO_VAD:
-		{
-			void* encoded_data = (void *)cmd_data;
-			uint16_t* encoded_data_len = (uint16_t *)cmd_arg;
-			switch_bool_t *ret = (switch_bool_t *) *ret_data;
-			*ret = switch_opus_vad(context, encoded_data, *encoded_data_len);
-		}
-		break;
 	case SCC_AUDIO_ADJUST_BITRATE:
 		{
 			const char *cmd = (const char *)cmd_data;