Skip to content
Snippets Groups Projects
Commit 4a1bb6d4 authored by Lyubomir Marinov's avatar Lyubomir Marinov
Browse files

Rebuilds jndirectshow.dll with a newer version of mingw64.

parent 9bac3ea9
No related branches found
No related tags found
No related merge requests found
No preview for this file type
No preview for this file type
...@@ -28,6 +28,7 @@ DEFINE_DSFORMAT_PIXELFORMAT(IMC2) ...@@ -28,6 +28,7 @@ DEFINE_DSFORMAT_PIXELFORMAT(IMC2)
DEFINE_DSFORMAT_PIXELFORMAT(IMC3) DEFINE_DSFORMAT_PIXELFORMAT(IMC3)
DEFINE_DSFORMAT_PIXELFORMAT(IMC4) DEFINE_DSFORMAT_PIXELFORMAT(IMC4)
DEFINE_DSFORMAT_PIXELFORMAT(IYUV) DEFINE_DSFORMAT_PIXELFORMAT(IYUV)
DEFINE_DSFORMAT_PIXELFORMAT(MJPG)
DEFINE_DSFORMAT_PIXELFORMAT(NV12) DEFINE_DSFORMAT_PIXELFORMAT(NV12)
DEFINE_DSFORMAT_PIXELFORMAT(RGB24) DEFINE_DSFORMAT_PIXELFORMAT(RGB24)
DEFINE_DSFORMAT_PIXELFORMAT(RGB32) DEFINE_DSFORMAT_PIXELFORMAT(RGB32)
...@@ -39,4 +40,3 @@ DEFINE_DSFORMAT_PIXELFORMAT(YUY2) ...@@ -39,4 +40,3 @@ DEFINE_DSFORMAT_PIXELFORMAT(YUY2)
DEFINE_DSFORMAT_PIXELFORMAT(YV12) DEFINE_DSFORMAT_PIXELFORMAT(YV12)
DEFINE_DSFORMAT_PIXELFORMAT(YVU9) DEFINE_DSFORMAT_PIXELFORMAT(YVU9)
DEFINE_DSFORMAT_PIXELFORMAT(YVYU) DEFINE_DSFORMAT_PIXELFORMAT(YVYU)
DEFINE_DSFORMAT_PIXELFORMAT(MJPG)
\ No newline at end of file
...@@ -77,6 +77,14 @@ JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_direct ...@@ -77,6 +77,14 @@ JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_direct
* Signature: ()I * Signature: ()I
*/ */
JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat_IYUV JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat_IYUV
(JNIEnv *, jclass);
/*
* Class: org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat
* Method: MJPG
* Signature: ()I
*/
JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat_MJPG
(JNIEnv *, jclass); (JNIEnv *, jclass);
/* /*
...@@ -167,14 +175,6 @@ JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_direct ...@@ -167,14 +175,6 @@ JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_direct
JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat_YVYU JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat_YVYU
(JNIEnv *, jclass); (JNIEnv *, jclass);
/*
* Class: org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat
* Method: MJPG
* Signature: ()I
*/
JNIEXPORT jint JNICALL Java_org_jitsi_impl_neomedia_jmfext_media_protocol_directshow_DSFormat_MJPG
(JNIEnv *, jclass);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif #endif
......
...@@ -71,16 +71,16 @@ public class DSFormat ...@@ -71,16 +71,16 @@ public class DSFormat
{ {
System.loadLibrary("jndirectshow"); System.loadLibrary("jndirectshow");
ARGB32 = ARGB32();
I420 = I420();
MJPG = MJPG();
NV12 = NV12();
RGB24 = RGB24(); RGB24 = RGB24();
RGB32 = RGB32(); RGB32 = RGB32();
ARGB32 = ARGB32();
YUY2 = YUY2();
UYVY = UYVY(); UYVY = UYVY();
NV12 = NV12();
Y411 = Y411(); Y411 = Y411();
Y41P = Y41P(); Y41P = Y41P();
I420 = I420(); YUY2 = YUY2();
MJPG = MJPG();
} }
private static native int ARGB32(); private static native int ARGB32();
...@@ -101,6 +101,8 @@ public class DSFormat ...@@ -101,6 +101,8 @@ public class DSFormat
public static native int IYUV(); public static native int IYUV();
private static native int MJPG();
private static native int NV12(); private static native int NV12();
private static native int RGB24(); private static native int RGB24();
...@@ -123,8 +125,6 @@ public class DSFormat ...@@ -123,8 +125,6 @@ public class DSFormat
public static native int YVYU(); public static native int YVYU();
public static native int MJPG();
/** /**
* Video height. * Video height.
*/ */
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment