Enables the controlling of video size and frame rate from the Video configuration form in Tools > Options.

3 files changed, 51 insertions, 12 deletions

diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.h b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.h
index d479387..4a14ddf 100644
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.h
+++ b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.h
@@ -1,10 +1,3 @@
-/*
- * SIP Communicator, the OpenSource Java VoIP and Instant Messaging client.
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
 /* DO NOT EDIT THIS FILE - it is machine generated */
 #include <jni.h>
 /* Header for class net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput */
@@ -24,6 +17,14 @@ JNIEXPORT jlong JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_Q
 
 /*
  * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput
+ * Method:    minimumVideoFrameInterval
+ * Signature: (J)D
+ */
+JNIEXPORT jdouble JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_minimumVideoFrameInterval
+  (JNIEnv *, jclass, jlong);
+
+/*
+ * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput
  * Method:    pixelBufferAttributes
  * Signature: (J)J
  */
@@ -48,6 +49,14 @@ JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QT
 
 /*
  * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput
+ * Method:    setMinimumVideoFrameInterval
+ * Signature: (JD)V
+ */
+JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setMinimumVideoFrameInterval
+  (JNIEnv *, jclass, jlong, jdouble);
+
+/*
+ * Class:     net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput
  * Method:    setPixelBufferAttributes
  * Signature: (JJ)V
  */
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.m
index 2a5a5f4..59e8037 100644
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.m
+++ b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput.m
@@ -49,6 +49,24 @@ Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVide
     return (jlong) captureDecompressedVideoOutput;
 }
 
+JNIEXPORT jdouble JNICALL
+Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_minimumVideoFrameInterval
+    (JNIEnv *jniEnv, jclass clazz, jlong ptr)
+{
+    QTCaptureDecompressedVideoOutput *captureDecompressedVideoOutput;
+    NSAutoreleasePool *autoreleasePool;
+    NSTimeInterval minimumVideoFrameInterval;
+
+    captureDecompressedVideoOutput = (QTCaptureDecompressedVideoOutput *) ptr;
+    autoreleasePool = [[NSAutoreleasePool alloc] init];
+
+    minimumVideoFrameInterval
+        = [captureDecompressedVideoOutput minimumVideoFrameInterval];
+
+    [autoreleasePool release];
+    return (jdouble) minimumVideoFrameInterval;
+}
+
 JNIEXPORT jlong JNICALL
 Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_pixelBufferAttributes
     (JNIEnv *jniEnv, jclass clazz, jlong ptr)
@@ -127,6 +145,22 @@ Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVide
 }
 
 JNIEXPORT void JNICALL
+Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setMinimumVideoFrameInterval
+    (JNIEnv *jniEnv, jclass clazz, jlong ptr, jdouble minimumVideoFrameInterval)
+{
+    QTCaptureDecompressedVideoOutput *captureDecompressedVideoOutput;
+    NSAutoreleasePool *autoreleasePool;
+
+    captureDecompressedVideoOutput = (QTCaptureDecompressedVideoOutput *) ptr;
+    autoreleasePool = [[NSAutoreleasePool alloc] init];
+
+    [captureDecompressedVideoOutput
+	    setMinimumVideoFrameInterval:(NSTimeInterval)minimumVideoFrameInterval];
+
+    [autoreleasePool release];
+}
+
+JNIEXPORT void JNICALL
 Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setPixelBufferAttributes
     (JNIEnv *jniEnv, jclass clazz, jlong ptr, jlong pixelBufferAttributesPtr)
 {
diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription.m
index d2926ec..d6cd791 100644
--- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription.m
+++ b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription.m
@@ -18,7 +18,7 @@ Java_net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription_sizeF
     (JNIEnv *jniEnv, jclass clazz, jlong ptr, jstring key)
 {
     const char *cKey;
-    jobject size;
+    jobject size = NULL;
 
     cKey = (const char *) (*jniEnv)->GetStringUTFChars(jniEnv, key, NULL);
     if (cKey)
@@ -65,13 +65,9 @@ Java_net_java_sip_communicator_impl_neomedia_quicktime_QTFormatDescription_sizeF
                                 (jint) oSize.height);
             }
         }
-        else
-            size = NULL;
 
         [autoreleasePool release];
     }
-    else
-        size = NULL;
     return size;
 }