[Android]move watermark config to LiveStreaming module.

Author: xgfd3

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

@@ -18,6 +18,7 @@
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.appcompat.widget.SwitchCompat;
 
 import com.yanzhenjie.permission.AndPermission;
 import com.yanzhenjie.permission.runtime.Permission;
@@ -28,6 +29,7 @@
 import io.agora.api.example.R;
 import io.agora.api.example.annotation.Example;
 import io.agora.api.example.common.BaseFragment;
+import io.agora.api.example.common.Constant;
 import io.agora.api.example.common.widget.VideoReportLayout;
 import io.agora.api.example.utils.CommonUtil;
 import io.agora.api.example.utils.TokenUtils;
@@ -39,6 +41,7 @@
 import io.agora.rtc2.RtcEngineConfig;
 import io.agora.rtc2.video.VideoCanvas;
 import io.agora.rtc2.video.VideoEncoderConfiguration;
+import io.agora.rtc2.video.WatermarkOptions;
 
 /**
  * This demo demonstrates how to make a one-to-one video call
@@ -67,6 +70,7 @@ public class LiveStreaming extends BaseFragment implements View.OnClickListener
     private boolean isHost = false;
     private boolean isLowLatency = false;
     private boolean isLocalVideoForeground = true;
+    private SwitchCompat watermarkSwitch;
 
     @Nullable
     @Override
@@ -90,6 +94,24 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         foreGroundVideo = view.findViewById(R.id.background_video);
         backGroundVideo = view.findViewById(R.id.foreground_video);
         view.findViewById(R.id.btn_take_shot).setOnClickListener(this);
+        watermarkSwitch = view.findViewById(R.id.switch_watermark);
+        watermarkSwitch.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            if (isChecked) {
+                engine.enableVideo();
+                WatermarkOptions watermarkOptions = new WatermarkOptions();
+                int size = ((MainApplication) getActivity().getApplication()).getGlobalSettings().getVideoEncodingDimensionObject().width / 6;
+                int height = ((MainApplication) getActivity().getApplication()).getGlobalSettings().getVideoEncodingDimensionObject().height;
+                watermarkOptions.positionInPortraitMode = new WatermarkOptions.Rectangle(10, height / 2, size, size);
+                watermarkOptions.positionInLandscapeMode = new WatermarkOptions.Rectangle(10, height / 2, size, size);
+                watermarkOptions.visibleInPreview = true;
+                int ret = engine.addVideoWatermark(Constant.WATER_MARK_FILE_PATH, watermarkOptions);
+                if (ret != Constants.ERR_OK) {
+                    Log.e(TAG, "addVideoWatermark error=" + ret + ", msg=" + RtcEngine.getErrorDescription(ret));
+                }
+            } else {
+                engine.clearVideoWatermarks();
+            }
+        });
     }
 
     @Override
@@ -179,6 +201,9 @@ public void onClick(View v) {
                 engine.stopPreview();
                 engine.leaveChannel();
                 join.setText(getString(R.string.join));
+                watermarkSwitch.setEnabled(false);
+                publish.setEnabled(false);
+                latency.setEnabled(false);
                 remoteUid = 0;
             }
         } else if (v.getId() == R.id.btn_publish) {
@@ -487,10 +512,12 @@ public void run() {
          */
         @Override
         public void onClientRoleChanged(int oldRole, int newRole) {
-            Log.i(TAG, String.format("client role changed from state %d to %d", oldRole, newRole));            handler.post(new Runnable() {
+            Log.i(TAG, String.format("client role changed from state %d to %d", oldRole, newRole));
+            handler.post(new Runnable() {
                 @Override
                 public void run() {
                     publish.setEnabled(true);
+                    watermarkSwitch.setEnabled(newRole == Constants.CLIENT_ROLE_BROADCASTER);
                 }
             });
         }

Android/APIExample/app/src/main/java/io/agora/api/example/examples/basic/JoinChannelVideo.java

@@ -33,7 +33,6 @@
 import io.agora.api.example.R;
 import io.agora.api.example.annotation.Example;
 import io.agora.api.example.common.BaseFragment;
-import io.agora.api.example.common.Constant;
 import io.agora.api.example.common.widget.VideoReportLayout;
 import io.agora.api.example.utils.CommonUtil;
 import io.agora.api.example.utils.TokenUtils;
@@ -44,7 +43,6 @@
 import io.agora.rtc2.RtcEngineConfig;
 import io.agora.rtc2.video.VideoCanvas;
 import io.agora.rtc2.video.VideoEncoderConfiguration;
-import io.agora.rtc2.video.WatermarkOptions;
 
 /**This demo demonstrates how to make a one-to-one video call*/
 @Example(
@@ -255,16 +253,6 @@ private void joinChannel(String channelId)
                 VideoEncoderConfiguration.ORIENTATION_MODE.valueOf(((MainApplication)getActivity().getApplication()).getGlobalSettings().getVideoEncodingOrientation())
         ));
 
-        // Setup watermark options
-        WatermarkOptions watermarkOptions = new WatermarkOptions();
-        int size = ((MainApplication)getActivity().getApplication()).getGlobalSettings().getVideoEncodingDimensionObject().width / 6;
-        int height = ((MainApplication)getActivity().getApplication()).getGlobalSettings().getVideoEncodingDimensionObject().height;
-        watermarkOptions.positionInPortraitMode = new WatermarkOptions.Rectangle(10,height/2, size, size);
-        watermarkOptions.positionInLandscapeMode = new WatermarkOptions.Rectangle(10,height/2, size, size);
-        watermarkOptions.visibleInPreview = false;
-        engine.addVideoWatermark(Constant.WATER_MARK_FILE_PATH, watermarkOptions);
-
-
         engine.startPreview();
 
         ChannelMediaOptions option = new ChannelMediaOptions();

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

@@ -20,6 +20,20 @@
         android:layout_alignParentTop="true"
         android:layout_alignParentEnd="true" />
 
+    <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/switch_watermark"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_above="@+id/btn_take_shot"
+        android:layout_alignParentEnd="true"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        android:background="#dddddd"
+        android:paddingHorizontal="16dp"
+        android:paddingVertical="8dp"
+        android:enabled="false"
+        android:text="@string/watermark"/>
+
     <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/btn_take_shot"
         android:layout_width="wrap_content"
@@ -28,7 +42,7 @@
         android:layout_alignParentEnd="true"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="16dp"
-        android:text="@string/remote_screenshot"/>
+        android:text="@string/remote_screenshot" />
 
     <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/btn_latency"

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

@@ -235,4 +235,5 @@
     <string name="virtual_background_color">颜色</string>
     <string name="virtual_background_blur">毛玻璃</string>
     <string name="area">区域</string>
+    <string name="watermark">水印</string>
 </resources>

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

@@ -244,4 +244,5 @@
     <string name="virtual_background_color">Color</string>
     <string name="virtual_background_blur">Blur</string>
     <string name="area">Area</string>
+    <string name="watermark">Watermark</string>
 </resources>