witine/linphone-ios
1
0
Fork 0
forked from mirrors/linphone-iphone
Code Pull requests Activity

fix crash on android

Browse source
This commit is contained in:
Simon Morlat 2016-02-07 11:10:54 +01:00
parent d3e3740a64
commit 285af5570a
2 changed files with 9 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mediastreamer2

@ -1 +1 @@
Subproject commit b77a997867d77ec22a4a51dcd415c294298da8f6
Subproject commit bd281bd79b204f268017b0c5b1750b016261c685

18
tester/call_tester.c
View file

@ -39,7 +39,7 @@ static char *create_filepath(const char *dir, const char *filename, const char *
// prototype definition for call_recording()
#ifdef ANDROID
#ifdef HAVE_OPENH264
extern void libmsopenh264_init(void);
extern void libmsopenh264_init(MSFactory *factory);
#endif
#endif
@ -4018,14 +4018,15 @@ static void record_call(const char *filename, bool_t enableVideo, const char *vi
int dummy=0, i;
bool_t call_succeeded = FALSE;
#if defined(HAVE_OPENH264) && defined(ANDROID)
ms_init();
libmsopenh264_init();
#endif
marie = linphone_core_manager_new("marie_h264_rc");
pauline = linphone_core_manager_new("pauline_h264_rc");
#if defined(HAVE_OPENH264) && defined(ANDROID)
libmsopenh264_init(linphone_core_get_ms_factory(marie->lc));
linphone_core_reload_ms_plugins(marie->lc);
libmsopenh264_init(linphone_core_get_ms_factory(pauline->lc));
linphone_core_reload_ms_plugins(pauline->lc);
#endif
marieParams = linphone_core_create_call_params(marie->lc, NULL);
paulineParams = linphone_core_create_call_params(pauline->lc, NULL);
@ -4067,9 +4068,6 @@ static void record_call(const char *filename, bool_t enableVideo, const char *vi
linphone_call_params_destroy(marieParams);
linphone_core_manager_destroy(marie);
linphone_core_manager_destroy(pauline);
#if defined(HAVE_OPENH264) && defined(ANDROID)
ms_exit();
#endif
}
static void audio_call_recording_test(void) {