Merge branch 'master' of git.sv.gnu.org:/srv/git/linphone

Conflicts:
	mediastreamer2

coreapi/linphonecore_jni.cc

@@ -1023,6 +1023,18 @@ extern "C" jlong Java_org_linphone_core_LinphoneCallImpl_getReplacedCall(	JNIEnv
 	return (jlong)linphone_call_get_replaced_call((LinphoneCall*)ptr);
 }
 
+extern "C" jfloat Java_org_linphone_core_LinphoneCallImpl_getCurrentQuality(	JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	return (jfloat)linphone_call_get_current_quality((LinphoneCall*)ptr);
+}
+
+extern "C" jfloat Java_org_linphone_core_LinphoneCallImpl_getAverageQuality(	JNIEnv*  env
+																		,jobject  thiz
+																		,jlong ptr) {
+	return (jfloat)linphone_call_get_average_quality((LinphoneCall*)ptr);
+}
+
 
 //LinphoneFriend
 extern "C" long Java_org_linphone_core_LinphoneFriendImpl_newLinphoneFriend(JNIEnv*  env

java/common/org/linphone/core/LinphoneCall.java

@@ -190,4 +190,28 @@ public interface LinphoneCall {
 	 * @return call duration computed from media start
 	 */
 	int getDuration();
+	/**
+	 * Obtain real-time quality rating of the call
+	 *
+	 * Based on local RTP statistics and RTCP feedback, a quality rating is computed and updated
+	 * during all the duration of the call. This function returns its value at the time of the function call.
+	 * It is expected that the rating is updated at least every 5 seconds or so.
+	 * The rating is a floating point number comprised between 0 and 5.
+	 *
+	 * 4-5 = good quality <br>
+	 * 3-4 = average quality <br>
+	 * 2-3 = poor quality <br>
+	 * 1-2 = very poor quality <br>
+	 * 0-1 = can't be worse, mostly unusable <br>
+	 *
+	 * @returns The function returns -1 if no quality measurement is available, for example if no 
+	 * active audio stream exist. Otherwise it returns the quality rating.
+	 */
+	float getCurrentQuality();
+	/**
+	 * Returns call quality averaged over all the duration of the call.
+	 *
+	 * See getCurrentQuality() for more details about quality measurement.
+	 */
+	float getAverageQuality();
 }