Merge branch 'dev/android' into dev/3.3.1

Author: Xia Ning

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/ARCore.java

@@ -1,5 +1,6 @@
 package io.agora.api.example.examples.advanced;
 
+import android.annotation.TargetApi;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.opengl.GLES20;
@@ -747,12 +748,18 @@ public void onDrawFrame(GL10 gl10) {
                 mVirtualObject.draw(viewmtx, projmtx, lightIntensity);
                 mVirtualObjectShadow.draw(viewmtx, projmtx, lightIntensity);
             }
-
-            sendARViewMessage();
+            sendmessage();
 
         } catch (Throwable t) {
             // Avoid crashing the application due to unhandled exceptions.
             Log.e(TAG, "Exception on the OpenGL thread", t);
         }
     }
+
+    @TargetApi(24)
+    private void sendmessage(){
+        sendARViewMessage();
+    }
+
+
 }

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/SendDataStream.java

@@ -470,7 +470,7 @@ public void onStreamMessage(int uid, int streamId, byte[] data) {
             handler.post(new Runnable() {
                 @Override
                 public void run() {
-                    Toast.makeText(getContext(), String.format(getString(R.string.received), string), 300).show();
+                    Toast.makeText(getContext(), String.format(getString(R.string.received), string), Toast.LENGTH_LONG).show();
                 }
             });
             Log.i(TAG, "onStreamMessage:" + data);

Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/VideoMetadata.java

@@ -302,7 +302,7 @@ public byte[] onReadyToSendMetadata(long timeStampMs)
             handler.post(new Runnable() {
                 @Override
                 public void run() {
-                    Toast.makeText(getContext(), String.format(getString(R.string.sent), data), 300).show();
+                    Toast.makeText(getContext(), String.format(getString(R.string.sent), data), Toast.LENGTH_LONG).show();
                 }
             });
             Log.i(TAG, String.format("Metadata sent successfully! The content is %s", data));
@@ -320,7 +320,7 @@ public void onMetadataReceived(byte[] buffer, int uid, long timeStampMs)
             handler.post(new Runnable() {
                 @Override
                 public void run() {
-                    Toast.makeText(getContext(), String.format(getString(R.string.received), data), 300).show();
+                    Toast.makeText(getContext(), String.format(getString(R.string.received), data), Toast.LENGTH_LONG).show();
                 }
             });
             Log.i(TAG, "onMetadataReceived:" + data);

Android/APIExample/app/src/main/res/values/string_configs.xml

@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-<!--    <string name="agora_app_id" translatable="false">YOUR APP ID</string>-->
-<!--    <string name="agora_access_token" translatable="false">YOUR ACCESS TOKEN</string>-->
     <string name="agora_app_id" translatable="false">YOUR APP ID</string>
     <string name="agora_access_token" translatable="false">YOUR ACCESS TOKEN</string>
 </resources>

Android/APIExample/gradlew

@@ -18,11 +18,11 @@
 import io.agora.api.component.gles.ProgramTextureOES;
 import io.agora.api.component.gles.core.EglCore;
 import io.agora.api.component.gles.core.GlUtil;
+import io.agora.rtc.gl.TextureTransformer;
 import io.agora.rtc.mediaio.IVideoFrameConsumer;
 import io.agora.rtc.mediaio.IVideoSource;
 import io.agora.rtc.mediaio.MediaIO;
 
-import static android.media.MediaRecorder.VideoSource.CAMERA;
 import static io.agora.api.component.Constant.ENGINE;
 import static io.agora.api.component.Constant.TEXTUREVIEW;
 import static io.agora.rtc.mediaio.MediaIO.BufferType.TEXTURE;
@@ -67,6 +67,8 @@ public class ExternalVideoInputManager implements IVideoSource {
     private volatile IVideoFrameConsumer mConsumer;
 
     private Context context;
+    private TextureTransformer textureTransformer;
+    private static final int MAX_TEXTURE_COPY = 1;
 
     public ExternalVideoInputManager(Context context) {
         this.context = context;
@@ -85,6 +87,7 @@ boolean setExternalVideoInput(int type, Intent intent) {
             return false;
         }
 
+        type = TYPE_SCREEN_SHARE;
         IExternalVideoInput input;
         switch (type) {
             case TYPE_LOCAL_VIDEO:
@@ -221,6 +224,7 @@ private void prepare() {
             mThreadContext.eglCore = mEglCore;
             mThreadContext.context = mEglCore.getEGLContext();
             mThreadContext.program = new ProgramTextureOES();
+            textureTransformer = new TextureTransformer(MAX_TEXTURE_COPY);
             /**Customizes the video source.
              * Call this method to add an external video source to the SDK.*/
             ENGINE.setVideoSource(ExternalVideoInputManager.this);
@@ -231,6 +235,7 @@ private void release() {
                 return;
             }
             /**release external video source*/
+            textureTransformer.release();
             ENGINE.setVideoSource(null);
             mSurface.release();
             mEglCore.makeNothingCurrent();
@@ -322,6 +327,7 @@ public void run() {
                      * @param rotation Clockwise rotating angle (0, 90, 180, and 270 degrees) of the video frame
                      * @param timestamp Timestamp of the video frame. For each video frame, you need to set a timestamp
                      * @param matrix Matrix of the texture. The float value is between 0 and 1, such as 0.1, 0.2, and so on*/
+                    textureTransformer.copy(mTextureId, TEXTURE_OES.intValue(), mVideoWidth, mVideoHeight);
                     mConsumer.consumeTextureFrame(mTextureId,
                             TEXTURE_OES.intValue(),
                             mVideoWidth, mVideoHeight, 0,

Android/APIExample/lib-switch-external-video/src/main/java/io/agora/advancedvideo/externvideosource/ExternalVideoInputManager.java

@@ -1,5 +1,6 @@
 package io.agora.advancedvideo.externvideosource.localvideo;
 
+import android.annotation.TargetApi;
 import android.graphics.SurfaceTexture;
 import android.media.MediaCodec;
 import android.media.MediaExtractor;
@@ -121,6 +122,11 @@ private void setViewPort(int videoW, int videoH, int surfaceW, int surfaceH) {
 
     @Override
     public Size onGetFrameSize() {
+        return getSize();
+    }
+
+    @TargetApi(21)
+    private Size getSize(){
         return new Size(mVideoWidth, mVideoHeight);
     }
 

Android/APIExample/lib-switch-external-video/src/main/java/io/agora/advancedvideo/externvideosource/localvideo/LocalVideoInput.java

@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">ExternVideoSource</string>
+    <string name="app_name" translatable="false">ExternVideoSource</string>
 
     <string name="switch_video_input_btn">Switch Input</string>
 </resources>