fix 37200 issues

Author: xianing

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

@@ -32,12 +32,6 @@
             </intent-filter>
         </activity>
 
-        <service android:name=".examples.advanced.customaudio.MicrophoneRecordService"
-            android:exported="false"/>
-
-        <service android:name=".examples.advanced.customaudio.PCMRecordService"
-            android:exported="false"/>
-
         <service android:name=".examples.advanced.SwitchCameraScreenShare$MediaProjectFgService"
             android:enabled="true"
             android:exported="false"

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

@@ -55,7 +55,7 @@ public class MediaPlayer extends BaseFragment implements View.OnClickListener, I
 
     private static final String TAG = MediaPlayer.class.getSimpleName();
 
-    private Button join, open, play, stop, pause, publish, publishOnlyAudio;
+    private Button join, open, play, stop, pause, publish;
     private EditText et_channel, et_url;
     private RtcEngine engine;
     private IMediaPlayer mediaPlayer;
@@ -124,7 +124,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         stop = view.findViewById(R.id.stop);
         pause = view.findViewById(R.id.pause);
         publish = view.findViewById(R.id.publish);
-        publishOnlyAudio = view.findViewById(R.id.publish_only_audio);
 
         progressBar = view.findViewById(R.id.ctrl_progress_bar);
         progressBar.setOnSeekBarChangeListener(new SeekBar.OnSeekBarChangeListener() {
@@ -154,7 +153,6 @@ public void onStopTrackingTouch(SeekBar seekBar) {
         view.findViewById(R.id.stop).setOnClickListener(this);
         view.findViewById(R.id.pause).setOnClickListener(this);
         view.findViewById(R.id.publish).setOnClickListener(this);
-        view.findViewById(R.id.publish_only_audio).setOnClickListener(this);
         fl_local = view.findViewById(R.id.fl_local);
         fl_remote = view.findViewById(R.id.fl_remote);
     }
@@ -222,12 +220,9 @@ public void onClick(View v) {
         } else if (v.getId() == R.id.pause) {
             mediaPlayer.pause();
         } else if (v.getId() == R.id.publish) {
-            options.publishAudioTrack = false;
             options.publishMediaPlayerVideoTrack = true;
-            engine.updateChannelMediaOptions(options);
-        } else if (v.getId() == R.id.publish_only_audio) {
-            options.publishAudioTrack = true;
-            options.publishMediaPlayerVideoTrack = false;
+            options.publishMediaPlayerAudioTrack = true;
+            options.publishMediaPlayerId = mediaPlayer.getMediaPlayerId();
             engine.updateChannelMediaOptions(options);
         }
     }
@@ -275,11 +270,6 @@ private void joinChannel(String channelId) {
         options.publishAudioTrack = false;
         options.enableAudioRecordingOrPlayout = true;
 
-        // media player
-        options.publishMediaPlayerId = mediaPlayer.getMediaPlayerId();
-        options.publishMediaPlayerAudioTrack = true;
-        options.publishMediaPlayerVideoTrack = true;
-
         /**Please configure accessToken in the string_config file.
          * A temporary token generated in Console. A temporary token is valid for 24 hours. For details, see
          *      https://docs.agora.io/en/Agora%20Platform/token?platform=All%20Platforms#get-a-temporary-token
@@ -517,7 +507,6 @@ public void run() {
                 stop.setEnabled(enable);
                 pause.setEnabled(enable);
                 publish.setEnabled(enable);
-                publishOnlyAudio.setEnabled(enable);
             }
         });
     }

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

@@ -62,8 +62,7 @@ public class ProcessAudioRawData extends BaseFragment implements View.OnClickLis
     private boolean joined = false;
     private boolean isWriteBackAudio = false;
     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 SAMPLE_NUM_OF_CHANNEL = 1;
     private static final Integer SAMPLES = 1024;
     private static final String AUDIO_FILE = "output.raw";
     private InputStream inputStream;
@@ -106,7 +105,7 @@ private void closeAudioFile(){
     }
 
     private byte[] readBuffer(){
-        int byteSize = SAMPLES * BIT_PER_SAMPLE / 8 * SAMPLE_NUM_OF_CHANNEL;
+        int byteSize = SAMPLES * SAMPLE_NUM_OF_CHANNEL * 2;
         byte[] buffer = new byte[byteSize];
         try {
             if(inputStream.read(buffer) < 0){
@@ -183,6 +182,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
             engine = RtcEngine.create(config);
             engine.registerAudioFrameObserver(iAudioFrameObserver);
             engine.setRecordingAudioFrameParameters(SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, Constants.RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, SAMPLES);
+            engine.setPlaybackAudioFrameParameters(SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, Constants.RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, SAMPLES);
             openAudioFile();
         }
         catch (Exception e) {
@@ -192,9 +192,12 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
     }
 
     private byte[] audioAggregate(byte[] origin, byte[] buffer) {
-        byte[] output = new byte[origin.length];
+        byte[] output = new byte[buffer.length];
         for (int i = 0; i < origin.length; i++) {
-            output[i] = (byte) ((int) origin[i] + (int) buffer[i] / 2);
+            output[i] = (byte) ((long) origin[i] / 2 + (long) buffer[i]);
+            if(i == 2){
+                Log.i(TAG, "origin :" + (int) origin[i] + " audio: " + (int) buffer[i]);
+            }
         }
         return output;
     }
@@ -289,7 +292,6 @@ private void joinChannel(String channelId) {
         if (TextUtils.equals(accessToken, "") || TextUtils.equals(accessToken, "<#YOUR ACCESS TOKEN#>")) {
             accessToken = null;
         }
-        engine.enableAudioVolumeIndication(1000, 3, false);
         ChannelMediaOptions option = new ChannelMediaOptions();
         option.autoSubscribeAudio = true;
         option.autoSubscribeVideo = true;
@@ -313,29 +315,29 @@ 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);
             if(isWriteBackAudio){
+                byteBuffer.flip();
                 byte[] buffer = readBuffer();
                 byte[] origin = new byte[byteBuffer.remaining()];
                 byteBuffer.get(origin);
                 byteBuffer.flip();
                 byteBuffer.put(audioAggregate(origin, buffer), 0, byteBuffer.remaining());
             }
-            return false;
+            return true;
         }
 
         @Override
-        public boolean onPlaybackAudioFrame(int i, int i1, int i2, int i3, int i4, ByteBuffer byteBuffer, long l, int i5) {
+        public boolean onPlaybackAudioFrame(int audioFrameType, int samples, int bytesPerSample, int channels, int samplesPerSec, ByteBuffer byteBuffer, long renderTimeMs, int bufferLength) {
             return false;
         }
 
         @Override
-        public boolean onMixedAudioFrame(int i, int i1, int i2, int i3, int i4, ByteBuffer byteBuffer, long l, int i5) {
+        public boolean onMixedAudioFrame(int audioFrameType, int samples, int bytesPerSample, int channels, int samplesPerSec, ByteBuffer byteBuffer, long renderTimeMs, int bufferLength) {
             return false;
         }
 
         @Override
-        public boolean onPlaybackAudioFrameBeforeMixing(int i, int i1, int i2, int i3, int i4, int i5, ByteBuffer byteBuffer, long l, int i6) {
+        public boolean onPlaybackAudioFrameBeforeMixing(int uid, int audioFrameType, int samples, int bytesPerSample, int channels, int samplesPerSec, ByteBuffer byteBuffer, long renderTimeMs, int bufferLength) {
             return false;
         }
     };

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

@@ -1,11 +1,7 @@
 package io.agora.api.example.examples.advanced.customaudio;
 
 import android.content.Context;
-import android.content.Intent;
-import android.media.AudioFormat;
-import android.media.AudioManager;
 import android.os.Bundle;
-import android.os.Environment;
 import android.os.Handler;
 import android.text.TextUtils;
 import android.util.Log;
@@ -23,8 +19,8 @@
 import com.yanzhenjie.permission.AndPermission;
 import com.yanzhenjie.permission.runtime.Permission;
 
-import java.io.File;
-import java.util.Random;
+import java.io.IOException;
+import java.io.InputStream;
 
 import io.agora.api.example.R;
 import io.agora.api.example.annotation.Example;
@@ -33,14 +29,11 @@
 import io.agora.rtc2.ChannelMediaOptions;
 import io.agora.rtc2.Constants;
 import io.agora.rtc2.IRtcEngineEventHandler;
-import io.agora.rtc2.RtcConnection;
 import io.agora.rtc2.RtcEngine;
 import io.agora.rtc2.RtcEngineConfig;
 import io.agora.rtc2.RtcEngineEx;
 
 import static io.agora.api.example.common.model.Examples.ADVANCED;
-import static io.agora.api.example.examples.advanced.customaudio.MicrophoneRecordService.RecordThread.DEFAULT_CHANNEL_COUNT;
-import static io.agora.api.example.examples.advanced.customaudio.MicrophoneRecordService.RecordThread.DEFAULT_SAMPLE_RATE;
 
 /**This demo demonstrates how to make a one-to-one voice call*/
 @Example(
@@ -60,6 +53,13 @@ public class CustomAudioSource extends BaseFragment implements View.OnClickListe
     public static RtcEngineEx engine;
     private Switch mic, pcm;
     private ChannelMediaOptions option = new ChannelMediaOptions();
+    private static final String AUDIO_FILE = "output.raw";
+    private static final Integer SAMPLE_RATE = 44100;
+    private static final Integer SAMPLE_NUM_OF_CHANNEL = 1;
+    private static final Integer SAMPLES = 1024;
+    private static final Integer BUFFER_SIZE = SAMPLES * SAMPLE_NUM_OF_CHANNEL * 2;
+
+    private InputStream inputStream;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState)
@@ -76,6 +76,36 @@ private void initMediaOption() {
         option.publishCustomAudioTrack = false;
     }
 
+    private void openAudioFile(){
+        try {
+            inputStream = this.getResources().getAssets().open(AUDIO_FILE);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void closeAudioFile(){
+        try {
+            inputStream.close();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+
+    private byte[] readBuffer(){
+        int byteSize = BUFFER_SIZE;
+        byte[] buffer = new byte[byteSize];
+        try {
+            if(inputStream.read(buffer) < 0){
+                inputStream.reset();
+                return readBuffer();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return buffer;
+    }
+
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState)
@@ -95,15 +125,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         pcm = view.findViewById(R.id.localAudio);
         mic.setOnCheckedChangeListener(this);
         pcm.setOnCheckedChangeListener(this);
-        checkLocalAudio();
-    }
-
-    private void checkLocalAudio() {
-        File dir = getContext().getExternalFilesDir(Environment.DIRECTORY_MUSIC);
-        File audioFile = new File(dir, PCMRecordService.FILE_NAME);
-        if (!audioFile.exists()) {
-            showAlert(String.format(getString(R.string.alert_no_local_audio_message), dir.getAbsolutePath()));
-        }
     }
 
     @Override
@@ -141,6 +162,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState)
             config.mEventHandler = iRtcEngineEventHandler;
             config.mAudioScenario = Constants.AudioScenario.getValue(Constants.AudioScenario.HIGH_DEFINITION);
             engine = (RtcEngineEx) RtcEngine.create(config);
+            openAudioFile();
         }
         catch (Exception e)
         {
@@ -153,14 +175,14 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState)
     public void onDestroy()
     {
         super.onDestroy();
-        stopPCMRecord();
         /**leaveChannel and Destroy the RtcEngine instance*/
         if(engine != null)
         {
             engine.leaveChannel();
         }
         handler.post(RtcEngine::destroy);
         engine = null;
+        closeAudioFile();
     }
 
 
@@ -170,23 +192,21 @@ public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
         {
             if(b){
                 option.publishAudioTrack = true;
-                engine.updateChannelMediaOptions(option);
             }
             else{
                 option.publishAudioTrack = false;
-                engine.updateChannelMediaOptions(option);
             }
+            engine.updateChannelMediaOptions(option);
         }
         else if(compoundButton.getId() == R.id.localAudio)
         {
             if(b){
                 option.publishCustomAudioTrack = true;
-                engine.updateChannelMediaOptions(option);
             }
             else{
                 option.publishCustomAudioTrack = false;
-                engine.updateChannelMediaOptions(option);
             }
+            engine.updateChannelMediaOptions(option);
         }
     }
 
@@ -220,7 +240,6 @@ public void onClick(View v)
             else
             {
                 joined = false;
-                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
                  * channel and releases all resources related to the call. This method call is
@@ -266,7 +285,7 @@ private void joinChannel(String channelId)
          *   0: Success.
          *   < 0: Failure.
          * PS: Ensure that you call this method before the joinChannel method.*/
-        engine.setExternalAudioSource(true, DEFAULT_SAMPLE_RATE, DEFAULT_CHANNEL_COUNT, 1, true, true);
+        engine.setExternalAudioSource(true, SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, 2, true, true);
         /**Please configure accessToken in the string_config file.
          * A temporary token generated in Console. A temporary token is valid for 24 hours. For details, see
          *      https://docs.agora.io/en/Agora%20Platform/token?platform=All%20Platforms#get-a-temporary-token
@@ -294,20 +313,6 @@ private void joinChannel(String channelId)
         join.setEnabled(false);
     }
 
-    private void startPCMRecord()
-    {
-        Intent intent = new Intent(getContext(), PCMRecordService.class);
-        getActivity().startService(intent);
-    }
-
-    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.
      * The SDK uses this class to report to the app on SDK runtime events.*/
     private final IRtcEngineEventHandler iRtcEngineEventHandler = new IRtcEngineEventHandler()
@@ -342,7 +347,6 @@ 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
@@ -352,9 +356,20 @@ public void run()
                     pcm.setEnabled(true);
                     join.setEnabled(true);
                     join.setText(getString(R.string.leave));
+                    new Thread(new PushingTask()).start();
                 }
             });
         }
 
     };
+
+    class PushingTask implements Runnable {
+
+        @Override
+        public void run() {
+            while (true){
+                engine.pushExternalAudioFrame(readBuffer(), BUFFER_SIZE);
+            }
+        }
+    }
 }