Release 7.1

ChangeLog.txt

@@ -1,5 +1,21 @@
 ChangeLog for AVS -- latest on top!
 
+==============================================================================
+AVS Release 7.1
+
+Date:	    April 29, 2021
+GIT:	    https://github.com/wearezeta/avs/tree/release-7.1
+Android:    Android NDK r14b
+iOS:	    iOS SDK 12.2
+OSX:	    MacOS SDK 10.14
+Linux:	    Ubuntu x86_64 18.04 (LTS)
+
+Summary:        - Include SSRC/CSRC in frame header
+                - Experimental: CBR always on for conference calls
+
+Hotfixes:       - Improvements to active speaker detection
+                - Android: Memory leak for video fixed
+
 ==============================================================================
 AVS Release 7.0
 

Makefile

@@ -25,7 +25,7 @@
 # Master version number
 #
 VER_MAJOR := 7
-VER_MINOR := 0
+VER_MINOR := 1
 
 ifeq ($(BUILD_NUMBER),)
 VER_PATCH := local

android/java/com/waz/avs/VideoRenderer.java

@@ -275,8 +275,13 @@ else if (configsCount[0] > 0) {
 	}
 
 	private void destroyGL() {
-		if (mEgl != null)
+		if (mEgl != null) {
+			if (mEglSurface != null
+			    && mEglSurface != EGL10.EGL_NO_SURFACE) {
+				mEgl.eglDestroySurface(mEglDisplay, mEglSurface);
+			}
 			mEgl.eglDestroyContext(mEglDisplay, mEglContext);
+		}
 		mGl = null;
 	}
 

contrib/.gitignore

@@ -0,0 +1,70 @@
+#
+# .gitignore
+#
+
+*.o
+*.a
+*.lo
+*.la
+*.pc
+.*.swp
+*.dep
+*.deps
+zcontrib.*.tar.bz2
+build/*
+.DS_Store
+.dirstamp
+config.log
+config.h
+config.status
+stamp-h1
+.libs
+
+re/build*
+re/libre.dylib
+re/libre.so
+
+rem/build*
+rem/librem.dylib
+rem/librem.so
+
+ogg/Makefile.in
+ogg/aclocal.m4
+ogg/autom4te.cache/
+ogg/compile
+ogg/config.guess
+ogg/config.h.in
+ogg/config.sub
+ogg/configure
+ogg/depcomp
+ogg/doc/Makefile.in
+ogg/doc/libogg/Makefile.in
+ogg/include/Makefile.in
+ogg/include/ogg/Makefile.in
+ogg/install-sh
+ogg/ltmain.sh
+ogg/missing
+ogg/src/Makefile.in
+
+opus/INSTALL
+opus/Makefile.in
+opus/aclocal.m4
+opus/autom4te.cache/
+opus/compile
+opus/config.guess
+opus/config.h.in
+opus/config.sub
+opus/configure
+opus/depcomp
+opus/doc/Makefile.in
+opus/install-sh
+opus/ltmain.sh
+opus/m4/libtool.m4
+opus/m4/ltoptions.m4
+opus/m4/ltsugar.m4
+opus/m4/ltversion.m4
+opus/m4/lt~obsolete.m4
+opus/missing
+opus/package_version
+opus/test-driver
+

docs/api/api_changes_5.1.txt

@@ -1,5 +1,4 @@
 
-
 Changes introduced in AVS 5.1
 =============================
 

docs/api/api_changes_5.2.txt

@@ -1,5 +1,4 @@
 
-
 Changes introduced in AVS 5.2
 =============================
 

docs/api/api_changes_5.3.txt

@@ -1,5 +1,4 @@
 
-
 Changes introduced in AVS 5.3
 =============================
 

docs/api/api_changes_5.6.txt

@@ -1,5 +1,4 @@
 
-
 Changes introduced in AVS 5.6
 =============================
 

docs/api/api_changes_6.0.txt

@@ -1,5 +1,4 @@
 
-
 Changes introduced in AVS 6.0
 =============================
 

docs/api/api_changes_6.2.txt

@@ -1,5 +1,4 @@
 
-
 Changes introduced in AVS 6.2
 =============================
 

docs/api/api_changes_6.6.txt

@@ -1,5 +1,4 @@
 
-
 Changes introduced in AVS 6.6
 =============================
 

docs/api/api_changes_6.7.txt

@@ -1,3 +1,4 @@
+
 Changes introduced in AVS 6.7
 =============================
 

docs/api/api_changes_7.0.txt

@@ -1,5 +1,4 @@
 
-
 Changes introduced in AVS 7.0
 =============================
 

include/avs_conf_member.h

@@ -46,6 +46,7 @@ struct conf_member {
 
 	uint8_t audio_level;
 	uint8_t audio_level_smooth;
+	uint64_t last_ts;
 };
 
 int conf_member_alloc(struct conf_member **cmp,

include/avs_frame_encryptor.h

@@ -33,6 +33,7 @@ int frame_encryptor_set_keystore(struct frame_encryptor *enc,
 				 struct keystore *keystore);
 
 int frame_encryptor_encrypt(struct frame_encryptor *enc,
+			    uint32_t ssrc,
 			    const uint8_t *src,
 			    size_t srcsz,
 			    uint8_t *dst,

include/avs_frame_hdr.h

@@ -23,12 +23,16 @@
 size_t frame_hdr_max_size(void);
 
 size_t frame_hdr_write(uint8_t  *buf,
+		       size_t   bsz,
 		       uint64_t frame,
-		       uint64_t key);
+		       uint64_t key,
+		       uint32_t csrc);
 
 size_t frame_hdr_read(const uint8_t *buf,
+		      size_t   bsz,
 		      uint64_t *frame,
-		      uint64_t *key);
+		      uint64_t *key,
+		      uint32_t *csrc);
 
 #endif  // FRAME_HDR_H_
 

mk/avs.mk

@@ -30,7 +30,6 @@
 # For information on argument variables, see mk/target.mk.
 #
 
-
 #--- AVS Core Modules ---
 
 AVS_MODULES += base
@@ -83,9 +82,7 @@ AVS_MODULES += icall
 AVS_MODULES += iflow
 AVS_MODULES += egcall
 AVS_MODULES += audio_level
-ifeq ($(ENABLE_CONFERENCE_CALLS),1)
 AVS_MODULES += ccall
-endif
 AVS_MODULES += zapi
 AVS_MODULES += ztime
 
@@ -172,10 +169,6 @@ ifeq ($(AVS_OS),android)
 AVS_LIBS += $(CONTRIB_AND_IFADDRS_LIBS)
 endif
 
-ifeq ($(ENABLE_CONFERENCE_CALLS),1)
-AVS_CPPFLAGS += -DENABLE_CONFERENCE_CALLS=1
-endif
-
 AVS_LIB_FILES += $(CONTRIB_LIBRE_LIB_FILES) \
 	$(CONTRIB_LIBREW_LIB_FILES) \
 	$(CONTRIB_SODIUM_LIB_FILES)

scripts/get_webrtc.py

@@ -0,0 +1,47 @@
+#! /usr/bin/env python3
+
+import json
+import os
+import re
+import subprocess
+import sys
+
+github_base = 'https://api.github.com/repos'
+repo = 'wireapp/prebuilt-webrtc-binaries'
+dest_dir = 'contrib/webrtc'
+
+release = sys.argv[1]
+token = os.environ.get('GITHUB_TOKEN')
+
+print('Repo: {}'.format(repo))
+print('Release: {}'.format(release))
+#print('Token: {}'.format(token))
+
+cmd = ['curl', '-X', 'GET', '-u', '{}:x-oauth-basic'.format(token), 
+	'{}/{}/releases'.format(github_base, repo)]
+releases = json.loads(subprocess.check_output(cmd))
+
+if not isinstance(releases, list):
+	print('Error {}'.format(releases))
+	exit(-1)
+
+if len(releases) < 1:
+	print('Couldnt find release {}'.format(release))
+	exit(-1)
+
+found = None
+for r in releases:
+	if r['tag_name'] == release:
+		found = r
+		break
+
+if not found:
+	print('Couldnt find release {}'.format(release))
+	exit(-1)
+
+print('Getting assets for {}'.format(release))
+for a in found['assets']:
+	print(a['name'])
+	cmd = ['curl', '-L', '-u', '{}:x-oauth-basic'.format(token), 
+		'-H', 'Accept: application/octet-stream', a['url'], '-o', '{}/{}'.format(dest_dir, a['name'])]
+	subprocess.check_output(cmd)

src/ccall/ccall.c

@@ -32,6 +32,8 @@
 
 #endif
 
+#define CCALL_CBR_ALWAYS_ON 1
+
 struct join_elem {
 	struct ccall *ccall;
 	enum icall_call_type call_type;
@@ -882,6 +884,13 @@ static void ecall_setup_handler(struct icall *icall,
 			        void *arg)
 {
 	struct ccall *ccall = arg;
+	bool audio_cbr;
+
+#ifdef CCALL_CBR_ALWAYS_ON
+	audio_cbr = true;
+#else
+	audio_cbr = false;
+#endif
 
 	(void)msg_time;
 	(void)icall; /* not really used, revise code below and use directly */
