Merge pull request #172 from AgoraIO/dev/3.4.5

fix audio raw data example;

Author: xia ning

Android/APIExample/app/src/main/java/io/agora/api/example/ExampleActivity.java

@@ -36,7 +36,6 @@
 import io.agora.api.example.examples.advanced.VideoQuickSwitch;
 import io.agora.api.example.examples.advanced.RTMPStreaming;
 import io.agora.api.example.examples.advanced.StreamEncrypt;
-import io.agora.api.example.examples.advanced.SwitchCameraScreenShare;
 import io.agora.api.example.examples.advanced.VideoMetadata;
 import io.agora.api.example.examples.advanced.VoiceEffects;
 import io.agora.api.example.examples.advanced.customaudio.CustomAudioSource;
@@ -120,9 +119,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             case R.id.action_mainFragment_to_SwitchExternalVideo:
                 fragment = new SwitchExternalVideo();
                 break;
-            case R.id.action_mainFragment_to_SwitchCameraScreenShare:
-                fragment = new SwitchCameraScreenShare();
-                break;
             case R.id.action_mainFragment_to_VideoMetadata:
                 fragment = new VideoMetadata();
                 break;

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

@@ -41,7 +41,7 @@
 
 /**This demo demonstrates how to make a one-to-one video call*/
 @Example(
-        index = 23,
+        index = 6,
         group = ADVANCED,
         name = R.string.item_twoProcessScreenShare,
         actionId = R.id.action_mainFragment_to_two_process_screen_share,

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

@@ -115,9 +115,6 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
              * - < 0: Failure.
              */
             engine.registerAudioFrameObserver(audioFrameObserver);
-            engine.setRecordingAudioFrameParameters(SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, Constants.RAW_AUDIO_FRAME_OP_MODE_READ_ONLY, SAMPLES_PER_CALL);
-            engine.setMixedAudioFrameParameters(SAMPLE_RATE, SAMPLES_PER_CALL);
-            engine.setPlaybackAudioFrameParameters(SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, Constants.RAW_AUDIO_FRAME_OP_MODE_READ_ONLY, SAMPLES_PER_CALL);
             mAudioPlayer = new AudioPlayer(AudioManager.STREAM_VOICE_CALL, SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, AudioFormat.CHANNEL_OUT_MONO);
         }
         catch (Exception e) {
@@ -410,17 +407,17 @@ public int getObservedAudioFramePosition() {
 
         @Override
         public AudioParams getRecordAudioParams() {
-            return null;
+            return new AudioParams(SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, Constants.RAW_AUDIO_FRAME_OP_MODE_READ_ONLY, SAMPLES_PER_CALL);
         }
 
         @Override
         public AudioParams getPlaybackAudioParams() {
-            return null;
+            return new AudioParams(SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, Constants.RAW_AUDIO_FRAME_OP_MODE_READ_ONLY, SAMPLES_PER_CALL);
         }
 
         @Override
         public AudioParams getMixedAudioParams() {
-            return null;
+            return new AudioParams(SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, Constants.RAW_AUDIO_FRAME_OP_MODE_READ_ONLY, SAMPLES_PER_CALL);
         }
     };
 

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

@@ -71,7 +71,7 @@ public class SwitchExternalVideo extends BaseFragment implements View.OnClickLis
 
     private FrameLayout fl_remote;
     private RelativeLayout fl_local;
-    private Button join, localVideo, screenShare;
+    private Button join, localVideo;
     private EditText et_channel;
     private int myUid;
     private boolean joined = false;
@@ -101,13 +101,11 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         super.onViewCreated(view, savedInstanceState);
         join = view.findViewById(R.id.btn_join);
         localVideo = view.findViewById(R.id.localVideo);
-        screenShare = view.findViewById(R.id.screenShare);
         et_channel = view.findViewById(R.id.et_channel);
         fl_remote = view.findViewById(R.id.fl_remote);
         fl_local = view.findViewById(R.id.fl_local);
         join.setOnClickListener(this);
         localVideo.setOnClickListener(this);
-        screenShare.setOnClickListener(this);
         checkLocalVideo();
     }
 
