evoice :include Json-c for linking/ json files added for platforms brcm and airoha

evoice/Makefile

@@ -5,7 +5,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=evoice
-PKG_VERSION:=0.2.28
+PKG_VERSION:=0.2.29
 
 LOCAL_DEV=0
 LOCAL_DEV_EVOICE_DIR=~/voip/evoice
@@ -13,7 +13,7 @@ LOCAL_DEV_EVOICE_DIR=~/voip/evoice
 ifneq ($(LOCAL_DEV),1)
 PKG_SOURCE_PROTO:=git
 PKG_SOURCE_URL:=https://dev.iopsys.eu/iopsys/evoice.git
-PKG_SOURCE_VERSION:=8bf39695df25f8fe13a0c48e7e0a82b03a5526b5
+PKG_SOURCE_VERSION:=ee4e9e00ec1c54b41e15a3de38f6a733634622dd
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
 PKG_MIRROR_HASH:=skip
 endif
@@ -22,7 +22,6 @@ PKG_LICENSE:=PROPRIETARY IOPSYS
 PKG_LICENSE_FILES:=LICENSE
 
 PKG_BUILD_DEPENDS:=bbf
-
 # All config variable that are passed to the make invocation, directly or
 # indirectly. This ensures that the package is rebuilt on config-changes.
 #PKG_CONFIG_DEPENDS:=CONFIG_TARGET_BOARD
@@ -34,7 +33,7 @@ define Package/$(PKG_NAME)
 	SUBMENU:=Telephony
 	TITLE:=Ensemble Voice
 	URL:=
-	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl\
+	DEPENDS:= +libubox +libubus +libpicoevent +libuci +libstdcpp +libopenssl +libjson-c\
 		+TARGET_iopsys_brcm63xx_arm:bcmkernel\
 		+TARGET_iopsys_econet:kmod-voip_driver\
 		+TARGET_iopsys_econet:voip_app
@@ -65,10 +64,12 @@ ifeq ($(CONFIG_TARGET_iopsys_brcm63xx_arm),y)
 		-I$(IDIR)/bcm963xx/xchg/bos/publicInc\
 		-I$(IDIR)/bcm963xx/bcmdrivers/broadcom/include/bcm963xx
 	TRG=SVrgBcmFxs
+	JSONFILE=codecs_brcm.json
 else ifeq ($(CONFIG_TARGET_iopsys_econet),y)
 	TARGET_PLATFORM=ECONET
 	TONES_INI_REQUIRED=y
 	TRG=SVrgMtekOwrt
+	JSONFILE=codecs_airoha.json
 endif
 
 # disable temporarily some not important warnings, force PIC
@@ -95,6 +96,9 @@ define Package/evoice/install
 	$(CP) ./files/* $(1)/
 	$(if $(TONES_INI_REQUIRED),,$(RM) $(1)/etc/evoice/tones.ini)
 	$(INSTALL_DIR) $(1)/usr/sbin
+	$(CP) $(1)/lib/voice/$(JSONFILE) $(1)/lib/voice/codecs_evoice.json
+	$(RM) $(1)/lib/voice/codecs_brcm.json
+	$(RM) $(1)/lib/voice/codecs_airoha.json
 	$(INSTALL_DIR) $(1)/usr/lib/bbfdm
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/evoice $(1)/usr/sbin/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/_bin/a_openwrt/libvoiceservice.so $(1)/usr/lib/bbfdm/

evoice/files/lib/voice/codecs_airoha.json

@@ -0,0 +1,28 @@
+{
+        "G.711ALaw": {
+                "BitRate": 64000,
+                "PacketizationPeriod": "20",
+                "SilenceSuppression": 0
+        },
+        "G.711MuLaw": {
+                "BitRate": 64000,
+                "PacketizationPeriod": "20",
+                "SilenceSuppression": 0
+        },
+        "G.726": {
+                "BitRate": 32000,
+                "PacketizationPeriod": "20",
+                "SilenceSuppression": 0
+        },
+        "G.729": {
+                "BitRate": 8000,
+                "PacketizationPeriod": "20",
+                "SilenceSuppression": 0
+        },
+        "G.722": {
+                "BitRate": 64000,
+                "PacketizationPeriod": "20",
+                "SilenceSuppression": 0
+        }
+}
+

evoice/files/lib/voice/codecs_brcm.json

@@ -0,0 +1,28 @@
+{
+        "G.711ALaw": {
+                "BitRate": 64000,
+                "PacketizationPeriod": "30",
+                "SilenceSuppression": 1
+        },
+        "G.711MuLaw": {
+                "BitRate": 64000,
+                "PacketizationPeriod": "30",
+                "SilenceSuppression": 1
+        },
+        "G.726": {
+                "BitRate": 32000,
+                "PacketizationPeriod": "30",
+                "SilenceSuppression": 1
+        },
+        "G.729": {
+                "BitRate": 8000,
+                "PacketizationPeriod": "30",
+                "SilenceSuppression": 1
+        },
+        "G.722": {
+                "BitRate": 64000,
+                "PacketizationPeriod": "30",
+                "SilenceSuppression": 1
+        }
+}
+