fix 37200 iusses

Author: xianing

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

@@ -64,7 +64,7 @@ public class ProcessAudioRawData extends BaseFragment implements View.OnClickLis
     private static final Integer SAMPLE_RATE = 44100;
     private static final Integer SAMPLE_NUM_OF_CHANNEL = 2;
     private static final Integer BIT_PER_SAMPLE = 8;
-    private static final Integer SAMPLES = 441 * 10;
+    private static final Integer SAMPLES = 1024;
     private static final String AUDIO_FILE = "output.raw";
     private InputStream inputStream;
     private SeekBar record;
@@ -313,7 +313,7 @@ private void joinChannel(String channelId) {
 
         @Override
         public boolean onRecordAudioFrame(int audioFrameType, int samples, int bytesPerSample, int channels, int samplesPerSec, ByteBuffer byteBuffer, long renderTimeMs, int bufferLength) {
-            Log.i(TAG, "onRecordAudioFrame " + isWriteBackAudio);
+//            Log.i(TAG, "onRecordAudioFrame " + isWriteBackAudio);
             if(isWriteBackAudio){
                 byte[] buffer = readBuffer();
                 byte[] origin = new byte[byteBuffer.remaining()];

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

@@ -58,17 +58,22 @@ public class CustomAudioSource extends BaseFragment implements View.OnClickListe
     private int myUid;
     private boolean joined = false;
     public static RtcEngineEx engine;
-    private static final Integer SAMPLE_RATE = 44100;
-    private static final Integer SAMPLE_NUM_OF_CHANNEL = 1;
-    private AudioPlayer mAudioPlayer;
-    private Switch mic, pcm, loopback;
-    public static  RtcConnection rtcConnection2 = new RtcConnection();
+    private Switch mic, pcm;
+    private ChannelMediaOptions option = new ChannelMediaOptions();
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState)
     {
         super.onCreate(savedInstanceState);
         handler = new Handler();
+        initMediaOption();
+    }
+
+    private void initMediaOption() {
+        option.autoSubscribeAudio = true;
+        option.autoSubscribeVideo = true;
+        option.publishAudioTrack = false;
+        option.publishCustomAudioTrack = false;
     }
 
     @Nullable
@@ -88,10 +93,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         view.findViewById(R.id.btn_join).setOnClickListener(this);
         mic = view.findViewById(R.id.microphone);
         pcm = view.findViewById(R.id.localAudio);
-        loopback = view.findViewById(R.id.playLocally);
         mic.setOnCheckedChangeListener(this);
         pcm.setOnCheckedChangeListener(this);
-        loopback.setOnCheckedChangeListener(this);
         checkLocalAudio();
     }
 
@@ -138,8 +141,6 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState)
             config.mEventHandler = iRtcEngineEventHandler;
             config.mAudioScenario = Constants.AudioScenario.getValue(Constants.AudioScenario.HIGH_DEFINITION);
             engine = (RtcEngineEx) RtcEngine.create(config);
-
-            mAudioPlayer = new AudioPlayer(AudioManager.STREAM_VOICE_CALL, SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, AudioFormat.CHANNEL_OUT_MONO);
         }
         catch (Exception e)
         {
@@ -152,7 +153,6 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState)
     public void onDestroy()
     {
         super.onDestroy();
-        stopAudioRecord();
         stopPCMRecord();
         /**leaveChannel and Destroy the RtcEngine instance*/
         if(engine != null)
@@ -161,7 +161,6 @@ public void onDestroy()
         }
         handler.post(RtcEngine::destroy);
         engine = null;
-        mAudioPlayer.stopPlayer();
     }
 
 
