Commit 05ed3619 authored by François Grisez's avatar François Grisez

Fix build and increment the SO version.

parent 87336804
......@@ -28,7 +28,7 @@ set(MEDIASTREAMER_MAJOR_VERSION ${PROJECT_VERSION_MAJOR})
set(MEDIASTREAMER_MINOR_VERSION ${PROJECT_VERSION_MINOR})
set(MEDIASTREAMER_MICRO_VERSION ${PROJECT_VERSION_PATCH})
set(MEDIASTREAMER_VERSION ${PROJECT_VERSION})
set(MEDIASTREAMER_SO_VERSION "9") # incremented on July, the 8th 2016. DO NOT INCREMENT BEFORE MEDIASTREAMER 2.14
set(MEDIASTREAMER_SO_VERSION "10") # incremented after Mediastreamer 2.15.1. Do not increment before next release
string(REGEX MATCH "^(arm*|aarch64)" FIXED_POINT_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}")
if(FIXED_POINT_PROCESSOR)
......
......@@ -16,7 +16,7 @@ MEDIASTREAMER_MINOR_VERSION=$(echo $PACKAGE_VERSION | cut -d. -f2)
MEDIASTREAMER_MICRO_VERSION=$(echo $PACKAGE_VERSION | cut -d. -f3)
MEDIASTREAMER_EXTRA_VERSION=$(echo $PACKAGE_VERSION | cut -d. -f4)
LIBMEDIASTREAMER_SO_CURRENT=7 dnl increment this number when you add/change/remove an interface
LIBMEDIASTREAMER_SO_CURRENT=10 dnl increment this number when you add/change/remove an interface. It has been incremented after Mediastreamer 2.15.1. Do not increment until next release.
LIBMEDIASTREAMER_SO_REVISION=0 dnl increment this number when you change source code, without changing interfaces; set to 0 when incrementing CURRENT
LIBMEDIASTREAMER_SO_AGE=0 dnl increment this number when you add an interface, set to 0 if you remove an interface
......
......@@ -132,7 +132,7 @@ typedef struct _MediastreamDatas {
int el_sustain;
float el_transmit_thres;
float ng_floorgain;
char * zrtp_secrets;
bool_t enable_zrtp;
PayloadType *custom_pt;
int video_window_id;
int preview_window_id;
......@@ -234,7 +234,7 @@ const char *usage="mediastream --local <port>\n"
"[ --video-windows-id <video surface:preview surface >]\n"
"[ --width <pixels> ]\n"
"[ --zoom zoom factor ]\n"
"[ --zrtp <secrets file> (enable zrtp) ]\n"
"[ --zrtp (enable zrtp) ]\n"
#if TARGET_OS_IPHONE
"[ --speaker route audio to speaker ]\n"
#endif
......@@ -330,7 +330,7 @@ MediastreamDatas* init_default_args(void) {
args->el_sustain=-1;
args->el_transmit_thres=-1;
args->ng_floorgain=-1;
args->zrtp_secrets=NULL;
args->enable_zrtp =FALSE;
args->custom_pt=NULL;
args->video_window_id = -1;
args->preview_window_id = -1;
......@@ -508,7 +508,7 @@ bool_t parse_args(int argc, char** argv, MediastreamDatas* out) {
i++;
out->el_transmit_thres=(float)atof(argv[i]);
} else if (strcmp(argv[i],"--zrtp")==0){
out->zrtp_secrets=argv[++i];
out->enable_zrtp = TRUE;
} else if (strcmp(argv[i],"--verbose")==0){
out->is_verbose=TRUE;
} else if (strcmp(argv[i], "--video-windows-id")==0) {
......@@ -887,9 +887,8 @@ void setup_media_streams(MediastreamDatas* args) {
}
}
if (args->zrtp_secrets != NULL) {
MSZrtpParams params;
params.zid_file=args->zrtp_secrets;
if (args->enable_zrtp) {
MSZrtpParams params = {0};
audio_stream_enable_zrtp(args->audio,&params);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment