Dev/4.6.2 merge to main

.github/ci/build/modify_podfile.py

@@ -4,7 +4,7 @@ def modfiy(path, sdk_flag):
     with open(path, 'r', encoding='utf-8') as file:
         contents = []
         for num, line in enumerate(file):
-            if "pod 'Agora" in line:
+            if "pod 'Shengwang" in line:
                 if sdk_flag:
                     line = '\t'+"pod 'sdk', :path => '../../sdk.podspec'" + "\n"
             elif "pod 'sdk" in line:

Android/APIExample-Audio/gradle.properties

@@ -23,4 +23,4 @@ android.nonFinalResIds=false
 # read enable simple filter section on README first before set this flag to TRUE
 simpleFilter = false
 
-rtc_sdk_version = 4.6.0
+rtc_sdk_version = 4.6.2

Android/APIExample-Compose/app/src/main/AndroidManifest.xml

@@ -12,6 +12,10 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.BLUETOOTH_CONNECT" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
+    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MICROPHONE" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_MEDIA_PROJECTION" />
 
     <application
         android:allowBackup="true"
@@ -28,19 +32,23 @@
             android:exported="true"
             android:label="@string/app_name"
             android:theme="@style/Theme.APIExampleCompose"
-            android:configChanges="screenSize|screenLayout|orientation|smallestScreenSize">
+            android:supportsPictureInPicture="true"
+            android:screenOrientation="portrait"
+            android:configChanges="keyboardHidden|screenSize|orientation|smallestScreenSize|screenLayout">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
+        <!--
         <activity
             android:name=".samples.PictureInPictureActivity"
             android:supportsPictureInPicture="true"
             android:launchMode="singleTask"
             android:configChanges="screenSize|screenLayout|orientation|smallestScreenSize"/>
+        -->
 
     </application>
 

Android/APIExample-Compose/app/src/main/java/io/agora/api/example/compose/NavGraph.kt

@@ -1,5 +1,6 @@
 package io.agora.api.example.compose
 
+import android.util.Log
 import androidx.compose.runtime.Composable
 import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
@@ -9,6 +10,7 @@ import androidx.navigation.navArgument
 import io.agora.api.example.compose.model.Component
 import io.agora.api.example.compose.model.Components
 import io.agora.api.example.compose.model.Example
+import io.agora.api.example.compose.samples.cleanupPictureInPictureState
 import io.agora.api.example.compose.ui.example.Example
 import io.agora.api.example.compose.ui.home.Home
 import io.agora.api.example.compose.ui.settings.Settings
@@ -48,7 +50,15 @@ fun NavGraph() {
             val example = component.examples[exampleIndex]
             Example(
                 example = example,
-                onBackClick = { navController.popBackStack() },
+                onBackClick = { 
+                    Log.d("PiPDebug", "NavGraph: onBackClick called for example: ${example.name}")
+                    // Special handling for PictureInPicture example
+                    if (example.name == R.string.example_pictureinpicture) {
+                        Log.d("PiPDebug", "NavGraph: Cleaning up PictureInPicture state")
+                        cleanupPictureInPictureState()
+                    }
+                    navController.popBackStack() 
+                },
             )
         }
     }

Android/APIExample-Compose/app/src/main/java/io/agora/api/example/compose/model/Examples.kt

@@ -20,7 +20,7 @@ import io.agora.api.example.compose.samples.MediaPlayer
 import io.agora.api.example.compose.samples.MediaRecorder
 import io.agora.api.example.compose.samples.OriginAudioData
 import io.agora.api.example.compose.samples.OriginVideoData
-import io.agora.api.example.compose.samples.PictureInPictureEntrance
+import io.agora.api.example.compose.samples.PictureInPicture
 import io.agora.api.example.compose.samples.PlayAudioFiles
 import io.agora.api.example.compose.samples.PreCallTest
 import io.agora.api.example.compose.samples.RTMPStreaming