@@ -170,39 +169,25 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
         if (compoundButton.getId() == R.id.microphone)
         {
             if(b){
-                startAudioRecord();
+                option.publishAudioTrack = true;
+                engine.updateChannelMediaOptions(option);
             }
             else{
-                stopAudioRecord();
+                option.publishAudioTrack = false;
+                engine.updateChannelMediaOptions(option);
             }
         }
         else if(compoundButton.getId() == R.id.localAudio)
         {
-//            loopback.setVisibility(b?View.VISIBLE:View.INVISIBLE);
-            loopback.setEnabled(b);
             if(b){
-                ChannelMediaOptions mediaOptions = new ChannelMediaOptions();
-                mediaOptions.autoSubscribeAudio = false;
-                mediaOptions.autoSubscribeVideo = false;
-                mediaOptions.publishScreenTrack = false;
-                mediaOptions.publishCameraTrack = false;
-                mediaOptions.publishCustomAudioTrack = true;
-                mediaOptions.enableAudioRecordingOrPlayout = false;
-                mediaOptions.clientRoleType = Constants.CLIENT_ROLE_BROADCASTER;
-                mediaOptions.channelProfile = Constants.CHANNEL_PROFILE_LIVE_BROADCASTING;
-                rtcConnection2.channelId = et_channel.getText().toString();
-                rtcConnection2.localUid = new Random().nextInt(512)+512;
-                engine.joinChannelEx(null,rtcConnection2, mediaOptions, iRtcEngineEventHandlerEx);
+                option.publishCustomAudioTrack = true;
+                engine.updateChannelMediaOptions(option);
             }
             else{
-                engine.leaveChannelEx(rtcConnection2);
-                stopPCMRecord();
+                option.publishCustomAudioTrack = false;
+                engine.updateChannelMediaOptions(option);
             }
         }
-        else if(compoundButton.getId() == R.id.playLocally)
-        {
-
-        }
     }
 
 
