Produced Texture recreate issue fixed;version 1.2.2.3

Author: ChillingVan

README-en.md

@@ -43,7 +43,7 @@ allprojects {
 
 // module build.gradle
 dependencies {
-    compile 'com.github.ChillingVan:android-openGL-canvas:v1.2.2.2'
+    compile 'com.github.ChillingVan:android-openGL-canvas:v1.2.2.3'
 }
 ```
 
@@ -119,8 +119,7 @@ Use this sample and the stream publisher sample of [AndroidInstantVideo](https:/
 * Remember to call onResume and onPause in the Activity lifecycle when using GLContinuousView and GLContinuousTextureView.
 
 ## Latest Update
-* Fix issue that when close screen, the TextureCamera will stuck.
-* Add FileLogger
+* Fix issue that recreate for producedTexture of GLProducedTextureView.
 
 ## License
     Copyright 2016 ChillingVan.

README.md

@@ -48,7 +48,7 @@ allprojects {
 
 // module build.gradle
 dependencies {
-    compile 'com.github.ChillingVan:android-openGL-canvas:v1.2.2.2'
+    compile 'com.github.ChillingVan:android-openGL-canvas:v1.2.2.3'
 }
 ```
 
@@ -129,8 +129,7 @@ public class MyGLView extends GLView {
 
 
 ## 最近更新
-* 修复熄屏再亮屏，TextureCamera 卡住的问题
-* 添加FileLogger，支持文件log。
+* 修复在GLProducedTextureView尺寸改变时重复创建producedTexture
 
 ## License
     Copyright 2016 ChillingVan.

canvasgl/build.gradle

@@ -28,8 +28,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 27
-        versionCode 102022
-        versionName "1.2.2.2"
+        versionCode 102023
+        versionName "1.2.2.3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/BaseGLTextureView.java

@@ -266,7 +266,7 @@ public void onSurfaceTextureSizeChanged(SurfaceTexture surface, int width, int h
     }
 
     /**
-     * This will be called when windows detached. Activity onPause will cause window detached.
+     * This will be called when windows detached. Activity onStop will cause window detached.
      */
     @Override
     public boolean onSurfaceTextureDestroyed(SurfaceTexture surface) {

canvasgl/src/main/java/com/chillingvan/canvasgl/glview/texture/GLSurfaceTextureProducerView.java

@@ -96,19 +96,23 @@ public void onSurfaceTextureAvailable(SurfaceTexture surface, int width, int hei
     public void onSurfaceChanged(int width, int height) {
         super.onSurfaceChanged(width, height);
         Loggers.d(TAG, "onSurfaceChanged: ");
-        producedRawTexture = new RawTexture(width, height, false, producedTextureTarget);
-        if (!producedRawTexture.isLoaded()) {
-            producedRawTexture.prepare(mCanvas.getGlCanvas());
-        }
-        producedSurfaceTexture = new SurfaceTexture(producedRawTexture.getId());
-        post(new Runnable() {
-            @Override
-            public void run() {
-                if (onSurfaceTextureSet != null) {
-                    onSurfaceTextureSet.onSet(producedSurfaceTexture, producedRawTexture);
-                }
+        if (producedRawTexture == null) {
+            producedRawTexture = new RawTexture(width, height, false, producedTextureTarget);
+            if (!producedRawTexture.isLoaded()) {
+                producedRawTexture.prepare(mCanvas.getGlCanvas());
             }
-        });
+            producedSurfaceTexture = new SurfaceTexture(producedRawTexture.getId());
+            post(new Runnable() {
+                @Override
+                public void run() {
+                    if (onSurfaceTextureSet != null) {
+                        onSurfaceTextureSet.onSet(producedSurfaceTexture, producedRawTexture);
+                    }
+                }
+            });
+        } else {
+            producedRawTexture.setSize(width, height);
+        }
     }
 
     @Override
@@ -136,14 +140,14 @@ protected void surfaceDestroyed() {
     }
 
     private void recycleProduceTexture() {
-        if (producedRawTexture != null) {
+        if (producedRawTexture != null && !producedRawTexture.isRecycled()) {
             producedRawTexture.recycle();
-            producedRawTexture = null;
         }
-        if (producedSurfaceTexture != null) {
+        producedRawTexture = null;
+        if (producedSurfaceTexture != null && !producedSurfaceTexture.isReleased()) {
             producedSurfaceTexture.release();
-            producedSurfaceTexture = null;
         }
+        producedSurfaceTexture = null;
     }
 
 }

canvasglsample/src/main/java/com/chillingvan/canvasglsample/textureView/TextureCameraActivity.java

@@ -27,6 +27,7 @@
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 
 import com.chillingvan.canvasgl.util.Loggers;
@@ -161,4 +162,30 @@ protected void onPause() {
         cameraTextureView.onPause();
         previewConsumerTextureView.onPause();
     }
+
+    public void onClickChangeSize(View view) {
+        if (cameraTextureView.getScaleY() < 1) {
+            cameraTextureView.setScaleY(1.5f);
+            previewConsumerTextureView.setScaleY(1.5f);
+        } else {
+            cameraTextureView.setScaleY(0.7f);
+            previewConsumerTextureView.setScaleY(0.7f);
+        }
+    }
+
+    public void onClickChangeLayoutSize(View view) {
+        ViewGroup.LayoutParams layoutParams = cameraTextureView.getLayoutParams();
+        ViewGroup.LayoutParams consumerLayoutParams = previewConsumerTextureView.getLayoutParams();
+        if (layoutParams.height < 500) {
+            layoutParams.height += 50;
+            cameraTextureView.setLayoutParams(layoutParams);
+            consumerLayoutParams.height += 50;
+            previewConsumerTextureView.setLayoutParams(consumerLayoutParams);
+        } else {
+            layoutParams.height -= 50;
+            cameraTextureView.setLayoutParams(layoutParams);
+            consumerLayoutParams.height -= 50;
+            previewConsumerTextureView.setLayoutParams(consumerLayoutParams);
+        }
+    }
 }

canvasglsample/src/main/res/layout/activity_texture_canvas.xml

@@ -68,6 +68,21 @@
 
         </LinearLayout>
 
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_margin="5dp"
+            android:text="Change Scale"
+            android:onClick="onClickChangeSize"
+            />
+
+        <Button
+            android:layout_width="match_parent"
+            android:layout_height="40dp"
+            android:layout_margin="5dp"
+            android:text="Change Layout"
+            android:onClick="onClickChangeLayoutSize"
+            />
 
 
     </LinearLayout>