From 7aa8a739b22381fb8c2abf48a8e3802e1b047d34 Mon Sep 17 00:00:00 2001
From: xucz <xgfd3@users.noreply.github.com>
Date: Thu, 13 Jul 2023 15:34:36 +0800
Subject: [PATCH] [Android]add 4K 60fps h265.

---
 .../example/examples/advanced/LiveStreaming.java    | 13 ++++++++++++-
 .../res/layout/fragment_live_streaming_setting.xml  |  7 +++++++
 .../APIExample/app/src/main/res/values/arrays.xml   |  5 +++++
 3 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/LiveStreaming.java b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/LiveStreaming.java
index 98647fc1e..ff2ba1837 100644
--- a/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/LiveStreaming.java
+++ b/Android/APIExample/app/src/main/java/io/agora/api/example/examples/advanced/LiveStreaming.java
@@ -130,6 +130,12 @@ public void onNothingSelected(AdapterView<?> parent) {
 
             }
         });
+        mSettingBinding.switchH265.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            // {"engine.video.enable_hw_encoder":"true"}  ——true 采用硬编； false 采用软编
+            engine.setParameters("{\"engine.video.enable_hw_encoder\":\"true\"}");
+            // {"engine.video.codec_type":"3"}    —— 2 表示采用H264编码; 3表示H265编码
+            engine.setParameters("{\"engine.video.codec_type\":\"" + (isChecked ? "3" : "2") + "\"}");
+        });
         mSettingDialog = new BottomSheetDialog(requireContext());
         mSettingDialog.setContentView(mSettingBinding.getRoot());
     }
@@ -484,7 +490,12 @@ public void run() {
                     mRootBinding.btnJoin.setEnabled(true);
                     mRootBinding.btnJoin.setText(getString(R.string.leave));
                     mRootBinding.btnPublish.setEnabled(true);
-                    foreGroundVideo.setReportUid(uid);
+                    if(isLocalVideoForeground){
+                        foreGroundVideo.setReportUid(uid);
+                    }else{
+                        backGroundVideo.setReportUid(uid);
+                    }
+
                 }
             });
         }
diff --git a/Android/APIExample/app/src/main/res/layout/fragment_live_streaming_setting.xml b/Android/APIExample/app/src/main/res/layout/fragment_live_streaming_setting.xml
index d5bae5380..dba533f53 100644
--- a/Android/APIExample/app/src/main/res/layout/fragment_live_streaming_setting.xml
+++ b/Android/APIExample/app/src/main/res/layout/fragment_live_streaming_setting.xml
@@ -100,6 +100,13 @@
         android:text="@string/b_frame" />
 
 
+    <androidx.appcompat.widget.SwitchCompat
+        android:id="@+id/switch_h265"
+        android:layout_width="match_parent"
+        android:layout_height="50dp"
+        android:paddingHorizontal="16dp"
+        android:text="H265" />
+
     <View
         android:layout_width="match_parent"
         android:layout_height="1dp"
diff --git a/Android/APIExample/app/src/main/res/values/arrays.xml b/Android/APIExample/app/src/main/res/values/arrays.xml
index 8b54eed69..f0c09a7e4 100644
--- a/Android/APIExample/app/src/main/res/values/arrays.xml
+++ b/Android/APIExample/app/src/main/res/values/arrays.xml
@@ -202,6 +202,10 @@
         <item>VD_960x540</item>
         <item>VD_960x720</item>
         <item>VD_1280x720</item>
+        <item>VD_1920x1080</item>
+        <item>VD_1920x1080</item>
+        <item>VD_2540x1440</item>
+        <item>VD_3840x2160</item>
     </string-array>
     <string-array name="orientations">
         <item>ORIENTATION_MODE_ADAPTIVE</item>
@@ -215,6 +219,7 @@
         <item>FRAME_RATE_FPS_15</item>
         <item>FRAME_RATE_FPS_24</item>
         <item>FRAME_RATE_FPS_30</item>
+        <item>FRAME_RATE_FPS_60</item>
     </string-array>
 
     <string-array name="beauty">