@@ -235,7 +220,6 @@ public void onClick(View v)
             else
             {
                 joined = false;
-                stopAudioRecord();
                 stopPCMRecord();
                 /**After joining a channel, the user must call the leaveChannel method to end the
                  * call before joining another channel. This method returns 0 if the user leaves the
@@ -258,7 +242,6 @@ public void onClick(View v)
                 join.setText(getString(R.string.join));
                 mic.setEnabled(false);
                 pcm.setEnabled(false);
-                loopback.setEnabled(false);
             }
         }
     }
@@ -297,9 +280,6 @@ private void joinChannel(String channelId)
         /** Allows a user to join a channel.
          if you do not specify the uid, we will generate the uid for you*/
 
-        ChannelMediaOptions option = new ChannelMediaOptions();
-        option.autoSubscribeAudio = true;
-        option.autoSubscribeVideo = true;
         int res = engine.joinChannel(accessToken, channelId, 0, option);
         if (res != 0)
         {
@@ -314,18 +294,6 @@ private void joinChannel(String channelId)
         join.setEnabled(false);
     }
 
-    private void startAudioRecord()
-    {
-        Intent intent = new Intent(getContext(), MicrophoneRecordService.class);
-        getActivity().startService(intent);
-    }
-
-    private void stopAudioRecord()
-    {
-        Intent intent = new Intent(getContext(), MicrophoneRecordService.class);
-        getActivity().stopService(intent);
-    }
-
     private void startPCMRecord()
     {
         Intent intent = new Intent(getContext(), PCMRecordService.class);
@@ -336,6 +304,8 @@ private void stopPCMRecord()
     {
         Intent intent = new Intent(getContext(), PCMRecordService.class);
         getActivity().stopService(intent);
+        option.publishCustomAudioTrack = false;
+        engine.updateChannelMediaOptions(option);
     }
 
     /**IRtcEngineEventHandler is an abstract class providing default implementation.
@@ -372,6 +342,7 @@ public void onJoinChannelSuccess(String channel, int uid, int elapsed)
             showLongToast(String.format("onJoinChannelSuccess channel %s uid %d", channel, uid));
             myUid = uid;
             joined = true;
+            startPCMRecord();
             handler.post(new Runnable()
             {
                 @Override
@@ -386,41 +357,4 @@ public void run()
         }
 
     };
-
-    /**IRtcEngineEventHandler is an abstract class providing default implementation.
-     * The SDK uses this class to report to the app on SDK runtime events.*/
-    private final IRtcEngineEventHandler iRtcEngineEventHandlerEx = new IRtcEngineEventHandler()
-    {
-        /**Reports a warning during SDK runtime.
-         * Warning code: https://docs.agora.io/en/Voice/API%20Reference/java/classio_1_1agora_1_1rtc_1_1_i_rtc_engine_event_handler_1_1_warn_code.html*/
-        @Override
-        public void onWarning(int warn)
-        {
-            Log.w(TAG, String.format("onWarning code %d message %s", warn, RtcEngine.getErrorDescription(warn)));
-        }
-
-        /**Reports an error during SDK runtime.
-         * Error code: https://docs.agora.io/en/Voice/API%20Reference/java/classio_1_1agora_1_1rtc_1_1_i_rtc_engine_event_handler_1_1_error_code.html*/
-        @Override
-        public void onError(int err)
-        {
-            Log.e(TAG, String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
-            showAlert(String.format("onError code %d message %s", err, RtcEngine.getErrorDescription(err)));
-        }
-
-        /**Occurs when the local user joins a specified channel.
-         * The channel name assignment is based on channelName specified in the joinChannel method.
-         * If the uid is not specified when joinChannel is called, the server automatically assigns a uid.
-         * @param channel Channel name
-         * @param uid User ID
-         * @param elapsed Time elapsed (ms) from the user calling joinChannel until this callback is triggered*/
-        @Override
-        public void onJoinChannelSuccess(String channel, int uid, int elapsed)
-        {
-            Log.i(TAG, String.format("onJoinChannelSuccess channel %s uid %d", channel, uid));
-            showLongToast(String.format("onJoinChannelSuccess channel %s uid %d", channel, uid));
-            startPCMRecord();
-        }
-
-    };
 }

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

@@ -143,9 +143,8 @@ private void readFile(File file) {
                                  * @return
                                  *   0: Success.
                                  *   < 0: Failure.*/
-//                                int ret = CustomAudioSource.engine.pushExternalAudioFrame(
-//                                        ByteBuffer.wrap(buffer), 0, CustomAudioSource.rtcConnection2.localUid);
                                 int ret = CustomAudioSource.engine.pushExternalAudioFrame(buffer, len);
+                                Log.i(TAG, "pushExternalAudioFrame result "+ ret);
                             } catch (Exception e) {
                                 e.printStackTrace();
                             }

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

@@ -115,7 +115,7 @@
     <string name="joinchannelvideo">此示例演示了如何使用SDK加入频道进行音视频通话的功能。</string>
     <string name="adjustvolume">此示例演示了如何使用SDK在频道中调整通话音量的功能。</string>
     <string name="precalltest">此示例演示了如何使用SDK在进入频道前检测网络质量状况。</string>
-    <string name="customaudio">此示例演示了在语音通话过程中如何使用CustomSource和CustomSink接口进行自采集音频帧和自渲染音频帧的功能。</string>
+    <string name="customaudio">此示例演示了在语音通话过程中使用MediaOption控制发布麦克风和自采集音频流的功能。</string>
     <string name="customremoterender">此示例演示了在音视频通话过程中如何自定义远端视频流渲染器的功能。</string>
     <string name="processrawdata">此示例演示了在音视频通话过程中如何通过回调获取裸数据，以及在数据被处理后如何返回给SDK的功能。\nPS：裸数据包括视频帧和音频帧。</string>
     <string name="pushexternalvideo">此示例演示了在音视频通话过程中如何以主动Push的方式进行视频自采集的功能。</string>

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

@@ -119,7 +119,7 @@
     <string name="joinchannelvideo">This example demonstrates how to use the SDK to join channels for audio and video calls.</string>
     <string name="adjustvolume">This example demonstrates how to use the SDK to adjust in cal volume.</string>
     <string name="precalltest">This example demonstrates how to use the SDK to check uplink network condition before joining the  channel.</string>
-    <string name="customaudio">This example demonstrates how to use custom audio source and custom audio sink API to do Audio capture and renderer. </string>
+    <string name="customaudio">This example demonstrates how to use mediaOption API to publish microphone and custom audio source. </string>
     <string name="customremoterender">This example demonstrates how to customize the functions of the remote video stream renderer during audio and video calls.</string>
     <string name="processrawdata">This example demonstrates how to obtain raw data through callback during audio and video calls, and how to return the data to the SDK after processing.\nPS:Bare data includes video frames and audio frames</string>
     <string name="pushexternalvideo">This example demonstrates how to use the active push mode to collect video during audio and video calls.</string>