Merge branch 'master' into dev

Author: wysaid

cgeDemo/src/main/res/layout/activity_basic_filter_demo.xml

@@ -11,7 +11,9 @@
     <org.wysaid.view.ImageGLSurfaceView
         android:id="@+id/mainImageView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:layout_below="@+id/seekBar"
+        android:layout_above="@+id/horizontalScroll"/>
 
     <SeekBar
         android:id="@+id/seekBar"
@@ -22,6 +24,7 @@
         />
 
     <HorizontalScrollView
+        android:id="@+id/horizontalScroll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true">

cgeDemo/src/main/res/layout/activity_filter_demo.xml

@@ -11,7 +11,9 @@
     <org.wysaid.view.ImageGLSurfaceView
         android:id="@+id/mainImageView"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent"
+        android:layout_below="@+id/seekBar"
+        android:layout_above="@+id/horizontalScroll"/>
 
     <SeekBar
         android:id="@+id/seekBar"
@@ -22,6 +24,7 @@
         />
 
     <HorizontalScrollView
+        android:id="@+id/horizontalScroll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true">

library/src/main/java/org/wysaid/myUtils/FileUtil.java

@@ -55,7 +55,7 @@ public static String getPathInPackage(Context context, boolean grantPermissions)
 
         if(!file.exists()) {
             if(!file.mkdirs()) {
-                Log.e(LOG_TAG, "在pakage目录创建CGE临时目录失败!");
+                Log.e(LOG_TAG, "Create package dir of CGE failed!");
                 return null;
             }
 

library/src/main/java/org/wysaid/nativePort/CGEFrameRenderer.java

@@ -142,6 +142,10 @@ public void bindImageFBO() {
         nativeBindImageFBO(mNativeAddress);
     }
 
+    public void swapImageFBO() {
+        nativeSwapBufferFBO(mNativeAddress);
+    }
+
     //nativeFilter 为 JNI 下的 CGEImageFilterInterfaceAbstract 或者其子类.
     public void processWithFilter(long nativeFilter) {
         nativeProcessWithFilter(mNativeAddress, nativeFilter);
@@ -182,6 +186,7 @@ public void setNativeFilter(long nativeFilter) {
 
     protected native long nativeGetImageHandler(long holder);
     protected native void nativeBindImageFBO(long holder);
+    protected native void nativeSwapBufferFBO(long holder);
 
     //辅助方法
     protected native void nativeProcessWithFilter(long holder, long nativeFilter);

library/src/main/java/org/wysaid/nativePort/CGEImageHandler.java

@@ -125,6 +125,9 @@ public void release() {
         }
     }
 
+    public void setFilterWithAddres(long filter) {
+        nativeSetFilterWithAddress(mNativeAddress, filter);
+    }
 
     /////////////////      protected         ///////////////////////
 
@@ -136,6 +139,7 @@ public void release() {
     protected native void nativeSetDrawerRotation(long holder, float rad);
     protected native void nativeSetDrawerFlipScale(long holder, float x, float y);
     protected native boolean nativeSetFilterWithConfig(long holder, String config, boolean shouldCleanOlder, boolean shouldProcess);
+    protected native void nativeSetFilterWithAddress(long holder, long filter);
     protected native void nativeSetFilterIntensity(long holder, float value, boolean shouldProcess);
     protected native boolean nativeSetFilterIntensityAtIndex(long holder, float value, int index, boolean shouldProcess);
 

library/src/main/jni/interface/cgeImageHandlerWrapper.cpp

@@ -62,6 +62,15 @@ JNIEXPORT void JNICALL Java_org_wysaid_nativePort_CGEImageHandler_nativeSetDrawe
 	drawer->setFlipScale(x, y);
 }
 
+JNIEXPORT void JNICALL Java_org_wysaid_nativePort_CGEImageHandler_nativeSetFilterWithAddress
+  (JNIEnv *, jobject, jlong addr, jlong filter)
+{
+	CGEImageHandlerAndroid* handler = (CGEImageHandlerAndroid*)addr;
+	handler->clearImageFilters(true);
+	handler->revertToKeptResult();
+	handler->addImageFilter((CGEImageFilterInterfaceAbstract *)filter);
+}
+
 JNIEXPORT jboolean JNICALL Java_org_wysaid_nativePort_CGEImageHandler_nativeSetFilterWithConfig
   (JNIEnv *env, jobject, jlong addr, jstring config, jboolean shouldCleanOlder, jboolean shouldProcess)
 {	

library/src/main/jni/interface/cgeImageHandlerWrapper.h

@@ -37,6 +37,9 @@ JNIEXPORT void JNICALL Java_org_wysaid_nativePort_CGEImageHandler_nativeSetDrawe
 JNIEXPORT jboolean JNICALL Java_org_wysaid_nativePort_CGEImageHandler_nativeSetFilterWithConfig
   (JNIEnv *, jobject, jlong, jstring, jboolean, jboolean);
 
+JNIEXPORT void JNICALL Java_org_wysaid_nativePort_CGEImageHandler_nativeSetFilterWithAddress
+  (JNIEnv *, jobject, jlong, jlong);
+
 JNIEXPORT void JNICALL Java_org_wysaid_nativePort_CGEImageHandler_nativeSetFilterIntensity
   (JNIEnv *, jobject, jlong, jfloat, jboolean);