4 files changed, 412 insertions, 0 deletions
diff --git a/bindings/java/android/MediaSessionMgr.java b/bindings/java/android/MediaSessionMgr.java
index f5d0177..8a6b5cf 100755
--- a/bindings/java/android/MediaSessionMgr.java
+++ b/bindings/java/android/MediaSessionMgr.java
@@ -43,6 +43,11 @@ public class MediaSessionMgr {
     return tinyWRAPJNI.MediaSessionMgr_sessionGetInt32(swigCPtr, this, media.swigValue(), key);
   }
 
+  public QoS sessionGetQoS(twrap_media_type_t media) {
+    long cPtr = tinyWRAPJNI.MediaSessionMgr_sessionGetQoS(swigCPtr, this, media.swigValue());
+    return (cPtr == 0) ? null : new QoS(cPtr, true);
+  }
+
   public boolean consumerSetInt32(twrap_media_type_t media, String key, int value) {
     return tinyWRAPJNI.MediaSessionMgr_consumerSetInt32(swigCPtr, this, media.swigValue(), key, value);
   }
@@ -122,6 +127,14 @@ public class MediaSessionMgr {
     return tinyWRAPJNI.MediaSessionMgr_defaultsSetPrefVideoSize(pref_video_size.swigValue());
   }
 
+  public static boolean defaultsSetPrefVideoSizeOutRange(tmedia_pref_video_size_t min, tmedia_pref_video_size_t max) {
+    return tinyWRAPJNI.MediaSessionMgr_defaultsSetPrefVideoSizeOutRange(min.swigValue(), max.swigValue());
+  }
+
+  public static boolean defaultsSetAdaptativeVideoSizeOutEnabled(boolean enabled) {
+    return tinyWRAPJNI.MediaSessionMgr_defaultsSetAdaptativeVideoSizeOutEnabled(enabled);
+  }
+
   public static boolean defaultsSetJbMargin(long jb_margin_ms) {
     return tinyWRAPJNI.MediaSessionMgr_defaultsSetJbMargin(jb_margin_ms);
   }
