Merge remote-tracking branch 'origin/master' into feature/histogram

Author: wysaid

README.md

@@ -43,40 +43,59 @@ dependencies {
   * Waiting for the initialization. (NDK/cmake install)
   * Done.
 
-* Using `Visual Studio Code`: (Simple)
+* Using `Visual Studio Code`: (Requires __[WSL(Recommended)](https://learn.microsoft.com/en-us/windows/wsl/install)__/__[MinGW](https://osdn.net/projects/mingw/)__/__[Cygwin](https://www.cygwin.com/)__ on Windows.)
   * Setup ENV variable `ANDROID_HOME` to your Android SDK installation directory.
   * Open the repo with `Visual Studio Code`
   * Press `⌘ + shift + B` (Mac) or `ctrl + shift + B` (Win/Linux), choose the option `Enable CMake And Build Project With CMake`.
   * Done.
 
-* Build `JNI` part with ndk-build: (Not recommended)
-
-```shell
-export NDK=path/of/your/ndk
-cd folder/of/jni (android-gpuimage-plus/library/src/main/jni)
+* Build with preset tasks: (Requires __[WSL(Recommended)](https://learn.microsoft.com/en-us/windows/wsl/install)__/__[MinGW](https://osdn.net/projects/mingw/)__/__[Cygwin](https://www.cygwin.com/)__ on Windows.)
 
-#This will make all arch: armeabi, armeabi-v7a arm64-v8a, x86, mips
-./buildJNI
-#Or use "sh buildJNI"
+  ```shell
+  # define the environment variable "ANDROID_HOME"
+  # If using Windows, define ANDROID_HOME in Windows Environment Settings by yourself.
+  export ANDROID_HOME=/path/to/android/sdk
+  
+  # Setup Project
+  bash vscode_tasks.sh --setup-project
 
-#Try this if you failed to run the shell above
-export CGE_USE_VIDEO_MODULE=1
-$NDK/ndk-build
+  # Compile with CMake Debug
+  bash vscode_tasks.sh --debug --enable-cmake --build
+  # Compile with CMake Release
+  bash vscode_tasks.sh --release --enable-cmake --build
 
-#If you don't want anything except the image filter,
-#Do as below to build with only cge module
-#No ffmpeg, opencv or faceTracker.
-#And remove the loading part of ffmpeg&facetracker
-$NDK/ndk-build
+  # Start Demo By Command
+  bash vscode_tasks.sh --run
+  ```
 
-#For Windows user, you should include the `.cmd` extension to `ndk-build` like this:
-cd <your\path\to\this\repo>\library\src\main\jni
-<your\path\to\ndk>\ndk-build.cmd
+* Build `JNI` part with ndk-build: (Not recommended)
 
-#Also remember to comment out these line in NativeLibraryLoader
-//System.loadLibrary("ffmpeg");
-//CGEFFmpegNativeLibrary.avRegisterAll();
-```
+  ```shell
+  export NDK=path/of/your/ndk
+  cd folder/of/jni (android-gpuimage-plus/library/src/main/jni)
+  
+  #This will make all arch: armeabi, armeabi-v7a arm64-v8a, x86, mips
+  ./buildJNI
+  #Or use "sh buildJNI"
+  
+  #Try this if you failed to run the shell above
+  export CGE_USE_VIDEO_MODULE=1
+  $NDK/ndk-build
+  
+  #If you don't want anything except the image filter,
+  #Do as below to build with only cge module
+  #No ffmpeg, opencv or faceTracker.
+  #And remove the loading part of ffmpeg&facetracker
+  $NDK/ndk-build
+  
+  #For Windows user, you should include the `.cmd` extension to `ndk-build` like this:
+  cd <your\path\to\this\repo>\library\src\main\jni
+  <your\path\to\ndk>\ndk-build.cmd
+  
+  #Also remember to comment out these line in NativeLibraryLoader
+  //System.loadLibrary("ffmpeg");
+  //CGEFFmpegNativeLibrary.avRegisterAll();
+  ```
 
 > You can find precompiled libs here: [android-gpuimage-plus-libs](https://github.com/wysaid/android-gpuimage-plus-libs) (The precompiled '.so' files are generated with NDK-r23b)
 

cgeDemo/src/main/java/org/wysaid/cgeDemo/CameraDemoActivity.java

@@ -230,8 +230,8 @@ public void onClick(View v) {
         });
 
         //Recording video size
-        mCameraView.presetRecordingSize(480, 640);
-//        mCameraView.presetRecordingSize(720, 1280);
+        // mCameraView.presetRecordingSize(480, 640);
+       mCameraView.presetRecordingSize(1080, 1920);
 
         //Taking picture size.
         mCameraView.setPictureSize(2048, 2048, true); // > 4MP

library/src/main/java/org/wysaid/view/CameraGLSurfaceView.java

@@ -91,8 +91,8 @@ public synchronized boolean setFlashLightMode(String mode) {
         return true;
     }
 
-    protected int mMaxPreviewWidth = 1280;
-    protected int mMaxPreviewHeight = 1280;
+    protected int mMaxPreviewWidth = 1920;
+    protected int mMaxPreviewHeight = 1920;
 
     public static class Viewport {
          public int x, y, width, height;
@@ -104,7 +104,7 @@ public Viewport getDrawViewport() {
         return mDrawViewport;
     }
 
-    //The max preview size. Change it to 1920+ if you want to preview with 1080P
+    //The max preview size. Make it greater if you want to preview with 2K/4K or more!
     void setMaxPreviewSize(int w, int h) {
         mMaxPreviewWidth = w;
         mMaxPreviewHeight = h;
@@ -143,6 +143,8 @@ public void presetRecordingSize(int width, int height) {
             height = (int) (height * scaling);
         }
 
+        Log.i(Common.LOG_TAG, "presetRecordingSize: " + width + "x" + height);
+
         mRecordWidth = width;
         mRecordHeight = height;
         cameraInstance().setPreferPreviewSize(width, height);