Merge branch 'staging' of ssh://git.agoralab.co/aduc/api-examples into staging

Author: xianing

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

@@ -50,7 +50,7 @@ public class SuperResolution extends BaseFragment implements View.OnClickListene
     private static final String TAG = SuperResolution.class.getSimpleName();
 
     private FrameLayout fl_local, fl_remote;
-    private Button join, btnSuperResolution;
+    private Button join, btnSuperResolution, switchCamera;
     private EditText et_channel;
     private RtcEngine engine;
     private int myUid;
@@ -73,9 +73,12 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         join = view.findViewById(R.id.btn_join);
         btnSuperResolution = view.findViewById(R.id.btn_super_resolution);
         btnSuperResolution.setEnabled(false);
+        switchCamera = view.findViewById(R.id.btn_switch);
+        switchCamera.setEnabled(false);
         et_channel = view.findViewById(R.id.et_channel);
         view.findViewById(R.id.btn_join).setOnClickListener(this);
         view.findViewById(R.id.btn_super_resolution).setOnClickListener(this);
+        view.findViewById(R.id.btn_switch).setOnClickListener(this);
         fl_local = view.findViewById(R.id.fl_local);
         fl_remote = view.findViewById(R.id.fl_remote);
     }
@@ -172,7 +175,13 @@ public void onClick(View v)
             }
         }
         else if(v.getId() == R.id.btn_super_resolution){
-            engine.enableRemoteSuperResolution(remoteUid, !enableSuperResolution);
+            int ret = engine.enableRemoteSuperResolution(remoteUid, !enableSuperResolution);
+            if(ret!=0){
+                Log.w(TAG, String.format("onWarning code %d ", ret));
+            }
+        }
+        else if(v.getId() == R.id.btn_switch){
+            engine.switchCamera();
         }
     }
 
@@ -259,6 +268,7 @@ private void joinChannel(String channelId)
         public void onWarning(int warn)
         {
             Log.w(TAG, String.format("onWarning code %d message %s", warn, RtcEngine.getErrorDescription(warn)));
+            showAlert(String.format("onWarning code %d message %s", warn, RtcEngine.getErrorDescription(warn)));
         }
 
         /**Reports an error during SDK runtime.
@@ -421,6 +431,7 @@ public void onUserJoined(int uid, int elapsed)
                 engine.setupRemoteVideo(new VideoCanvas(surfaceView, RENDER_MODE_HIDDEN, uid));
                 remoteUid = uid;
                 btnSuperResolution.setEnabled(true);
+                switchCamera.setEnabled(true);
             });
         }
 
@@ -447,6 +458,7 @@ public void run() {
                      remove the SurfaceView from its parent*/
                     engine.setupRemoteVideo(new VideoCanvas(null, RENDER_MODE_HIDDEN, uid));
                     btnSuperResolution.setEnabled(false);
+                    switchCamera.setEnabled(false);
                 }
             });
         }

Android/APIExample/app/src/main/res/layout/fragment_super_resolution.xml

@@ -45,6 +45,22 @@
             android:enabled="false"/>
     </LinearLayout>
 
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="40dp"
+        android:layout_marginBottom="102dp"
+        android:layout_marginEnd="16dp"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentBottom="true">
+        <androidx.appcompat.widget.AppCompatButton
+            android:id="@+id/btn_switch"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/switch_camera"
+            android:enabled="false"/>
+    </LinearLayout>
+
     <LinearLayout
         android:id="@+id/ll_join"
         android:layout_width="match_parent"

Android/APIExample/app/src/main/res/values-zh/strings.xml

@@ -181,4 +181,5 @@
     <string name="skin_protect">肤色保护</string>
     <string name="item_ScreenShare">屏幕共享</string>
     <string name="virtual_background">虚拟背景</string>
+    <string name="switch_camera">摄像头切换</string>
 </resources>

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

