Commit 8606366b authored by jehan's avatar jehan
Browse files

Merge remote-tracking branch 'public/master' into belle-sip

Conflicts:
	mediastreamer2
parents d7c4864e 5bf2d283
......@@ -4825,6 +4825,16 @@ void linphone_core_set_device_rotation(LinphoneCore *lc, int rotation) {
#endif
}
int linphone_core_get_camera_sensor_rotation(LinphoneCore *lc) {
#ifdef VIDEO_ENABLED
LinphoneCall *call = linphone_core_get_current_call(lc);
if ((call != NULL) && (call->videostream != NULL)) {
return video_stream_get_camera_sensor_rotation(call->videostream);
}
#endif
return -1;
}
static MSVideoSizeDef supported_resolutions[]={
#ifdef ENABLE_HD
{ {MS_VIDEO_SIZE_1080P_W,MS_VIDEO_SIZE_1080P_H} , "1080p" },
......
......@@ -1401,6 +1401,17 @@ void linphone_core_use_preview_window(LinphoneCore *lc, bool_t yesno);
int linphone_core_get_device_rotation(LinphoneCore *lc );
void linphone_core_set_device_rotation(LinphoneCore *lc, int rotation);
/**
* @brief Get the camera sensor rotation.
*
* This is needed on some mobile platforms to get the number of degrees the camera sensor
* is rotated relative to the screen.
*
* @param lc The linphone core related to the operation
* @return The camera sensor rotation in degrees (0 to 360) or -1 if it could not be retrieved
*/
int linphone_core_get_camera_sensor_rotation(LinphoneCore *lc);
/* start or stop streaming video in case of embedded window */
void linphone_core_show_video(LinphoneCore *lc, bool_t show);
......
......@@ -83,7 +83,7 @@ void linphone_sql_request_message(sqlite3 *db,const char *stmt,LinphoneChatRoom
int ret;
ret=sqlite3_exec(db,stmt,callback,cr,&errmsg);
if(ret != SQLITE_OK) {
printf("Error in creation: %s.\n", errmsg);
ms_error("Error in creation: %s.\n", errmsg);
sqlite3_free(errmsg);
}
}
......@@ -197,7 +197,7 @@ void linphone_create_table(sqlite3* db){
ret=sqlite3_exec(db,"CREATE TABLE if not exists history (id INTEGER PRIMARY KEY AUTOINCREMENT, localContact TEXT NOT NULL, remoteContact TEXT NOT NULL, direction INTEGER, message TEXT, time TEXT NOT NULL, read INTEGER, status INTEGER);",
0,0,&errmsg);
if(ret != SQLITE_OK) {
printf("Error in creation: %s.\n", errmsg);
ms_error("Error in creation: %s.\n", errmsg);
sqlite3_free(errmsg);
}
}
......@@ -209,7 +209,7 @@ void linphone_core_message_storage_init(LinphoneCore *lc){
ret=sqlite3_open(lc->chat_db_file,&db);
if(ret != SQLITE_OK) {
errmsg=sqlite3_errmsg(db);
printf("Error in the opening: %s.\n", errmsg);
ms_error("Error in the opening: %s.\n", errmsg);
sqlite3_close(db);
}
linphone_create_table(db);
......
......@@ -568,7 +568,7 @@ static gboolean linphone_gtk_iterate(LinphoneCore *lc){
if (id!=0){
ms_message("Updating window decorations");
#ifndef WIN32
w=gdk_window_foreign_new(id);
w=gdk_window_foreign_new((GdkNativeWindow)id);
#else
w=gdk_window_foreign_new((HANDLE)id);
#endif
......@@ -587,7 +587,7 @@ static gboolean linphone_gtk_iterate(LinphoneCore *lc){
if (id!=0){
ms_message("Updating window decorations for preview");
#ifndef WIN32
w=gdk_window_foreign_new(id);
w=gdk_window_foreign_new((GdkNativeWindow)id);
#else
w=gdk_window_foreign_new((HANDLE)id);
#endif
......
mediastreamer2 @ ff9b20e9
Subproject commit 5b7873ee3cbc460138015ba244330d99aa861d7f
Subproject commit ff9b20e9fbccb0c3ca401544d2cdc39dd8ee629e
oRTP @ 46229643
Subproject commit 2c37d1205e9dd0e30a918ccf666ab217b66c2899
Subproject commit 462296433f10bd84cb605edb0b38d16a4cd81d9e
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