update library

Author: ChillingVan

README.md

@@ -27,7 +27,7 @@ allprojects {
 
 // module build.gradle
 dependencies {
-    compile 'com.github.ChillingVan:AndroidInstantVideo:v1.0.2.0'
+    compile 'com.github.ChillingVan:AndroidInstantVideo:v1.0.2.1'
 }
 ```
 
@@ -169,11 +169,3 @@ public class TestCameraPublisherActivity extends AppCompatActivity {
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-    
-    
-### 打赏
-感谢您的支持！！
-支付宝
-![alipay](http://upload-images.jianshu.io/upload_images/3587192-1cc20071ce4a042a.jpg?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
-微信
-![wechat pay](http://upload-images.jianshu.io/upload_images/3587192-3289f8237d98b2c4.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)

README_EN.md

@@ -29,7 +29,7 @@ allprojects {
 
 // module build.gradle
 dependencies {
-    compile 'com.github.ChillingVan:AndroidInstantVideo:v1.0.2.0'
+    compile 'com.github.ChillingVan:AndroidInstantVideo:v1.0.2.1'
 }
 ```
 
@@ -166,11 +166,3 @@ Please add sample code to sample module. Add your license comment.
     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
     See the License for the specific language governing permissions and
     limitations under the License.
-    
-    
-### Donate
-Thanks for your support !!!
-alipay
-![alipay](http://upload-images.jianshu.io/upload_images/3587192-1cc20071ce4a042a.jpg?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)
-wechat pay
-![wechat pay](http://upload-images.jianshu.io/upload_images/3587192-3289f8237d98b2c4.png?imageMogr2/auto-orient/strip%7CimageView2/2/w/1240)

app/build.gradle

@@ -22,7 +22,7 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "27.0.2"
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.chillingvan.instantvideo.sample"
         minSdkVersion 18
@@ -45,13 +45,13 @@ android {
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile project(':applibs')
-    compile 'com.github.tajchert:nammu:1.2.0'
-    compile 'com.android.support:appcompat-v7:27.0.2'
-    compile 'com.android.support.constraint:constraint-layout:1.0.2'
-    testCompile 'junit:junit:4.12'
+    api project(':applibs')
+    implementation 'com.github.tajchert:nammu:1.2.0'
+    implementation 'com.android.support:appcompat-v7:27.0.2'
+    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
+    testImplementation 'junit:junit:4.12'
 }

app/src/main/java/com/chillingvan/instantvideo/sample/MainActivity.java

@@ -31,7 +31,7 @@
 import android.widget.SimpleAdapter;
 import android.widget.Toast;
 
-import com.chillingvan.canvasgl.Loggers;
+import com.chillingvan.canvasgl.util.Loggers;
 
 import java.text.Collator;
 import java.util.ArrayList;

app/src/main/java/com/chillingvan/instantvideo/sample/test/audio/TestAudioEncoder.java

@@ -23,7 +23,7 @@
 import android.content.Context;
 import android.media.MediaCodec;
 
-import com.chillingvan.canvasgl.Loggers;
+import com.chillingvan.canvasgl.util.Loggers;
 import com.chillingvan.lib.encoder.MediaCodecInputStream;
 import com.chillingvan.lib.encoder.audio.AACEncoder;
 import com.chillingvan.lib.publisher.StreamPublisher;

app/src/main/java/com/chillingvan/instantvideo/sample/test/camera/CameraPreviewTextureView.java

@@ -1,11 +1,17 @@
 package com.chillingvan.instantvideo.sample.test.camera;
 
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.Paint;
+import android.graphics.PorterDuff;
 import android.graphics.SurfaceTexture;
 import android.support.annotation.Nullable;
 import android.util.AttributeSet;
 
 import com.chillingvan.canvasgl.ICanvasGL;
+import com.chillingvan.canvasgl.androidCanvas.IAndroidCanvasHelper;
 import com.chillingvan.canvasgl.glcanvas.BasicTexture;
 import com.chillingvan.canvasgl.glcanvas.RawTexture;
 import com.chillingvan.canvasgl.glview.texture.GLSurfaceTextureProducerView;
@@ -18,6 +24,8 @@
 public class CameraPreviewTextureView extends GLSurfaceTextureProducerView {
 
     private H264Encoder.OnDrawListener onDrawListener;
+    private IAndroidCanvasHelper drawTextHelper = IAndroidCanvasHelper.Factory.createAndroidCanvasHelper(IAndroidCanvasHelper.MODE.MODE_ASYNC);
+    private Paint textPaint;
 
     public CameraPreviewTextureView(Context context) {
         super(context);
@@ -31,10 +39,32 @@ public CameraPreviewTextureView(Context context, AttributeSet attrs, int defStyl
         super(context, attrs, defStyleAttr);
     }
 
+    @Override
+    public void onSurfaceChanged(int width, int height) {
+        super.onSurfaceChanged(width, height);
+        drawTextHelper.init(width, height);
+        textPaint = new Paint();
+        textPaint.setColor(Color.WHITE);
+        textPaint.setTextSize(dp2px(15));
+    }
+
+    private float dp2px(int dp) {
+        return dp * getContext().getResources().getDisplayMetrics().density;
+    }
 
     @Override
-    protected void onGLDraw(ICanvasGL canvas, SurfaceTexture producedSurfaceTexture, RawTexture producedRawTexture, @Nullable SurfaceTexture sharedSurfaceTexture, @Nullable BasicTexture sharedTexture) {
+    protected void onGLDraw(final ICanvasGL canvas, SurfaceTexture producedSurfaceTexture, RawTexture producedRawTexture, @Nullable SurfaceTexture sharedSurfaceTexture, @Nullable BasicTexture sharedTexture) {
         onDrawListener.onGLDraw(canvas, producedSurfaceTexture, producedRawTexture, sharedSurfaceTexture, sharedTexture);
+        drawTextHelper.draw(new IAndroidCanvasHelper.CanvasPainter() {
+            @Override
+            public void draw(Canvas androidCanvas) {
+                androidCanvas.drawColor(Color.TRANSPARENT, PorterDuff.Mode.CLEAR);
+                androidCanvas.drawText("白色, White", 100, 100, textPaint);
+            }
+        });
+        Bitmap outputBitmap = drawTextHelper.getOutputBitmap();
+        canvas.invalidateTextureContent(outputBitmap);
+        canvas.drawBitmap(outputBitmap, 0, 0);
     }
 
     public void setOnDrawListener(H264Encoder.OnDrawListener l) {

app/src/main/java/com/chillingvan/instantvideo/sample/test/publisher/TestCameraPublisherActivity.java

@@ -33,12 +33,12 @@
 import android.widget.TextView;
 
 import com.chillingvan.canvasgl.ICanvasGL;
-import com.chillingvan.canvasgl.Loggers;
 import com.chillingvan.canvasgl.glcanvas.BasicTexture;
 import com.chillingvan.canvasgl.glcanvas.RawTexture;
 import com.chillingvan.canvasgl.textureFilter.BasicTextureFilter;
 import com.chillingvan.canvasgl.textureFilter.HueFilter;
 import com.chillingvan.canvasgl.textureFilter.TextureFilter;
+import com.chillingvan.canvasgl.util.Loggers;
 import com.chillingvan.instantvideo.sample.R;
 import com.chillingvan.instantvideo.sample.test.camera.CameraPreviewTextureView;
 import com.chillingvan.lib.camera.InstantVideoCamera;

app/src/main/java/com/chillingvan/instantvideo/sample/test/publisher/TestMp4MuxerActivity.java

@@ -32,12 +32,12 @@
 import android.widget.TextView;
 
 import com.chillingvan.canvasgl.ICanvasGL;
-import com.chillingvan.canvasgl.Loggers;
 import com.chillingvan.canvasgl.glcanvas.BasicTexture;
 import com.chillingvan.canvasgl.glcanvas.RawTexture;
 import com.chillingvan.canvasgl.textureFilter.BasicTextureFilter;
 import com.chillingvan.canvasgl.textureFilter.HueFilter;
 import com.chillingvan.canvasgl.textureFilter.TextureFilter;
+import com.chillingvan.canvasgl.util.Loggers;
 import com.chillingvan.instantvideo.sample.R;
 import com.chillingvan.instantvideo.sample.test.camera.CameraPreviewTextureView;
 import com.chillingvan.lib.camera.InstantVideoCamera;

app/src/main/java/com/chillingvan/instantvideo/sample/test/video/TestVideoEncoder.java

@@ -28,10 +28,10 @@
 import android.util.Log;
 
 import com.chillingvan.canvasgl.ICanvasGL;
-import com.chillingvan.canvasgl.Loggers;
 import com.chillingvan.canvasgl.glcanvas.BasicTexture;
 import com.chillingvan.canvasgl.glcanvas.GLPaint;
 import com.chillingvan.canvasgl.glview.texture.gles.EglContextWrapper;
+import com.chillingvan.canvasgl.util.Loggers;
 import com.chillingvan.lib.encoder.MediaCodecInputStream;
 import com.chillingvan.lib.encoder.video.H264Encoder;
 import com.chillingvan.lib.publisher.StreamPublisher;

applibs/build.gradle

@@ -24,13 +24,13 @@ group='com.github.ChillingVan'
 
 android {
     compileSdkVersion 27
-    buildToolsVersion "26.0.2"
+    buildToolsVersion '27.0.3'
 
     defaultConfig {
         minSdkVersion 18
         targetSdkVersion 27
-        versionCode 100020
-        versionName "1.0.2.0"
+        versionCode 100021
+        versionName "1.0.2.1"
 
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
@@ -44,15 +44,15 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.github.ChillingVan:android-openGL-canvas:v1.2.2.1'
-    androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
+    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    api 'com.github.ChillingVan:android-openGL-canvas:v1.3.0.0'
+    androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    testCompile 'junit:junit:4.12'
-    compile 'net.butterflytv.utils:rtmp-client:0.2.6'
+    testImplementation 'junit:junit:4.12'
+    implementation 'net.butterflytv.utils:rtmp-client:0.2.6'
 
-    compile 'com.android.support:support-annotations:27.0.2'
+    implementation 'com.android.support:support-annotations:27.0.2'
 }