@@ -54,7 +54,7 @@ val AdvanceExampleList = listOf(
     Example(R.string.example_originvideodata) { OriginVideoData() },
     Example(R.string.example_customvideosource) { CustomVideoSource() },
     Example(R.string.example_customvideorender) { CustomVideoRender() },
-    Example(R.string.example_pictureinpicture) { PictureInPictureEntrance(it) },
+    Example(R.string.example_pictureinpicture) { PictureInPicture() },
     Example(R.string.example_joinmultichannel) { JoinMultiChannel() },
     Example(R.string.example_channelencryption) { ChannelEncryption() },
     Example(R.string.example_playaudiofiles) { PlayAudioFiles() },

Android/APIExample-Compose/app/src/main/java/io/agora/api/example/compose/samples/LiveStreaming.kt

@@ -1,5 +1,6 @@
 package io.agora.api.example.compose.samples
 
+import android.util.Log
 import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.contract.ActivityResultContracts
@@ -57,6 +58,17 @@ import io.agora.rtc2.video.VideoEncoderConfiguration
 import io.agora.rtc2.video.VideoEncoderConfiguration.AdvanceOptions
 import io.agora.rtc2.video.WatermarkOptions
 
+private const val TAG = "LiveStreaming"
+
+private fun getVideoScenarioName(scenario: Constants.VideoScenario): String {
+    return when (scenario) {
+        Constants.VideoScenario.APPLICATION_SCENARIO_GENERAL -> "General"
+        Constants.VideoScenario.APPLICATION_SCENARIO_MEETING -> "Meeting"
+        Constants.VideoScenario.APPLICATION_SCENARIO_1V1 -> "1V1"
+        Constants.VideoScenario.APPLICATION_SCENARIO_LIVESHOW -> "Live Show"
+    }
+}
+
 @Composable
 fun LiveStreaming() {
     val context = LocalContext.current
@@ -70,6 +82,9 @@ fun LiveStreaming() {
     var localStats by remember { mutableStateOf(VideoStatsInfo()) }
     var remoteStats by remember { mutableStateOf(VideoStatsInfo()) }
     var clientRole by remember { mutableStateOf(Constants.CLIENT_ROLE_AUDIENCE) }
+    val settingsValues = remember { mutableStateMapOf<String, Any>().apply {
+        put("videoScenario", Constants.VideoScenario.APPLICATION_SCENARIO_LIVESHOW)
+    } }
 
     val rtcEngine = remember {
         RtcEngine.create(RtcEngineConfig().apply {
@@ -177,6 +192,10 @@ fun LiveStreaming() {
                     ), 100, 15
                 )
             )
+            // Set default video scenario
+            val defaultScenario = Constants.VideoScenario.APPLICATION_SCENARIO_LIVESHOW
+            val ret = setVideoScenario(defaultScenario)
+            Log.d(TAG, "onItemSelected: setVideoScenario " + getVideoScenarioName(defaultScenario) + " ret=" + ret)
         }
     }
     DisposableEffect(lifecycleOwner) {
@@ -192,6 +211,11 @@ fun LiveStreaming() {
             if (allGranted) {
                 // Permission is granted
                 Toast.makeText(context, R.string.permission_granted, Toast.LENGTH_LONG).show()
+                // Set video scenario before joining channel
+                val scenario = settingsValues["videoScenario"] as? Constants.VideoScenario
+                    ?: Constants.VideoScenario.APPLICATION_SCENARIO_LIVESHOW
+                val ret = rtcEngine.setVideoScenario(scenario)
+                Log.d(TAG, "onItemSelected: setVideoScenario " + getVideoScenarioName(scenario) + " ret=" + ret)
                 val mediaOptions = ChannelMediaOptions()
                 mediaOptions.channelProfile = Constants.CHANNEL_PROFILE_LIVE_BROADCASTING
                 mediaOptions.clientRoleType = clientRole
@@ -214,6 +238,7 @@ fun LiveStreaming() {
         localStats = localStats,
         remoteStats = remoteStats,
         localLarge = localLarge,
+        settingsValues = settingsValues,
         onSwitch = {
             localLarge = !localLarge
         },
@@ -248,12 +273,12 @@ private fun LiveStreamingView(
     localLarge: Boolean = true,
     localStats: VideoStatsInfo = VideoStatsInfo(),
     remoteStats: VideoStatsInfo = VideoStatsInfo(),
+    settingsValues: MutableMap<String, Any> = mutableMapOf(),
     onSwitch: () -> Unit = {},
     onJoinClick: (String) -> Unit,
     onLeaveClick: () -> Unit
 ) {
     var openSettingSheet by rememberSaveable { mutableStateOf(false) }
-    val settingsValues = remember { mutableStateMapOf<String, Any>() }
 
     Box {
         Column {
@@ -349,9 +374,17 @@ private fun LiveStreamingView(
                     rtcEngine = rtcEngine,
                     role = clientRole,
                     remoteUid = remoteUid,
+                    isJoined = isJoined,
                     values = settingsValues,
                     onValueChanged = { key, value ->
                         settingsValues[key] = value
+                        // Update video scenario immediately if not joined
+                        if (key == "videoScenario" && !isJoined) {
+                            val scenario = value as? Constants.VideoScenario
+                                ?: Constants.VideoScenario.APPLICATION_SCENARIO_LIVESHOW
+                            val ret = rtcEngine?.setVideoScenario(scenario) ?: -1
+                            Log.d(TAG, "onItemSelected: setVideoScenario " + getVideoScenarioName(scenario) + " ret=" + ret)
+                        }
                     }
                 )
             }
@@ -387,15 +420,34 @@ private fun LiveStreamingSettingView(
     rtcEngine: RtcEngine? = null,
     role: Int = Constants.CLIENT_ROLE_AUDIENCE,
     remoteUid: Int = 0,
+    isJoined: Boolean = false,
     values: Map<String, Any> = emptyMap(),
     onValueChanged: (String, Any) -> Unit = { _, _ -> }
 ) {
     val context = LocalContext.current
+    val videoScenario = values["videoScenario"] as? Constants.VideoScenario
+        ?: Constants.VideoScenario.APPLICATION_SCENARIO_LIVESHOW
 
     Column(
         modifier = modifier,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
+        // Video Scenario selection - must be set before joining channel
+        DropdownMenuRaw(
+            title = stringResource(id = R.string.video_scenario),
+            options = listOf(
+                stringResource(id = R.string.video_scenario_general) to Constants.VideoScenario.APPLICATION_SCENARIO_GENERAL,
+                stringResource(id = R.string.video_scenario_meeting) to Constants.VideoScenario.APPLICATION_SCENARIO_MEETING,
+                stringResource(id = R.string.video_scenario_1v1) to Constants.VideoScenario.APPLICATION_SCENARIO_1V1,
+                stringResource(id = R.string.video_scenario_liveshow) to Constants.VideoScenario.APPLICATION_SCENARIO_LIVESHOW,
+            ),
+            selectedValue = videoScenario,
+            enable = !isJoined,
+            onSelected = { _, option ->
+                onValueChanged("videoScenario", option.second)
+            }
+        )
+        Divider(modifier = Modifier.padding(horizontal = 16.dp))
         if (role == Constants.CLIENT_ROLE_AUDIENCE) {
             SwitchRaw(
                 title = stringResource(id = R.string.open_low_latency_live),