X-Git-Url: http://47.100.26.94:8080/?a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjni%2Flibuvc-0.0.6%2Finclude%2Flibuvc%2Flibuvc_internal.h;fp=app%2Fsrc%2Fmain%2Fjni%2Flibuvc-0.0.6%2Finclude%2Flibuvc%2Flibuvc_internal.h;h=6052448887a4e20ae4a6da1ea2892f6e3efdbc3d;hb=831cc09829bc6e18d8d0d8bb78063e89ea565ce9;hp=829b294208b4dbecc088de781cb6f54ef6c4fed4;hpb=061580c83656bf358b01a6b78fd22ae9bd497728;p=rtmpclient.git

diff --git a/app/src/main/jni/libuvc-0.0.6/include/libuvc/libuvc_internal.h b/app/src/main/jni/libuvc-0.0.6/include/libuvc/libuvc_internal.h
index 829b294..6052448 100644
--- a/app/src/main/jni/libuvc-0.0.6/include/libuvc/libuvc_internal.h
+++ b/app/src/main/jni/libuvc-0.0.6/include/libuvc/libuvc_internal.h
@@ -13,6 +13,9 @@
 #include <signal.h>
 #include <libusb.h>
 #include "utlist.h"
+#ifdef __ANDROID__
+#include <android/log.h>
+#endif
 
 /** Converts an unaligned four-byte little-endian integer into an int32 */
 #define DW_TO_INT(p) ((p)[0] | ((p)[1] << 8) | ((p)[2] << 16) | ((p)[3] << 24))
@@ -50,10 +53,18 @@
 
 #ifdef UVC_DEBUGGING
 #include <libgen.h>
-#define UVC_DEBUG(format, ...) fprintf(stderr, "[%s:%d/%s] " format "\n", basename(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__)
-#define UVC_ENTER() fprintf(stderr, "[%s:%d] begin %s\n", basename(__FILE__), __LINE__, __FUNCTION__)
-#define UVC_EXIT(code) fprintf(stderr, "[%s:%d] end %s (%d)\n", basename(__FILE__), __LINE__, __FUNCTION__, code)
-#define UVC_EXIT_VOID() fprintf(stderr, "[%s:%d] end %s\n", basename(__FILE__), __LINE__, __FUNCTION__)
+#ifdef __ANDROID__
+    #define UVC_DEBUG(...) __android_log_print(ANDROID_LOG_DEBUG,"UVC", __VA_ARGS__)
+    #define UVC_ENTER() __android_log_print(ANDROID_LOG_DEBUG, "UVC", "[%s:%d] begin %s\n", basename(__FILE__), __LINE__, __FUNCTION__)
+    #define UVC_EXIT(code) __android_log_print(ANDROID_LOG_DEBUG, "UVC", "[%s:%d] end %s (%d)\n", basename(__FILE__), __LINE__, __FUNCTION__, code)
+    #define UVC_EXIT_VOID() __android_log_print(ANDROID_LOG_DEBUG, "UVC", "[%s:%d] end %s\n", basename(__FILE__), __LINE__, __FUNCTION__)
+#else
+    #define UVC_DEBUG(format, ...) fprintf(stderr, "[%s:%d/%s] " format "\n", basename(__FILE__), __LINE__, __FUNCTION__, ##__VA_ARGS__)
+    #define UVC_ENTER() fprintf(stderr, "[%s:%d] begin %s\n", basename(__FILE__), __LINE__, __FUNCTION__)
+    #define UVC_EXIT(code) fprintf(stderr, "[%s:%d] end %s (%d)\n", basename(__FILE__), __LINE__, __FUNCTION__, code)
+    #define UVC_EXIT_VOID() fprintf(stderr, "[%s:%d] end %s\n", basename(__FILE__), __LINE__, __FUNCTION__)
+#endif
+
 #else
 #define UVC_DEBUG(format, ...)
 #define UVC_ENTER()