@@ -890,7 +899,7 @@ static void ecall_setup_handler(struct icall *icall,
 
 	ecall_answer(ccall->ecall,
 		     ccall->call_type,
-		     false);
+		     audio_cbr);
 }
 
 static void ecall_setup_resp_handler(struct icall *icall, void *arg)

src/ccall/mod.mk

@@ -0,0 +1,8 @@
+#
+# mod.mk
+#
+
+
+AVS_SRCS += \
+	ccall/ccall.c
+

src/conf_member/conf_member.c

@@ -20,6 +20,9 @@
 #include <avs.h>
 #include <avs_audio_level.h>
 
+#define TIMEOUT_UPDATE   1000
+
+
 static void cm_destructor(void *arg)
 {
 	struct conf_member *cm = (struct conf_member *)arg;
@@ -164,12 +167,28 @@ struct conf_member *conf_member_find_by_ssrcv(struct list *membl,
 
 void conf_member_set_audio_level(struct conf_member *cm, int level)
 {
+	uint64_t now;
+	uint64_t tsdiff;
+
 	if (!cm)
 		return;
 
+	now = tmr_jiffies();
+	tsdiff = now - cm->last_ts;
+	if (tsdiff < TIMEOUT_UPDATE)
+		return;
+
+	cm->last_ts = now;
 	cm->audio_level = level > AUDIO_LEVEL_FLOOR ? level : 0;
 	if (level > AUDIO_LEVEL_FLOOR)
 		cm->audio_level_smooth = AUDIO_LEVEL_CEIL;
-	else if (cm->audio_level_smooth > 0)
-		cm->audio_level_smooth--;		
+	else if (cm->audio_level_smooth > 0) {
+		/* we want to count down by the number of elapsed seconds */
+		uint64_t n = tsdiff / 1000;
+
+		if (n > (uint64_t)cm->audio_level_smooth)
+			cm->audio_level_smooth = 0;
+		else
+			cm->audio_level_smooth -= n;
+	}
 }