From 62efa148c25e3055756e9bc0665c363eca8c6886 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Grisez?=
<francois.grisez@belledonne-communications.com>
Date: Wed, 6 Aug 2014 10:53:22 +0200
Subject: [PATCH] Rename recording_call() into call_recording() Save test
results into sdcard
---
build/android/liblinphone_tester.mk | 4 ++++
mediastreamer2 | 2 +-
oRTP | 2 +-
tester/call_tester.c | 7 ++++---
4 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/build/android/liblinphone_tester.mk b/build/android/liblinphone_tester.mk
index e9a2c87189..cada1aba4f 100644
--- a/build/android/liblinphone_tester.mk
+++ b/build/android/liblinphone_tester.mk
@@ -32,6 +32,10 @@ LOCAL_C_INCLUDES = $(common_C_INCLUDES)
LOCAL_CFLAGS = -DIN_LINPHONE
LOCAL_LDLIBS := -llog
+ifeq ($(BUILD_MATROSKA), 1)
+LOCAL_CFLAGS += -DHAVE_MATROSKA
+endif
+
LOCAL_SHARED_LIBRARIES := cunit liblinphone
include $(BUILD_SHARED_LIBRARY)
diff --git a/mediastreamer2 b/mediastreamer2
index 8dae6e326a..4064390b48 160000
--- a/mediastreamer2
+++ b/mediastreamer2
@@ -1 +1 @@
-Subproject commit 8dae6e326a4bb933d0563af744c24d161b3148ef
+Subproject commit 4064390b48c957dcf3077b0e30e0c082395bbf05
diff --git a/oRTP b/oRTP
index dfb505d719..fc8d8457eb 160000
--- a/oRTP
+++ b/oRTP
@@ -1 +1 @@
-Subproject commit dfb505d7198dc8be59919c8c6d68add302a98fd3
+Subproject commit fc8d8457eb630907eff50333ddf5243b448fe733
diff --git a/tester/call_tester.c b/tester/call_tester.c
index 31129e4b9a..2b72ce0886 100644
--- a/tester/call_tester.c
+++ b/tester/call_tester.c
@@ -2663,7 +2663,7 @@ static void savpf_to_savpf_call(void) {
profile_call(TRUE, TRUE, TRUE, TRUE, "RTP/SAVPF");
}
-static void recording_call() {
+static void call_recording() {
LinphoneCoreManager *marie = linphone_core_manager_new("marie_rc");
LinphoneCoreManager *pauline = linphone_core_manager_new("pauline_rc");
LinphoneCallParams *marieParams = linphone_core_create_default_call_parameters(marie->lc);
@@ -2673,7 +2673,7 @@ static void recording_call() {
char *filepath = NULL;
#ifdef ANDROID
- const char dirname[] = "/data/data/org.linphone.tester/files/.test";
+ const char dirname[] = "/sdcard/Movies/liblinphone_tester";
#else
const char dirname[] = ".test";
#endif
@@ -2722,6 +2722,7 @@ static void recording_call() {
CU_ASSERT_TRUE(call_with_params(marie, pauline, marieParams, paulineParams));
CU_ASSERT_PTR_NOT_NULL(callInst = linphone_core_get_current_call(marie->lc));
+ ms_message("call_recording(): the call will be recorded into %s", filepath);
linphone_call_start_recording(callInst);
wait_for_until(marie->lc,pauline->lc,&dummy,1,10000);
linphone_call_stop_recording(callInst);
@@ -2823,7 +2824,7 @@ test_t call_tests[] = {
{ "SAVPF to AVPF call", savpf_to_avpf_call },
{ "SAVPF to SAVP call", savpf_to_savp_call },
{ "SAVPF to SAVPF call", savpf_to_savpf_call },
- { "Call recording", recording_call }
+ { "Call recording", call_recording }
};
test_suite_t call_test_suite = {
--
GitLab