Merge pull request #184 from AgoraIO/dev/3.5.0

Dev/3.5.0

Author: plutoless

Android/APIExample/app/build.gradle

@@ -50,8 +50,8 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-    implementation 'io.github.luizgrp.sectionedrecyclerviewadapter:sectionedrecyclerviewadapter:1.2.0'
-    implementation 'com.yanzhenjie:permission:2.0.3'
+    implementation 'com.github.luizgrp:SectionedRecyclerViewAdapter:v3.2.0'
+    implementation 'com.yanzhenjie:permission:2.0.2'
     implementation 'de.javagl:obj:0.2.1'
     implementation 'com.google.ar:core:1.0.0'
 

Android/APIExample/app/src/main/assets/output.raw

@@ -202,6 +202,11 @@ public void onPlayBufferUpdated(long l) {
 
             }
 
+            @Override
+            public void onPreloadEvent(String s, Constants.MediaPlayerPreloadEvent mediaPlayerPreloadEvent) {
+
+            }
+
             @Override
             public void onPlayerEvent(Constants.MediaPlayerEvent eventCode) {
                 LogUtil.i("agoraMediaPlayerKit1 onEvent:" + eventCode);

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

@@ -1,8 +1,6 @@
 package io.agora.api.example.examples.advanced;
 
 import android.content.Context;
-import android.media.AudioFormat;
-import android.media.AudioManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.text.TextUtils;
@@ -21,10 +19,13 @@
 import com.yanzhenjie.permission.AndPermission;
 import com.yanzhenjie.permission.runtime.Permission;
 
+import java.io.IOException;
+import java.io.InputStream;
+import java.nio.ByteBuffer;
+
 import io.agora.api.example.R;
 import io.agora.api.example.annotation.Example;
 import io.agora.api.example.common.BaseFragment;
-import io.agora.api.example.examples.advanced.customaudio.AudioPlayer;
 import io.agora.api.example.utils.CommonUtil;
 import io.agora.rtc.AudioFrame;
 import io.agora.rtc.Constants;
@@ -53,15 +54,17 @@ public class ProcessAudioRawData extends BaseFragment implements View.OnClickLis
     private static final String TAG = ProcessAudioRawData.class.getSimpleName();
     private EditText et_channel;
     private Button mute, join, speaker;
-    private Switch loopback;
+    private Switch writeBackAudio;
     private RtcEngine engine;
     private int myUid;
     private boolean joined = false;
-    private boolean isEnableLoopBack = false;
-    private AudioPlayer mAudioPlayer;
+    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 = 16;
     private static final Integer SAMPLES_PER_CALL = 4410;
-    private static final Integer SAMPLE_NUM_OF_CHANNEL = 1;
+    private static final String AUDIO_FILE = "output.raw";
+    private InputStream inputStream;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -86,8 +89,8 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         mute.setOnClickListener(this);
         speaker = view.findViewById(R.id.btn_speaker);
         speaker.setOnClickListener(this);
-        loopback = view.findViewById(R.id.loopback);
-        loopback.setOnCheckedChangeListener(this);
+        writeBackAudio = view.findViewById(R.id.audioWriteBack);
+        writeBackAudio.setOnCheckedChangeListener(this);
     }
 
     @Override
