Merge pull request #1779 in FS/freeswitch from…

Merge pull request #1779 in FS/freeswitch from ~DRAGOS_OANCEA/freeswitch-dragos:FS-11967-rate to master

* commit '6fb03960':
  FS-11967: add mod_opus to unit test XML
  FS-11967: add unit test for switch_core_codec_copy()
  FS-11967: [core] fix rate of recording for Opus

src/switch_core_codec.c

@@ -621,7 +621,7 @@ SWITCH_DECLARE(switch_status_t) switch_core_codec_copy(switch_codec_t *codec, sw
 								  codec->implementation->iananame,
 								  codec->implementation->modname,
 								  codec->fmtp_in,
-								  codec->implementation->samples_per_second,
+								  codec->implementation->actual_samples_per_second,
 								  codec->implementation->microseconds_per_packet / 1000,
 								  codec->implementation->number_of_channels,
 								  codec->flags,

tests/unit/Makefile.am

 include $(top_srcdir)/build/modmake.rulesam
 
 noinst_PROGRAMS = switch_event switch_hash switch_ivr_originate switch_utils switch_core switch_console switch_vpx \
-			   switch_ivr_play_say
+			   switch_ivr_play_say switch_core_codec
 noinst_PROGRAMS+= switch_core_video
 AM_LDFLAGS  = -avoid-version -no-undefined $(SWITCH_AM_LDFLAGS) $(openssl_LIBS)
 AM_LDFLAGS += $(FREESWITCH_LIBS) $(switch_builddir)/libfreeswitch.la $(CORE_LIBS) $(APR_LIBS)

tests/unit/conf/freeswitch.xml

@@ -6,7 +6,8 @@
     <configuration name="modules.conf" description="Modules">
       <modules>
         <load module="mod_console"/>
-        <load module="mod_loopback"/>
+		<load module="mod_loopback"/>
+		<load module="mod_opus"/>
       </modules>
     </configuration>
 

tests/unit/switch_core_codec.c

+/*
+ * FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ * Copyright (C) 2005-2018, Anthony Minessale II <anthm@freeswitch.org>
+ *
+ * Version: MPL 1.1
+ *
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is FreeSWITCH Modular Media Switching Software Library / Soft-Switch Application
+ *
+ * The Initial Developer of the Original Code is
+ * Anthony Minessale II <anthm@freeswitch.org>
+ * Portions created by the Initial Developer are Copyright (C)
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Chris Rienzo <chris@signalwire.com>
+ * Seven Du <dujinfang@gmail.com>
+ * Dragos Oancea <dragos@signalwire.com>
+ *
+ * switch_core_codec.c -- tests codec core functions
+ *
+ */
+#include <switch.h>
+#include <stdlib.h>
+
+#include <test/switch_test.h>
+
+FST_CORE_BEGIN("./conf")
+{
+	FST_SUITE_BEGIN(switch_core_codec)
+	{
+		FST_SETUP_BEGIN()
+		{
+		}
+		FST_SETUP_END()
+
+		FST_TEARDOWN_BEGIN()
+		{
+		}
+		FST_TEARDOWN_END()
+
+		FST_SETUP_BEGIN()
+		{
+			fst_requires_module("mod_opus");
+		}
+		FST_SETUP_END()
+
+		FST_TEST_BEGIN(test_switch_core_codec_copy)
+		{
+			switch_codec_t orig_codec = { 0 };
+			switch_codec_t new_codec = { 0 };
+			switch_status_t status;
+			switch_codec_settings_t codec_settings = {{ 0 }};
+			status = switch_core_codec_init(&orig_codec,
+			"OPUS",
+			"mod_opus",
+			NULL,
+			48000,
+			20,
+			1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
+			&codec_settings, fst_pool);
+			fst_check(status == SWITCH_STATUS_SUCCESS);
+
+			switch_core_codec_copy(&orig_codec, &new_codec, NULL, NULL);
+			fst_check(orig_codec.implementation->samples_per_second == new_codec.implementation->samples_per_second);
+			fst_check(orig_codec.implementation->actual_samples_per_second == new_codec.implementation->actual_samples_per_second);
+
+			status = switch_core_codec_init(&orig_codec,
+			"OPUS",
+			"mod_opus",
+			NULL,
+			16000,
+			20,
+			1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
+			&codec_settings, fst_pool);
+			fst_check(status == SWITCH_STATUS_SUCCESS);
+
+			switch_core_codec_copy(&orig_codec, &new_codec, NULL, NULL);
+			fst_check(orig_codec.implementation->samples_per_second == new_codec.implementation->samples_per_second);
+			fst_check(orig_codec.implementation->actual_samples_per_second == new_codec.implementation->actual_samples_per_second);
+
+			status = switch_core_codec_init(&orig_codec,
+			"OPUS",
+			"mod_opus",
+			NULL,
+			8000,
+			20,
+			1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
+			&codec_settings, fst_pool);
+			fst_check(status == SWITCH_STATUS_SUCCESS);
+
+			switch_core_codec_copy(&orig_codec, &new_codec, NULL, NULL);
+			fst_check(orig_codec.implementation->samples_per_second == new_codec.implementation->samples_per_second);
+			fst_check(orig_codec.implementation->actual_samples_per_second == new_codec.implementation->actual_samples_per_second);
+
+		}
+		FST_TEST_END()
+	}
+	FST_SUITE_END()
+}
+FST_CORE_END()