diff --git a/bindings/java/android/QoS.java b/bindings/java/android/QoS.java
new file mode 100644
index 0000000..e216f8d
--- /dev/null
+++ b/bindings/java/android/QoS.java
@@ -0,0 +1,98 @@
+/* ----------------------------------------------------------------------------
+ * This file was automatically generated by SWIG (http://www.swig.org).
+ * Version 2.0.9
+ *
+ * Do not make changes to this file unless you know what you are doing--modify
+ * the SWIG interface file instead.
+ * ----------------------------------------------------------------------------- */
+
+package org.doubango.tinyWRAP;
+
+public class QoS {
+  private long swigCPtr;
+  protected boolean swigCMemOwn;
+
+  protected QoS(long cPtr, boolean cMemoryOwn) {
+    swigCMemOwn = cMemoryOwn;
+    swigCPtr = cPtr;
+  }
+
+  protected static long getCPtr(QoS obj) {
+    return (obj == null) ? 0 : obj.swigCPtr;
+  }
+
+  protected void finalize() {
+    delete();
+  }
+
+  public synchronized void delete() {
+    if (swigCPtr != 0) {
+      if (swigCMemOwn) {
+        swigCMemOwn = false;
+        tinyWRAPJNI.delete_QoS(swigCPtr);
+      }
+      swigCPtr = 0;
+    }
+  }
+
+  public float getQavg() {
+    return tinyWRAPJNI.QoS_getQavg(swigCPtr, this);
+  }
+
+  public float getQ1() {
+    return tinyWRAPJNI.QoS_getQ1(swigCPtr, this);
+  }
+
+  public float getQ2() {
+    return tinyWRAPJNI.QoS_getQ2(swigCPtr, this);
+  }
+
+  public float getQ3() {
+    return tinyWRAPJNI.QoS_getQ3(swigCPtr, this);
+  }
+
+  public float getQ4() {
+    return tinyWRAPJNI.QoS_getQ4(swigCPtr, this);
+  }
+
+  public float getQ5() {
+    return tinyWRAPJNI.QoS_getQ5(swigCPtr, this);
+  }
+
+  public long getVideoInWidth() {
+    return tinyWRAPJNI.QoS_getVideoInWidth(swigCPtr, this);
+  }
+
+  public long getVideoOutWidth() {
+    return tinyWRAPJNI.QoS_getVideoOutWidth(swigCPtr, this);
+  }
+
+  public long getVideoInHeight() {
+    return tinyWRAPJNI.QoS_getVideoInHeight(swigCPtr, this);
+  }
+
+  public long getVideoOutHeight() {
+    return tinyWRAPJNI.QoS_getVideoOutHeight(swigCPtr, this);
+  }
+
+  public long getBandwidthDownKbps() {
+    return tinyWRAPJNI.QoS_getBandwidthDownKbps(swigCPtr, this);
+  }
+
+  public long getBandwidthUpKbps() {
+    return tinyWRAPJNI.QoS_getBandwidthUpKbps(swigCPtr, this);
+  }
+
+  public long getVideoInAvgFps() {
+    return tinyWRAPJNI.QoS_getVideoInAvgFps(swigCPtr, this);
+  }
+
+  public long getVideoDecAvgTime() {
+    return tinyWRAPJNI.QoS_getVideoDecAvgTime(swigCPtr, this);
+  }
+
+  public long getVideoEncAvgTime() {
+    return tinyWRAPJNI.QoS_getVideoEncAvgTime(swigCPtr, this);
+  }
+
+}
diff --git a/bindings/java/android/tinyWRAPJNI.java b/bindings/java/android/tinyWRAPJNI.java
index e7e86fc..4e02d2b 100755
--- a/bindings/java/android/tinyWRAPJNI.java
+++ b/bindings/java/android/tinyWRAPJNI.java
@@ -35,6 +35,22 @@ public class tinyWRAPJNI {
   public final static native long ActionConfig_setResponseLine(long jarg1, ActionConfig jarg1_, short jarg2, String jarg3);
   public final static native long ActionConfig_setMediaString(long jarg1, ActionConfig jarg1_, int jarg2, String jarg3, String jarg4);
   public final static native long ActionConfig_setMediaInt(long jarg1, ActionConfig jarg1_, int jarg2, String jarg3, int jarg4);
+  public final static native void delete_QoS(long jarg1);
+  public final static native float QoS_getQavg(long jarg1, QoS jarg1_);
+  public final static native float QoS_getQ1(long jarg1, QoS jarg1_);
+  public final static native float QoS_getQ2(long jarg1, QoS jarg1_);
+  public final static native float QoS_getQ3(long jarg1, QoS jarg1_);
+  public final static native float QoS_getQ4(long jarg1, QoS jarg1_);
+  public final static native float QoS_getQ5(long jarg1, QoS jarg1_);
+  public final static native long QoS_getVideoInWidth(long jarg1, QoS jarg1_);
+  public final static native long QoS_getVideoOutWidth(long jarg1, QoS jarg1_);
+  public final static native long QoS_getVideoInHeight(long jarg1, QoS jarg1_);
+  public final static native long QoS_getVideoOutHeight(long jarg1, QoS jarg1_);
+  public final static native long QoS_getBandwidthDownKbps(long jarg1, QoS jarg1_);
+  public final static native long QoS_getBandwidthUpKbps(long jarg1, QoS jarg1_);
+  public final static native long QoS_getVideoInAvgFps(long jarg1, QoS jarg1_);
+  public final static native long QoS_getVideoDecAvgTime(long jarg1, QoS jarg1_);
+  public final static native long QoS_getVideoEncAvgTime(long jarg1, QoS jarg1_);
   public final static native void delete_Codec(long jarg1);
   public final static native int Codec_getMediaType(long jarg1, Codec jarg1_);
   public final static native String Codec_getName(long jarg1, Codec jarg1_);
@@ -46,6 +62,7 @@ public class tinyWRAPJNI {
   public final static native void delete_MediaSessionMgr(long jarg1);
   public final static native boolean MediaSessionMgr_sessionSetInt32(long jarg1, MediaSessionMgr jarg1_, int jarg2, String jarg3, int jarg4);
   public final static native int MediaSessionMgr_sessionGetInt32(long jarg1, MediaSessionMgr jarg1_, int jarg2, String jarg3);
+  public final static native long MediaSessionMgr_sessionGetQoS(long jarg1, MediaSessionMgr jarg1_, int jarg2);
   public final static native boolean MediaSessionMgr_consumerSetInt32(long jarg1, MediaSessionMgr jarg1_, int jarg2, String jarg3, int jarg4);
   public final static native boolean MediaSessionMgr_consumerSetInt64(long jarg1, MediaSessionMgr jarg1_, int jarg2, String jarg3, long jarg4);
   public final static native boolean MediaSessionMgr_producerSetInt32(long jarg1, MediaSessionMgr jarg1_, int jarg2, String jarg3, int jarg4);
@@ -65,6 +82,8 @@ public class tinyWRAPJNI {
   public final static native boolean MediaSessionMgr_defaultsSetBandwidthVideoUploadMax(int jarg1);
   public final static native boolean MediaSessionMgr_defaultsSetBandwidthVideoDownloadMax(int jarg1);
   public final static native boolean MediaSessionMgr_defaultsSetPrefVideoSize(int jarg1);
+  public final static native boolean MediaSessionMgr_defaultsSetPrefVideoSizeOutRange(int jarg1, int jarg2);
+  public final static native boolean MediaSessionMgr_defaultsSetAdaptativeVideoSizeOutEnabled(boolean jarg1);
   public final static native boolean MediaSessionMgr_defaultsSetJbMargin(long jarg1);
   public final static native boolean MediaSessionMgr_defaultsSetJbMaxLateRate(long jarg1);
   public final static native boolean MediaSessionMgr_defaultsSetEchoTail(long jarg1);
diff --git a/bindings/java/android/tinyWRAP_wrap.cxx b/bindings/java/android/tinyWRAP_wrap.cxx
index e68ff27..4ea8812 100755
--- a/bindings/java/android/tinyWRAP_wrap.cxx
+++ b/bindings/java/android/tinyWRAP_wrap.cxx
@@ -2407,6 +2407,241 @@ SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_ActionConfig_1se
 }
 
 
+SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_delete_1QoS(JNIEnv *jenv, jclass jcls, jlong jarg1) {
+  QoS *arg1 = (QoS *) 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = *(QoS **)&jarg1; 
+  delete arg1;
+}
+
+
+SWIGEXPORT jfloat JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getQavg(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jfloat jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  float result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (float)(arg1)->getQavg();
+  jresult = (jfloat)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jfloat JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getQ1(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jfloat jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  float result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (float)(arg1)->getQ1();
+  jresult = (jfloat)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jfloat JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getQ2(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jfloat jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  float result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (float)(arg1)->getQ2();
+  jresult = (jfloat)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jfloat JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getQ3(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jfloat jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  float result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (float)(arg1)->getQ3();
+  jresult = (jfloat)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jfloat JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getQ4(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jfloat jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  float result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (float)(arg1)->getQ4();
+  jresult = (jfloat)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jfloat JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getQ5(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jfloat jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  float result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (float)(arg1)->getQ5();
+  jresult = (jfloat)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getVideoInWidth(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  unsigned int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (unsigned int)(arg1)->getVideoInWidth();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getVideoOutWidth(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  unsigned int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (unsigned int)(arg1)->getVideoOutWidth();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getVideoInHeight(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  unsigned int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (unsigned int)(arg1)->getVideoInHeight();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getVideoOutHeight(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  unsigned int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (unsigned int)(arg1)->getVideoOutHeight();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getBandwidthDownKbps(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  unsigned int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (unsigned int)(arg1)->getBandwidthDownKbps();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getBandwidthUpKbps(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  unsigned int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (unsigned int)(arg1)->getBandwidthUpKbps();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getVideoInAvgFps(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  unsigned int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (unsigned int)(arg1)->getVideoInAvgFps();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getVideoDecAvgTime(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  unsigned int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (unsigned int)(arg1)->getVideoDecAvgTime();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_QoS_1getVideoEncAvgTime(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_) {
+  jlong jresult = 0 ;
+  QoS *arg1 = (QoS *) 0 ;
+  unsigned int result;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(QoS **)&jarg1; 
+  result = (unsigned int)(arg1)->getVideoEncAvgTime();
+  jresult = (jlong)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT void JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_delete_1Codec(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   Codec *arg1 = (Codec *) 0 ;
   
@@ -2582,6 +2817,23 @@ SWIGEXPORT jint JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MediaSessionMgr_1
 }
 
 
+SWIGEXPORT jlong JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MediaSessionMgr_1sessionGetQoS(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2) {
+  jlong jresult = 0 ;
+  MediaSessionMgr *arg1 = (MediaSessionMgr *) 0 ;
+  twrap_media_type_t arg2 ;
+  QoS *result = 0 ;
+  
+  (void)jenv;
+  (void)jcls;
+  (void)jarg1_;
+  arg1 = *(MediaSessionMgr **)&jarg1; 
+  arg2 = (twrap_media_type_t)jarg2; 
+  result = (QoS *)(arg1)->sessionGetQoS(arg2);
+  *(QoS **)&jresult = result; 
+  return jresult;
+}
+
+
 SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MediaSessionMgr_1consumerSetInt32(JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_, jint jarg2, jstring jarg3, jint jarg4) {
   jboolean jresult = 0 ;
   MediaSessionMgr *arg1 = (MediaSessionMgr *) 0 ;
@@ -2925,6 +3177,36 @@ SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MediaSessionM
 }
 
 
+SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MediaSessionMgr_1defaultsSetPrefVideoSizeOutRange(JNIEnv *jenv, jclass jcls, jint jarg1, jint jarg2) {
+  jboolean jresult = 0 ;
+  tmedia_pref_video_size_t arg1 ;
+  tmedia_pref_video_size_t arg2 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = (tmedia_pref_video_size_t)jarg1; 
+  arg2 = (tmedia_pref_video_size_t)jarg2; 
+  result = (bool)MediaSessionMgr::defaultsSetPrefVideoSizeOutRange(arg1,arg2);
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
+SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MediaSessionMgr_1defaultsSetAdaptativeVideoSizeOutEnabled(JNIEnv *jenv, jclass jcls, jboolean jarg1) {
+  jboolean jresult = 0 ;
+  bool arg1 ;
+  bool result;
+  
+  (void)jenv;
+  (void)jcls;
+  arg1 = jarg1 ? true : false; 
+  result = (bool)MediaSessionMgr::defaultsSetAdaptativeVideoSizeOutEnabled(arg1);
+  jresult = (jboolean)result; 
+  return jresult;
+}
+
+
 SWIGEXPORT jboolean JNICALL Java_org_doubango_tinyWRAP_tinyWRAPJNI_MediaSessionMgr_1defaultsSetJbMargin(JNIEnv *jenv, jclass jcls, jlong jarg1) {
   jboolean jresult = 0 ;
   uint32_t arg1 ;