diff --git a/lib/native/mac/libjquicktime.jnilib b/lib/native/mac/libjquicktime.jnilib index 0b52c09fe..489fbb757 100755 Binary files a/lib/native/mac/libjquicktime.jnilib and b/lib/native/mac/libjquicktime.jnilib differ diff --git a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer.m b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer.m index 08f77a75b..8a9ed9440 100644 --- a/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer.m +++ b/src/native/macosx/quicktime/net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer.m @@ -145,7 +145,7 @@ Java_net_java_sip_communicator_impl_neomedia_quicktime_CVPixelBuffer_getBytes__J * CVPixelBufferGetHeightOfPlane( pixelBuffer, planeIndex); - memcpy(buf, cBytes, byteCount); + memcpy((void *) buf, cBytes, byteCount); byteOffset += byteCount; } byteCount = byteOffset; 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 e1169a610..d479387f7 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 @@ -33,9 +33,9 @@ JNIEXPORT jlong JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_Q /* * Class: net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput * Method: setAutomaticallyDropsLateVideoFrames - * Signature: (JZ)V + * Signature: (JZ)Z */ -JNIEXPORT void JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setAutomaticallyDropsLateVideoFrames +JNIEXPORT jboolean JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setAutomaticallyDropsLateVideoFrames (JNIEnv *, jclass, jlong, jboolean); /* 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 88a0c02e6..af4133f57 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 @@ -69,7 +69,7 @@ Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVide return (jlong) pixelBufferAttributes; } -JNIEXPORT void JNICALL +JNIEXPORT jboolean JNICALL Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVideoOutput_setAutomaticallyDropsLateVideoFrames (JNIEnv *jniEnv, jclass clazz, jlong ptr, jboolean automaticallyDropsLateVideoFrames) @@ -82,11 +82,16 @@ Java_net_java_sip_communicator_impl_neomedia_quicktime_QTCaptureDecompressedVide if ([captureDecompressedVideoOutput respondsToSelector:@selector(setAutomaticallyDropsLateVideoFrames)]) + { [captureDecompressedVideoOutput setAutomaticallyDropsLateVideoFrames: ((JNI_TRUE == automaticallyDropsLateVideoFrames) ? YES : NO)]; + automaticallyDropsLateVideoFrames + = [captureDecompressedVideoOutput automaticallyDropsLateVideoFrames]; + } [autoreleasePool release]; + return automaticallyDropsLateVideoFrames; } JNIEXPORT void JNICALL diff --git a/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransferHandler.java b/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransferHandler.java index 374eea78d..7321151b8 100644 --- a/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransferHandler.java +++ b/src/net/java/sip/communicator/impl/gui/main/chat/ChatTransferHandler.java @@ -174,7 +174,7 @@ else if (t.isDataFlavorSupported(uiContactDataFlavor)) if (contact != null) { - ArrayList inviteList = new ArrayList(); + List inviteList = new ArrayList(); inviteList.add(contact); chatPanel.inviteContacts( currentChatTransport, inviteList, null); diff --git a/src/net/java/sip/communicator/impl/neomedia/jmfext/media/protocol/quicktime/QuickTimeStream.java b/src/net/java/sip/communicator/impl/neomedia/jmfext/media/protocol/quicktime/QuickTimeStream.java index 030080485..9b459af28 100644 --- a/src/net/java/sip/communicator/impl/neomedia/jmfext/media/protocol/quicktime/QuickTimeStream.java +++ b/src/net/java/sip/communicator/impl/neomedia/jmfext/media/protocol/quicktime/QuickTimeStream.java @@ -131,7 +131,7 @@ public class QuickTimeStream } automaticallyDropsLateVideoFrames - = false;//captureOutput.setAutomaticallyDropsLateVideoFrames(true); + = captureOutput.setAutomaticallyDropsLateVideoFrames(true); captureOutput .setDelegate( new QTCaptureDecompressedVideoOutput.Delegate() diff --git a/src/net/java/sip/communicator/impl/neomedia/quicktime/QTCaptureDecompressedVideoOutput.java b/src/net/java/sip/communicator/impl/neomedia/quicktime/QTCaptureDecompressedVideoOutput.java index 2ae9a2ae1..ee76f89f1 100644 --- a/src/net/java/sip/communicator/impl/neomedia/quicktime/QTCaptureDecompressedVideoOutput.java +++ b/src/net/java/sip/communicator/impl/neomedia/quicktime/QTCaptureDecompressedVideoOutput.java @@ -63,15 +63,16 @@ public NSDictionary pixelBufferAttributes() private static native long pixelBufferAttributes(long ptr); - public void setAutomaticallyDropsLateVideoFrames( + public boolean setAutomaticallyDropsLateVideoFrames( boolean automaticallyDropsLateVideoFrames) { - setAutomaticallyDropsLateVideoFrames( - getPtr(), - automaticallyDropsLateVideoFrames); + return + setAutomaticallyDropsLateVideoFrames( + getPtr(), + automaticallyDropsLateVideoFrames); } - private static native void setAutomaticallyDropsLateVideoFrames( + private static native boolean setAutomaticallyDropsLateVideoFrames( long ptr, boolean automaticallyDropsLateVideoFrames);