@@ -185,4 +185,5 @@
     <string name="skin_protect">Skin Protect</string>
     <string name="item_ScreenShare">Screen Share</string>
     <string name="virtual_background">Virtual Background</string>
+    <string name="switch_camera">switch camera</string>
 </resources>

Android/APIExample/lib-player-helper/src/main/cpp/include/AgoraBase.h

@@ -398,7 +398,8 @@ enum ERROR_CODE_TYPE {
   /** 117: The data stream transmission timed out.
    */
   ERR_STREAM_MESSAGE_TIMEOUT = 117,
-  /** 119: Switching roles fail. Please try to rejoin the channel.
+  /** **DEPRECATED** 119: Deprecated as of v3.6.1. Use CLIENT_ROLE_CHANGE_FAILED_REASON in the \ref agora::rtc::IRtcEngineEventHandler::onClientRoleChangeFailed "onClientRoleChangeFailed" callback instead.
+   * Switching roles fail. Please try to rejoin the channel.
    */
   ERR_SET_CLIENT_ROLE_NOT_AUTHORIZED = 119,
   /** 120: Decryption fails. The user may have used a different encryption password to join the channel. Check your settings or try rejoining the channel.

Android/APIExample/lib-player-helper/src/main/cpp/include/IAgoraMediaEngine.h

@@ -664,6 +664,12 @@ struct ExternalVideoFrame {
     /** 16: The video pixel format is I422.
      */
     VIDEO_PIXEL_I422 = 16,
+    /** 17: The video pixel format is GL_TEXTURE_2D.
+     */
+    VIDEO_TEXTURE_2D = 17,
+    /** 18: The video pixel format is GL_TEXTURE_OES.
+     */
+    VIDEO_TEXTURE_OES = 18,
   };
 
   /** The buffer type. See #VIDEO_BUFFER_TYPE

Android/APIExample/lib-player-helper/src/main/cpp/include/IAgoraRtcChannel.h

@@ -80,9 +80,9 @@ class IChannelEventHandler {
   }
   /** Occurs when the user role switches in the interactive live streaming. For example, from a host to an audience or vice versa.
 
-   This callback notifies the application of a user role switch when the application calls the \ref IChannel::setClientRole "setClientRole" method.
+   This callback notifies the application of a user role switch when the application calls the \ref IChannel::setClientRole "setClientRole" method, and successfully changed role.
 
-   The SDK triggers this callback when the local user switches the user role by calling the \ref IChannel::setClientRole "setClientRole" method after joining the channel.
+   The SDK triggers this callback when the local user switches the user role by calling the \ref IChannel::setClientRole "setClientRole" method after joining the channel, and successfully changed role.
 
    @param rtcChannel IChannel
    @param oldRole Role that the user switches from: #CLIENT_ROLE_TYPE.
@@ -93,6 +93,21 @@ class IChannelEventHandler {
     (void)oldRole;
     (void)newRole;
   }
+
+  /** Occurs when the user role switches in the interactive live streaming. For example, from a host to an audience or vice versa.
+
+  This callback notifies the application of a user role switch when the application calls the \ref IChannel::setClientRole "setClientRole" method, and failed to change role.
+
+  The SDK triggers this callback when the local user switches the user role by calling the \ref IChannel::setClientRole "setClientRole" method after joining the channel, and failed to change role.
+   @param reason The reason of changing client role failed. See #CLIENT_ROLE_CHANGE_FAILED_REASON.
+   @param currentRole Current Role that the user holds: #CLIENT_ROLE_TYPE.
+   */
+  virtual void onClientRoleChangeFailed(IChannel* rtcChannel, CLIENT_ROLE_CHANGE_FAILED_REASON reason, CLIENT_ROLE_TYPE currentRole) {
+    (void)rtcChannel;
+    (void)reason;
+    (void)currentRole;
+  }
+
   /** Occurs when a remote user (`COMMUNICATION`)/ host (`LIVE_BROADCASTING`) joins the channel.
 
    - `COMMUNICATION` profile: This callback notifies the application that another user joins the channel. If other users are already in the channel, the SDK also reports to the application on the existing users.
@@ -569,6 +584,21 @@ class IChannelEventHandler {
     (void)state;
     (void)reason;
   }
+
+  /** Occurs when join success after calling \ref IRtcEngine::setLocalAccessPoint "setLocalAccessPoint" or \ref IRtcEngine::setCloudProxy "setCloudProxy"
+  @param rtcChannel IChannel
+  @param uid  User ID of the user joining the channel.
+  @param proxyType type of proxy agora sdk connected, proxyType will be NONE_PROXY_TYPE if not connected to proxy(fallback).
+  @param localProxyIp local proxy ip list. if not join local proxy, it will be "".
+  @param elapsed Time elapsed (ms) from the user calling the \ref IRtcEngine::joinChannel "joinChannel" method until the SDK triggers this callback.
+   */
+  virtual void onProxyConnected(IChannel* rtcChannel, uid_t uid, PROXY_TYPE proxyType, const char* localProxyIp, int elapsed) {
+    (void)rtcChannel;
+    (void)uid;
+    (void)proxyType;
+    (void)localProxyIp;
+    (void)elapsed;
+  }
 };
 
 /** The IChannel class. */
