[Android]adapt to 4003 version rtc sdk and etc.

Author: xgfd3

.github/ci/build/build_android.sh

@@ -37,7 +37,6 @@
 # pr: output test.zip to workspace dir
 # others: Rename the zip package name yourself, But need copy it to workspace dir
 ##################################
-
 echo Package_Publish: $Package_Publish
 echo is_tag_fetch: $is_tag_fetch
 echo arch: $arch
@@ -72,3 +71,39 @@ cp -rf ./Android/APIExample$(echo $sdk_url | cut -d "/" -f 9 | grep audio_only |
 
 7za a -tzip result.zip -r $unzip_name
 cp result.zip $WORKSPACE/withAPIExample_$zip_name
+
+# install android sdk
+which java
+java --version
+echo ${ANDROID_HOME}
+ls -al ${ANDROID_HOME}/*
+
+cd ./$unzip_name/samples/
+mkdir AndroidSDK
+export ANDROID_HOME=$(pwd)/AndroidSDK
+cd -
+cd ${ANDROID_HOME}
+wget https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip
+unzip commandlinetools-linux-8512546_latest.zip
+export PATH=$(pwd)/cmdline-tools/bin:$PATH
+yes | sdkmanager --licenses --sdk_root=${ANDROID_HOME}
+yes | sdkmanager "platform-tools" "platforms;android-31" --sdk_root=${ANDROID_HOME}
+cd -
+
+# compile apk
+cd ./$unzip_name/samples/API-example
+pwd
+ls -al
+sed -i -e "s#YOUR APP ID#${APP_ID}#g" app/src/main/res/values/string_configs.xml
+sed -i -e "s#YOUR APP CERTIFICATE##g" app/src/main/res/values/string_configs.xml
+sed -i -e "s#YOUR ACCESS TOKEN##g" app/src/main/res/values/string_configs.xml
+rm -f app/src/main/res/values/string_configs.xml-e
+cat app/src/main/res/values/string_configs.xml
+./gradlew clean
+./gradlew :app:assembleDebug
+cp app/build/outputs/apk/debug/app-debug.apk ./APIExample_Android_$(date "+%y%m%d%H").apk
+7za a -tzip result.zip -r *.apk
+cp result.zip $WORKSPACE/APIExample_Android_apk.zip
+ls $WORKSPACE
+cd -
+

Android/APIExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/PreCallTest.java

@@ -41,9 +41,9 @@ public class PreCallTest extends BaseFragment implements View.OnClickListener {
 
     private RtcEngine engine;
     private int myUid;
-    private Button btn_lastmile, btn_echo, btn_device_test;
+    private Button btn_lastmile, btn_echo;
     private StatisticsInfo statisticsInfo;
-    private TextView lastmileQuality, lastmileResult, labelDeviceTest;
+    private TextView lastmileQuality, lastmileResult;
     private static final Integer MAX_COUNT_DOWN = 8;
     private int num;
     private Timer echoTimer;
@@ -121,9 +121,6 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         btn_echo.setOnClickListener(this);
         btn_lastmile = view.findViewById(R.id.btn_lastmile);
         btn_lastmile.setOnClickListener(this);
-        btn_device_test = view.findViewById(R.id.btn_device_test);
-        btn_device_test.setOnClickListener(this);
-        labelDeviceTest = view.findViewById(R.id.lb_device_test);
         lastmileQuality = view.findViewById(R.id.lastmile_quality);
         lastmileResult = view.findViewById(R.id.lastmile_result);
     }
@@ -178,19 +175,6 @@ else if(num >= MAX_COUNT_DOWN) {
                     }
                 }
             }, 1000, 1000);
-        }else if(v.getId() == R.id.btn_device_test){
-            boolean enable = btn_device_test.getTag() instanceof Boolean && (Boolean) btn_device_test.getTag();
-            if(!enable){
-                engine.startRecordingDeviceTest(500);
-                btn_device_test.setText(R.string.stop);
-                btn_device_test.setTag(true);
-                handler.postDelayed(() -> onClick(v), 10* 1000);
-            }else{
-                engine.stopRecordingDeviceTest();
-                btn_device_test.setText(R.string.start);
-                btn_device_test.setTag(null);
-                labelDeviceTest.setText("");
-            }
         }
     }
 
@@ -322,11 +306,6 @@ public void onLastmileProbeResult(LastmileProbeResult lastmileProbeResult) {
             });
         }
 
-        @Override
-        public void onAudioVolumeIndication(AudioVolumeInfo[] speakers, int totalVolume) {
-            super.onAudioVolumeIndication(speakers, totalVolume);
-            runOnUIThread(() -> labelDeviceTest.append("totalVolume=" + totalVolume + "\n"));
-        }
     };
 
     private void updateLastMileResult() {

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

@@ -321,11 +321,6 @@ public boolean onMixedAudioFrame(String channel, int audioFrameType, int samples
             return false;
         }
 
-        @Override
-        public boolean onEarMonitoringAudioFrame(int type, int samplesPerChannel, int bytesPerSample, int channels, int samplesPerSec, ByteBuffer buffer, long renderTimeMs, int avsync_type) {
-            return false;
-        }
-
         @Override
         public boolean onPlaybackAudioFrameBeforeMixing(String channel, int uid, int audioFrameType, int samples, int bytesPerSample, int channels, int samplesPerSec, ByteBuffer byteBuffer, long renderTimeMs, int bufferLength) {
             return false;
@@ -351,10 +346,6 @@ public AudioParams getMixedAudioParams() {
             return null;
         }
 
-        @Override
-        public AudioParams getEarMonitoringAudioParams() {
-            return null;
-        }
     };
 
     /**

Android/APIExample-Audio/app/src/main/java/io/agora/api/example/examples/advanced/SpatialSound.java

@@ -239,6 +239,11 @@ public void onPreloadEvent(String src, Constants.MediaPlayerPreloadEvent event)
 
         }
 
+        @Override
+        public void onCompleted() {
+
+        }
+
         @Override
         public void onAgoraCDNTokenWillExpire() {
 

Android/APIExample-Audio/app/src/main/res/layout/fragment_precall_test.xml

@@ -68,32 +68,4 @@
 
     </RelativeLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"
-        android:layout_marginHorizontal="16dp"
-        android:orientation="vertical"
-        android:layout_marginTop="16dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="RecordingDeviceTest" />
-
-        <androidx.appcompat.widget.AppCompatButton
-            android:id="@+id/btn_device_test"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/start" />
-
-        <TextView
-            android:id="@+id/lb_device_test"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:gravity="bottom"/>
-
-    </LinearLayout>
-
 </LinearLayout>

Android/APIExample/agora-simple-filter/src/main/cpp/AgoraRtcKit/AgoraBase.h

@@ -845,8 +845,6 @@ enum INTERFACE_ID_TYPE {
   AGORA_IID_CLOUD_SPATIAL_AUDIO = 10,
   AGORA_IID_LOCAL_SPATIAL_AUDIO = 11,
   AGORA_IID_MEDIA_RECORDER = 12,
-  AGORA_IID_STATE_SYNC = 13,
-  AGORA_IID_METACHAT_SERVICE = 14,
 };
 
 /**
@@ -1500,7 +1498,6 @@ struct EncodedVideoFrameInfo {
       rotation(VIDEO_ORIENTATION_0),
       trackId(0),
       captureTimeMs(0),
-      decodeTimeMs(0),
       uid(0),
       streamType(VIDEO_STREAM_HIGH) {}
 
@@ -1513,7 +1510,6 @@ struct EncodedVideoFrameInfo {
       rotation(rhs.rotation),
       trackId(rhs.trackId),
       captureTimeMs(rhs.captureTimeMs),
-      decodeTimeMs(rhs.decodeTimeMs),
       uid(rhs.uid),
       streamType(rhs.streamType) {}
 
@@ -1527,7 +1523,6 @@ struct EncodedVideoFrameInfo {
     rotation = rhs.rotation;
     trackId = rhs.trackId;
     captureTimeMs = rhs.captureTimeMs;
-    decodeTimeMs = rhs.decodeTimeMs;
     uid = rhs.uid;
     streamType = rhs.streamType;
     return *this;
@@ -1568,10 +1563,6 @@ struct EncodedVideoFrameInfo {
    * This is a input parameter which means the timestamp for capturing the video.
    */
   int64_t captureTimeMs;
-  /**
-   * The timestamp for decoding the video.
-   */
-  int64_t decodeTimeMs;
   /**
    * ID of the user.
    */
@@ -1605,7 +1596,7 @@ enum VIDEO_MIRROR_MODE_TYPE {
  */
 struct VideoEncoderConfiguration {
   /**
-   * The video encoder code type: #VIDEO_CODEC_TYPE.
+   * The video encoder code type: #VIDEO_CODEC_TYPE. reserved , not used now
    */
   VIDEO_CODEC_TYPE codecType;
   /**
@@ -1776,7 +1767,7 @@ enum SIMULCAST_STREAM_MODE {
   /*
   * disable simulcast stream
   */
-  DISABLE_SIMULCAST_STREM = 0,
+  DISABLE_SIMULCAST_STREAM = 0,
   /*
   * always enable simulcast stream
   */
@@ -1794,14 +1785,14 @@ struct SimulcastStreamConfig {
   /**
    * The video bitrate (Kbps).
    */
-  int kBitrate;
+  int bitrate;
   /**
    * The video framerate.
    */
   int framerate;
-  SimulcastStreamConfig() : dimensions(160, 120), kBitrate(65), framerate(5) {}
+  SimulcastStreamConfig() : dimensions(160, 120), bitrate(65), framerate(5) {}
   bool operator==(const SimulcastStreamConfig& rhs) const {
-    return dimensions == rhs.dimensions && kBitrate == rhs.kBitrate && framerate == rhs.framerate;
+    return dimensions == rhs.dimensions && bitrate == rhs.bitrate && framerate == rhs.framerate;
   }
 };
 
@@ -4374,20 +4365,6 @@ enum VOICE_CONVERSION_PRESET {
   VOICE_CHANGER_BASS = 0x03010400
 };
 
-/** The options for SDK preset headphone equalizer.
- */
-enum HEADPHONE_EQUALIZER_PRESET {
-  /** Turn off headphone EQ and use the original voice.
-   */
-  HEADPHONE_EQUALIZER_OFF = 0x00000000,
-  /** For over-ear headphones.
-   */
-  HEADPHONE_EQUALIZER_OVEREAR = 0x04000001,
-  /** For in-ear headphones.
-   */
-  HEADPHONE_EQUALIZER_INEAR = 0x04000002
-};
-
 /**
  * The screen sharing encoding parameters.
  */
@@ -5351,37 +5328,33 @@ class LicenseCallback {
  */
 struct SpatialAudioParams {
   /**
-   * Speaker azimuth in a spherical coordinate system centered on the listener.
+   * optional azimuth: speaker azimuth in a spherical coordinate system centered on the listener
    */
   Optional<double> speaker_azimuth;
   /**
-   * Speaker elevation in a spherical coordinate system centered on the listener.
+   * optional azimuth: speaker elevation in a spherical coordinate system centered on the listener
    */
   Optional<double> speaker_elevation;
   /**
-   * Distance between speaker and listener.
+   * distance between speaker and listener
    */
   Optional<double> speaker_distance;
   /**
-   * Speaker orientation [0-180], 0 degree is the same with listener orientation.
+   * speaker orientation [0-180]: 0 degree is the same with listener orientation
    */
   Optional<int> speaker_orientation;
   /**
-   * Enable blur or not for the speaker.
+   * enable blur or not for the speaker
    */
   Optional<bool> enable_blur;
   /**
-   * Enable air absorb or not for the speaker.
+   * enable air absorb or not for the speaker
    */
   Optional<bool> enable_air_absorb;
   /**
-   * Speaker attenuation factor.
+   * speaker attenuation factor
    */
   Optional<double> speaker_attenuation;
-  /**
-   * Enable doppler factor.
-   */
-  Optional<bool> enable_doppler;
 };
 
 }  // namespace agora
@@ -5444,28 +5417,3 @@ AGORA_API void setAgoraLicenseCallback(agora::base::LicenseCallback *callback);
  */
 
 AGORA_API agora::base::LicenseCallback* getAgoraLicenseCallback();
-
-/*
- * Get monotonic time in ms which can be used by capture time,
- * typical scenario is as follows:
- * 
- *  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- *  |  // custom audio/video base capture time, e.g. the first audio/video capture time.             |
- *  |  int64_t custom_capture_time_base;                                                             |
- *  |                                                                                                |
- *  |  int64_t agora_monotonic_time = getAgoraCurrentMonotonicTimeInMs();                            |
- *  |                                                                                                |
- *  |  // offset is fixed once calculated in the begining.                                           |
- *  |  const int64_t offset = agora_monotonic_time - custom_capture_time_base;                       |
- *  |                                                                                                |
- *  |  // realtime_custom_audio/video_capture_time is the origin capture time that customer provided.|
- *  |  // actual_audio/video_capture_time is the actual capture time transfered to sdk.              |
- *  |  int64_t actual_audio_capture_time = realtime_custom_audio_capture_time + offset;              |
- *  |  int64_t actual_video_capture_time = realtime_custom_video_capture_time + offset;              |
- *  ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- * 
- * @return
- * - >= 0: Success.
- * - < 0: Failure.
- */
-AGORA_API int64_t AGORA_CALL getAgoraCurrentMonotonicTimeInMs();

Android/APIExample/agora-simple-filter/src/main/cpp/AgoraRtcKit/AgoraMediaBase.h

@@ -603,9 +603,6 @@ struct ExternalVideoFrame {
   /**
    * The timestamp (ms) of the incoming video frame. An incorrect timestamp results in a frame loss or
    * unsynchronized audio and video.
-   * 
-   * Please refer to getAgoraCurrentMonotonicTimeInMs or getCurrentMonotonicTimeInMs
-   * to determine how to fill this filed.
    */
   long long timestamp;
   /**
@@ -863,9 +860,6 @@ class IAudioFrameObserverBase {
     /** The position for observing the audio of a single remote user before mixing
      */
     AUDIO_FRAME_POSITION_BEFORE_MIXING = 0x0008,
-    /** The position for observing the ear monitoring audio of the local user
-     */
-    AUDIO_FRAME_POSITION_EAR_MONITORING = 0x0010,
   };
 
   struct AudioParams {
@@ -929,14 +923,6 @@ class IAudioFrameObserverBase {
    * - false: The mixed audio data is invalid and is not encoded or sent.
    */
   virtual bool onMixedAudioFrame(const char* channelId, AudioFrame& audioFrame) = 0;
-  /**
-   * Occurs when the ear monitoring audio frame is received.
-   * @param audioFrame The reference to the audio frame: AudioFrame.
-   * @return
-   * - true: The ear monitoring audio data is valid and is encoded and sent.
-   * - false: The ear monitoring audio data is invalid and is not encoded or sent.
-   */
-  virtual bool onEarMonitoringAudioFrame(AudioFrame& audioFrame) = 0;
   /**
    * Occurs when the before-mixing playback audio frame is received.
    * @param channelId The channel name
@@ -1006,18 +992,6 @@ class IAudioFrameObserverBase {
    @return Sets the audio format. See AgoraAudioParams.
    */
   virtual AudioParams getMixedAudioParams() = 0;
-
-  /** Sets the ear monitoring audio format
-   **Note**:
-   - The SDK calculates the sample interval according to the `AudioParams`
-   you set in the return value of this callback and triggers the
-   `onEarMonitoringAudioFrame` callback at the calculated sample interval.
-   Sample interval (seconds) = `samplesPerCall`/(`sampleRate` × `channel`).
-   Ensure that the value of sample interval is equal to or greater than 0.01.
-
-   @return Sets the audio format. See AgoraAudioParams.
-   */
-  virtual AudioParams getEarMonitoringAudioParams() = 0;
 };
 
 /**