Feature/surface view

.gitignore

@@ -1,3 +1,4 @@
+release/
 # built application files
 *.apk
 *.ap_
@@ -49,6 +50,7 @@ build
 # gedit
 *~
 
+.idea/
 .idea/*.xml
 !.idea/codeStyleSettings.xml
 !.idea/copyright/*.xml

UVCCamera.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="UVCCamera" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="UVCCamera" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>

build.gradle

@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.4'
+        classpath 'com.android.tools.build:gradle:4.0.0'
     }
 }
 
@@ -26,7 +26,7 @@ task clean(type: Delete) {
 ext {
 	supportLibVersion = '27.1.1'  // variable that can be referenced to keep support libs consistent
 	commonLibVersion= '2.12.4'
-	versionBuildTool = '27.0.3'
+	versionBuildTool = '29.0.2'
 	versionCompiler = 27
 	versionTarget = 27
 	versionNameString = '1.0.0'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Oct 02 16:16:11 JST 2018
+#Mon Jun 29 14:24:40 CST 2020
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

libuvccamera/src/main/AndroidManifest.xml

@@ -26,8 +26,6 @@
     android:versionCode="2"
     android:versionName="1.1" >
 
-    <uses-sdk
-        android:minSdkVersion="14"
-        android:targetSdkVersion="22" />
+    <uses-sdk android:targetSdkVersion="22" />
 
 </manifest>

libuvccamera/src/main/java/com/serenegiant/usb/UVCCamera.java

@@ -51,7 +51,7 @@ public class UVCCamera {
 	public static final int DEFAULT_PREVIEW_MAX_FPS = 30;
 	public static final float DEFAULT_BANDWIDTH = 1.0f;
 
-	public static final int FRAME_FORMAT_YUYV = 0;
+	public static final int FRAME_FORMAT_H264 = 0;
 	public static final int FRAME_FORMAT_MJPEG = 1;
 
 	public static final int PIXEL_FORMAT_RAW = 0;
@@ -204,10 +204,18 @@ public synchronized void open(final UsbControlBlock ctrlBlock) {
 			throw new UnsupportedOperationException("open failed:result=" + result);
 		}
     	if (mNativePtr != 0 && TextUtils.isEmpty(mSupportedSize)) {
-    		mSupportedSize = nativeGetSupportedSize(mNativePtr);
+			mSupportedSize = nativeGetSupportedSize(mNativePtr);
+			Log.e(TAG, "open: mSupportedSize " + mSupportedSize);
     	}
-		nativeSetPreviewSize(mNativePtr, DEFAULT_PREVIEW_WIDTH, DEFAULT_PREVIEW_HEIGHT,
+		int ret = nativeSetPreviewSize(mNativePtr, DEFAULT_PREVIEW_WIDTH, DEFAULT_PREVIEW_HEIGHT,
 			DEFAULT_PREVIEW_MIN_FPS, DEFAULT_PREVIEW_MAX_FPS, DEFAULT_PREVIEW_MODE, DEFAULT_BANDWIDTH);
+		Log.e(TAG, "open: nativeSetPreviewSize"
+				+ DEFAULT_PREVIEW_WIDTH + " "
+				+ DEFAULT_PREVIEW_WIDTH + " "
+				+ DEFAULT_PREVIEW_MIN_FPS + " "
+				+ DEFAULT_PREVIEW_MAX_FPS + " "
+				+ DEFAULT_PREVIEW_MODE + " "
+				+ DEFAULT_BANDWIDTH);
     }
 
 	/**
@@ -293,7 +301,7 @@ public void setPreviewSize(final int width, final int height) {
 	 * Set preview size and preview mode
 	 * @param width
 	 * @param height
-	 * @param frameFormat either FRAME_FORMAT_YUYV(0) or FRAME_FORMAT_MJPEG(1)
+	 * @param frameFormat either FRAME_FORMAT_H264(0) or FRAME_FORMAT_MJPEG(1)
 	 */
 	public void setPreviewSize(final int width, final int height, final int frameFormat) {
 		setPreviewSize(width, height, DEFAULT_PREVIEW_MIN_FPS, DEFAULT_PREVIEW_MAX_FPS, frameFormat, mCurrentBandwidthFactor);
@@ -303,7 +311,7 @@ public void setPreviewSize(final int width, final int height, final int frameFor
 	 * Set preview size and preview mode
 	 * @param width
 	   @param height
-	   @param frameFormat either FRAME_FORMAT_YUYV(0) or FRAME_FORMAT_MJPEG(1)
+	   @param frameFormat either FRAME_FORMAT_H264(0) or FRAME_FORMAT_MJPEG(1)
 	   @param bandwidth [0.0f,1.0f]
 	 */
 	public void setPreviewSize(final int width, final int height, final int frameFormat, final float bandwidth) {
@@ -316,7 +324,7 @@ public void setPreviewSize(final int width, final int height, final int frameFor
 	 * @param height
 	 * @param min_fps
 	 * @param max_fps
-	 * @param frameFormat either FRAME_FORMAT_YUYV(0) or FRAME_FORMAT_MJPEG(1)
+	 * @param frameFormat either FRAME_FORMAT_H264(0) or FRAME_FORMAT_MJPEG(1)
 	 * @param bandwidthFactor
 	 */
 	public void setPreviewSize(final int width, final int height, final int min_fps, final int max_fps, final int frameFormat, final float bandwidthFactor) {

libuvccamera/src/main/jni/Application.mk

@@ -27,6 +27,6 @@
 #NDK_TOOLCHAIN_VERSION := 4.9
 
 APP_PLATFORM := android-14
-APP_ABI := armeabi armeabi-v7a x86 mips
+APP_ABI := armeabi-v7a arm64-v8a
 #APP_OPTIM := debug
 APP_OPTIM := release

libuvccamera/src/main/jni/UVCCamera/Parameters.cpp

@@ -67,6 +67,8 @@ static const char *_uvc_name_for_format_subtype(uint8_t subtype) {
 		return "UncompressedFormat";
 	case UVC_VS_FORMAT_MJPEG:
 		return "MJPEGFormat";
+	case UVC_VS_FORMAT_FRAME_BASED:
+		return "H264";
 	default:
 		return "Unknown";
 	}
@@ -237,6 +239,7 @@ static void writerFormatDescriptions(Writer<StringBuffer> &writer, uvc_streaming
 			switch (fmt_desc->bDescriptorSubtype) {
 			case UVC_VS_FORMAT_UNCOMPRESSED:
 			case UVC_VS_FORMAT_MJPEG:
+			case UVC_VS_FORMAT_FRAME_BASED:
 				writerFormat(writer, fmt_desc);
 				break;
 			default:
@@ -365,6 +368,7 @@ char *UVCDiags::getSupportedSize(const uvc_device_handle_t *deviceHandle) {
 						switch (fmt_desc->bDescriptorSubtype) {
 						case UVC_VS_FORMAT_UNCOMPRESSED:
 						case UVC_VS_FORMAT_MJPEG:
+						case UVC_VS_FORMAT_FRAME_BASED:
 							write(writer, "index", fmt_desc->bFormatIndex);
 							write(writer, "type", fmt_desc->bDescriptorSubtype);
 							write(writer, "default", fmt_desc->bDefaultFrameIndex);