@@ -887,7 +917,7 @@ class IChannel {
    * call this method to switch the user role after joining a channel, the SDK automatically does the following:
    * - Calls \ref IChannel::muteLocalAudioStream "muteLocalAudioStream" and \ref IChannel::muteLocalVideoStream "muteLocalVideoStream" to
    * change the publishing state.
-   * - Triggers \ref IChannelEventHandler::onClientRoleChanged "onClientRoleChanged" on the local client.
+   * - Triggers \ref IChannelEventHandler::onClientRoleChanged "onClientRoleChanged" or \ref IChannelEventHandler::onClientRoleChangeFailed "onClientRoleChangeFailed" on the local client in 5s.
    * - Triggers \ref IChannelEventHandler::onUserJoined "onUserJoined" or \ref IChannelEventHandler::onUserOffline "onUserOffline" (BECOME_AUDIENCE)
    * on the remote client.
    *
@@ -920,7 +950,7 @@ class IChannel {
    * call this method to switch the user role after joining a channel, the SDK automatically does the following:
    * - Calls \ref IChannel::muteLocalAudioStream "muteLocalAudioStream" and \ref IChannel::muteLocalVideoStream "muteLocalVideoStream" to
    * change the publishing state.
-   * - Triggers \ref IChannelEventHandler::onClientRoleChanged "onClientRoleChanged" on the local client.
+   * - Triggers \ref IChannelEventHandler::onClientRoleChanged "onClientRoleChanged" or \ref IChannelEventHandler::onClientRoleChangeFailed "onClientRoleChangeFailed" on the local client in 5s.
    * - Triggers \ref IChannelEventHandler::onUserJoined "onUserJoined" or \ref IChannelEventHandler::onUserOffline "onUserOffline" (BECOME_AUDIENCE)
    * on the remote client.
    *
@@ -1237,6 +1267,21 @@ class IChannel {
    - < 0: Failure.
    */
   virtual int setRemoteVideoStreamType(uid_t userId, REMOTE_VIDEO_STREAM_TYPE streamType) = 0;
+  /** Turn WIFI acceleration on or off.
+
+   @note
+   - This method is called before and after joining a channel.
+   - Users check the WIFI router app for information about acceleration. Therefore, if this interface is invoked, the caller accepts that the caller's name will be displayed to the user in the WIFI router application on behalf of the caller.
+
+   @param enabled
+   - true：Turn WIFI acceleration on.
+   - false：Turn WIFI acceleration off.
+
+   @return
+   - 0: Success.
+   - < 0: Failure.
+   */
+  virtual int enableWirelessAccelerate(bool enabled) = 0;
   /** Sets the default stream type of remote videos.
 
    Under limited network conditions, if the publisher has not disabled the dual-stream mode using