@@ -107,15 +110,7 @@ public void onActivityCreated(@Nullable Bundle savedInstanceState) {
              *                The SDK uses this class to report to the app on SDK runtime events.*/
             String appId = getString(R.string.agora_app_id);
             engine = RtcEngine.create(getContext().getApplicationContext(), appId, iRtcEngineEventHandler);
-            /** Registers the audio observer object.
-             *
-             * @param observer Audio observer object to be registered. See {@link IAudioFrameObserver IAudioFrameObserver}. Set the value as @p null to cancel registering, if necessary.
-             * @return
-             * - 0: Success.
-             * - < 0: Failure.
-             */
-            engine.registerAudioFrameObserver(audioFrameObserver);
-            mAudioPlayer = new AudioPlayer(AudioManager.STREAM_VOICE_CALL, SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, AudioFormat.CHANNEL_OUT_MONO);
+            openAudioFile();
         }
         catch (Exception e) {
             e.printStackTrace();
@@ -132,7 +127,45 @@ public void onDestroy() {
         }
         handler.post(RtcEngine::destroy);
         engine = null;
-        mAudioPlayer.stopPlayer();
+        closeAudioFile();
+    }
+
+    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 = SAMPLES_PER_CALL * BIT_PER_SAMPLE / 8;
+        byte[] buffer = new byte[byteSize];
+        try {
+            if(inputStream.read(buffer) < 0){
+                inputStream.reset();
+                return readBuffer();
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return buffer;
+    }
+
+    private byte[] audioAggregate(byte[] origin, byte[] buffer) {
+        byte[] output = new byte[origin.length];
+        for (int i = 0; i < origin.length; i++) {
+            output[i] = (byte) ((int) origin[i] + (int) buffer[i] / 2);
+        }
+        return output;
     }
 
     @Override
@@ -237,8 +270,14 @@ private void joinChannel(String channelId) {
         }
         // Prevent repeated entry
         join.setEnabled(false);
-
-
+        /** Registers the audio observer object.
+         *
+         * @param observer Audio observer object to be registered. See {@link IAudioFrameObserver IAudioFrameObserver}. Set the value as @p null to cancel registering, if necessary.
+         * @return
+         * - 0: Success.
+         * - < 0: Failure.
+         */
+        engine.registerAudioFrameObserver(audioFrameObserver);
     }
 
     /**
@@ -282,7 +321,6 @@ public void onLeaveChannel(RtcStats stats) {
         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));
-            mAudioPlayer.startPlayer();
             myUid = uid;
             joined = true;
             handler.post(new Runnable() {
@@ -292,7 +330,7 @@ public void run() {
                     mute.setEnabled(true);
                     join.setEnabled(true);
                     join.setText(getString(R.string.leave));
-                    loopback.setEnabled(true);
+                    writeBackAudio.setEnabled(true);
                 }
             });
         }
@@ -372,7 +410,16 @@ public void onActiveSpeaker(int uid) {
     private final IAudioFrameObserver audioFrameObserver = new IAudioFrameObserver() {
         @Override
         public boolean onRecordFrame(AudioFrame audioFrame) {
-            return false;
+            Log.i(TAG, "onRecordAudioFrame " + isWriteBackAudio);
+            if(isWriteBackAudio){
+                ByteBuffer byteBuffer = audioFrame.samples;
+                byte[] buffer = readBuffer();
+                byte[] origin = new byte[byteBuffer.remaining()];
+                byteBuffer.get(origin);
+                byteBuffer.flip();
+                byteBuffer.put(audioAggregate(origin, buffer), 0, byteBuffer.remaining());
+            }
+            return true;
         }
 
         @Override
@@ -402,12 +449,12 @@ public boolean onPlaybackFrameBeforeMixingEx(AudioFrame audioFrame, int uid, Str
 
         @Override
         public int getObservedAudioFramePosition() {
-            return 0;
+            return IAudioFrameObserver.POSITION_RECORD | IAudioFrameObserver.POSITION_MIXED;
         }
 
         @Override
         public AudioParams getRecordAudioParams() {
-            return new AudioParams(SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, Constants.RAW_AUDIO_FRAME_OP_MODE_READ_ONLY, SAMPLES_PER_CALL);
+            return new AudioParams(SAMPLE_RATE, SAMPLE_NUM_OF_CHANNEL, Constants.RAW_AUDIO_FRAME_OP_MODE_READ_WRITE, SAMPLES_PER_CALL);
         }
 
         @Override
@@ -423,6 +470,6 @@ public AudioParams getMixedAudioParams() {
 
     @Override
     public void onCheckedChanged(CompoundButton compoundButton, boolean b) {
-        isEnableLoopBack = b;
+        isWriteBackAudio = b;
     }
 }

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

@@ -7,15 +7,15 @@
     tools:context=".examples.basic.JoinChannelAudio">
 
     <Switch
-        android:id="@+id/loopback"
+        android:id="@+id/audioWriteBack"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_alignParentBottom="true"
         android:layout_marginEnd="16dp"
         android:layout_marginBottom="200dp"
         android:enabled="false"
-        android:text="@string/loopback" />
+        android:text="@string/mixing_audio" />
 
     <androidx.appcompat.widget.AppCompatButton
         android:id="@+id/btn_mute"

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

@@ -139,4 +139,5 @@
     <string name="mixing_playout_vol">混音播放音量</string>
     <string name="effect_control">音效控制</string>
     <string name="audio_effects_vol">音效音量</string>
+    <string name="mixing_audio">混音</string>
 </resources>

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

@@ -143,4 +143,5 @@
     <string name="mixing_playout_vol">Mixing Playout Vol</string>
     <string name="effect_control">Effect Control</string>
     <string name="audio_effects_vol">Audio Effects Vol</string>
+    <string name="mixing_audio">Audio Mixing</string>
 </resources>

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

@@ -3,8 +3,7 @@
 buildscript {
     repositories {
         google()
-        jcenter()
-        maven { url 'https://www.jitpack.io' }
+        mavenCentral()
 
     }
     dependencies {
@@ -20,8 +19,8 @@ buildscript {
 allprojects {
     repositories {
         google()
-        jcenter()
-        maven { url 'https://www.jitpack.io' }
+        mavenCentral()
+        maven { url 'https://jitpack.io' }
     }
 }
 

Android/APIExample/build.gradle

@@ -30,7 +30,7 @@ dependencies {
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
 
-    api 'com.github.agorabuilder:native-full-sdk:3.4.5'
-    api 'io.agora:agoraplayer:1.2.4'
+    api 'io.agora.rtc:full-sdk:3.5.0'
+    api 'io.agora:player:1.3.0'
 
 }

Android/APIExample/lib-component/build.gradle

@@ -54,6 +54,10 @@ public class GLRender {
     private LinkedList<Runnable> mGLDrawTaskList;
     private final Object mDrawLock = new Object();
 
+    private final static int frameRate = 30;
+    private long mLastFrameTime;
+
+
     private Runnable runnableDrawFrame = new Runnable() {
         public void run() {
             doDrawFrame();
@@ -196,6 +200,14 @@ public void onResume() {
     }
 
     public void requestRender() {
+        long tm = System.currentTimeMillis();
+        long tmDiff = tm - mLastFrameTime;
+        if (tmDiff < (1000 / frameRate)) {
+            Log.v(TAG, "drawing too often, drop this frame... ");
+            return;
+        }
+        mLastFrameTime = tm;
+
         if (mGLSurfaceView != null) {
             mGLSurfaceView.requestRender();
         }