@@ -196,7 +194,6 @@ public void onClick(View v) {
                 joined = false;
                 join.setText(getString(R.string.join));
                 localVideo.setEnabled(false);
-                screenShare.setEnabled(false);
                 fl_remote.removeAllViews();
                 fl_local.removeAllViews();
                 /**After joining a channel, the user must call the leaveChannel method to end the
@@ -379,7 +376,6 @@ public void onJoinChannelSuccess(String channel, int uid, int elapsed) {
             handler.post(() -> {
                 join.setEnabled(true);
                 join.setText(getString(R.string.leave));
-                screenShare.setEnabled(true);
                 localVideo.setEnabled(mLocalVideoExists);
                 bindVideoService();
             });

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

@@ -52,14 +52,4 @@
         android:layout_alignParentEnd="true"
         android:layout_marginBottom="24dp"/>
 
-    <androidx.appcompat.widget.AppCompatButton
-        android:id="@+id/screenShare"
-        android:layout_width="wrap_content"
-        android:enabled="false"
-        android:layout_height="wrap_content"
-        android:text="@string/screenshare"
-        android:layout_above="@id/localVideo"
-        android:layout_alignParentEnd="true"
-        android:layout_marginBottom="24dp"/>
-
 </RelativeLayout>

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

@@ -85,8 +85,7 @@
     <string name="item_rtmpstreaming">推流到CDN</string>
     <string name="item_rtmpinjection">输入在线媒体流</string>
     <string name="item_pushexternal">自定义视频采集(Push)</string>
-    <string name="item_switchexternal">自定义视频采集(MediaIO)/屏幕共享</string>
-    <string name="item_cameraorscreen">摄像头和屏幕共享切换</string>
+    <string name="item_switchexternal">自定义视频采集(MediaIO)</string>
     <string name="item_customaudiosource">自定义音频采集/渲染</string>
     <string name="item_customremoterender">自定义视频渲染</string>
     <string name="item_processraw">原始音频/视频数据</string>
@@ -96,7 +95,7 @@
     <string name="item_setvideoprofile">设置视频编码属性</string>
     <string name="item_incallreport">通话中质量监测</string>
     <string name="item_livestreaming">RTC实时直播</string>
-    <string name="item_twoProcessScreenShare">双进程屏幕共享</string>
+    <string name="item_twoProcessScreenShare">同时发布摄像头和屏幕共享</string>
     <string name="item_arcore">现实增强集成</string>
     <string name="item_senddatastream">发送数据流</string>
     <string name="item_raw_audio">原始音频数据</string>

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

@@ -88,8 +88,7 @@
     <string name="item_rtmpstreaming">Push Streams to CDN</string>
     <string name="item_rtmpinjection">Inject Online Media Stream</string>
     <string name="item_pushexternal">Custom Video Source(Push)</string>
-    <string name="item_switchexternal">Custom Video Source(MediaIO)/Share the Screen</string>
-    <string name="item_cameraorscreen">Switch Camera and Screen Share</string>
+    <string name="item_switchexternal">Custom Video Source(MediaIO)</string>
     <string name="item_customaudiosource">Custom Audio Source/Renderer</string>
     <string name="item_customremoterender">Custom Video Renderer</string>
     <string name="item_processraw">Raw Video/Audio Data</string>
@@ -100,7 +99,7 @@
     <string name="item_incallreport">Report In-call Statistics</string>
     <string name="item_superresolution">Super Resolution</string>
     <string name="item_livestreaming">RTC Live Streaming</string>
-    <string name="item_twoProcessScreenShare">Multi Process - Screen Sharing</string>
+    <string name="item_twoProcessScreenShare">Publish Camera and Screen Sharing</string>
     <string name="item_raw_audio">Raw Audio Data</string>
     <string name="item_senddatastream">Send Data Stream</string>
     <string name="item_arcore">ARCore</string>

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

@@ -70,10 +70,6 @@ class RawAudioDataMain: BaseViewController {
         // Register audio observer
         agoraKit.setAudioDataFrame(self)
 
-        agoraKit.setRecordingAudioFrameParametersWithSampleRate(44100, channel: 1, mode: .readWrite, samplesPerCall: 4410)
-        agoraKit.setMixedAudioFrameParametersWithSampleRate(44100, samplesPerCall: 4410)
-        agoraKit.setPlaybackAudioFrameParametersWithSampleRate(44100, channel: 1, mode: .readWrite, samplesPerCall: 4410)
-        
         // set up local video to render your local camera preview
         let videoCanvas = AgoraRtcVideoCanvas()
         videoCanvas.uid = 0