Adjust to Agora SDK v4 (#15)

Author: varsill

.circleci/config.yml

@@ -7,13 +7,6 @@ workflows:
   build:
     jobs:
       - elixir/build_test:
-          # post-steps: # steps to run after steps defined in the job bar
-          #     - elixir/use_build_cache:
-          #         cache-version: 3
-          #         env: test
-          #         regenerate: true
-          #         before-save:
-          #           - run: mix compile --force --warnings-as-errors
           filters: &filters
             tags:
               only: /v.*/

README.md

@@ -20,7 +20,7 @@ docker run -it membraneframeworklabs/docker_membrane
 
 To use that plugin in your project, add the following line to your deps in `mix.exs`:
 ```
-	{:membrane_agora_plugin, "~> 0.2.5"}
+	{:membrane_agora_plugin, "~> 0.3.0"}
 ```
 
 Run `mix deps.get`.

c_src/membrane_agora_plugin/source/sample_audio_frame_observer.h

@@ -24,4 +24,14 @@ class SampleAudioFrameObserver : public media::IAudioFrameObserverBase {
   bool onPlaybackAudioFrameBeforeMixing(const char *channelId,
                                         media::base::user_id_t uid,
                                         AudioFrame &audioFrame) override;
+
+  int getObservedAudioFramePosition() override {return 0;};
+
+  AudioParams getPlaybackAudioParams() override {return  AudioParams();};
+
+  AudioParams getRecordAudioParams()  override {return  AudioParams();};
+
+  AudioParams getMixedAudioParams() override {return  AudioParams();};
+
+  AudioParams getEarMonitoringAudioParams() override {return AudioParams();};
 };

c_src/membrane_agora_plugin/source/sample_local_user_observer.cpp

@@ -2,9 +2,6 @@
 
 void SampleLocalUserObserver::onAudioTrackPublishSuccess(
     agora_refptr<ILocalAudioTrack> audioTrack) {}
-void SampleLocalUserObserver::onLocalAudioTrackStateChanged(
-    agora_refptr<ILocalAudioTrack> audioTrack, LOCAL_AUDIO_STREAM_STATE state,
-    LOCAL_AUDIO_STREAM_ERROR errorCode) {}
 void SampleLocalUserObserver::onLocalAudioTrackStatistics(
     const LocalAudioStats &stats) {}
 void SampleLocalUserObserver::onRemoteAudioTrackStatistics(
@@ -69,3 +66,8 @@ void SampleLocalUserObserver::onFirstRemoteVideoFrame(user_id_t userId,
 void SampleLocalUserObserver::onUserVideoTrackSubscribed(
     user_id_t userId, VideoTrackInfo trackInfo,
     agora_refptr<IRemoteVideoTrack> videoTrack) {}
+
+void SampleLocalUserObserver::onVideoTrackUnpublished(agora_refptr<ILocalVideoTrack> videoTrack) {}
+void SampleLocalUserObserver::onVideoTrackPublishStart(agora_refptr<ILocalVideoTrack> videoTrack) {}
+void SampleLocalUserObserver::onAudioTrackUnpublished(agora_refptr<ILocalAudioTrack> audioTrack) {}
+void SampleLocalUserObserver::onAudioTrackPublishStart(agora_refptr<ILocalAudioTrack> audioTrack) {}

c_src/membrane_agora_plugin/source/sample_local_user_observer.h

@@ -12,10 +12,6 @@ class SampleLocalUserObserver : public ILocalUserObserver {
   ~SampleLocalUserObserver() {}
   void onAudioTrackPublishSuccess(
       agora_refptr<ILocalAudioTrack> audioTrack) override;
-  void
-  onLocalAudioTrackStateChanged(agora_refptr<ILocalAudioTrack> audioTrack,
-                                LOCAL_AUDIO_STREAM_STATE state,
-                                LOCAL_AUDIO_STREAM_ERROR errorCode) override;
   void onLocalAudioTrackStatistics(const LocalAudioStats &stats) override;
   void
   onRemoteAudioTrackStatistics(agora_refptr<IRemoteAudioTrack> audioTrack,
@@ -81,4 +77,9 @@ class SampleLocalUserObserver : public ILocalUserObserver {
   void onUserVideoTrackSubscribed(
       user_id_t userId, VideoTrackInfo trackInfo,
       agora_refptr<IRemoteVideoTrack> videoTrack) override;
+
+  void onVideoTrackUnpublished(agora_refptr<ILocalVideoTrack> videoTrack) override;
+  void onVideoTrackPublishStart(agora_refptr<ILocalVideoTrack> videoTrack) override;
+  void onAudioTrackUnpublished(agora_refptr<ILocalAudioTrack> audioTrack) override;
+  void onAudioTrackPublishStart(agora_refptr<ILocalAudioTrack> audioTrack) override;
 };

c_src/membrane_agora_plugin/source/sample_video_encoded_frame_observer.cpp

@@ -3,7 +3,7 @@
 #include <unifex/payload.h>
 #include <unifex/unifex.h>
 
-bool SampleVideoEncodedFrameObserver::OnEncodedVideoFrame(
+bool SampleVideoEncodedFrameObserver::onEncodedVideoFrameReceived(
     uid_t uid, const uint8_t *imageBuffer, size_t length,
     const EncodedVideoFrameInfo &videoEncodedFrameInfo) {
   UnifexEnv *env = unifex_alloc_env(NULL);

c_src/membrane_agora_plugin/source/sample_video_encoded_frame_observer.h

@@ -15,7 +15,7 @@ class SampleVideoEncodedFrameObserver
   SampleVideoEncodedFrameObserver(UnifexPid destination)
       : _destination(destination) {}
 
-  bool OnEncodedVideoFrame(
+  bool onEncodedVideoFrameReceived(
       uid_t uid, const uint8_t *imageBuffer, size_t length,
       const EncodedVideoFrameInfo &videoEncodedFrameInfo) override;
 };

install.sh

@@ -1,8 +1,8 @@
 #! /bin/bash
 if ! test -d ./agora_sdk; then
-    wget https://download.agora.io/sdk/release/Agora-RTC-x86_64-linux-gnu-v3.8.202.20-20220627_152601-214165.tgz
-    tar xvf Agora-RTC-x86_64-linux-gnu-v3.8.202.20-20220627_152601-214165.tgz
-    rm  Agora-RTC-x86_64-linux-gnu-v3.8.202.20-20220627_152601-214165.tgz
+    wget https://download.agora.io/rtsasdk/release/Agora-RTC-x86_64-linux-gnu-v4.2.30-20240202_172130-292462.tgz
+    tar xvf Agora-RTC-x86_64-linux-gnu-v4.2.30-20240202_172130-292462.tgz
+    rm  Agora-RTC-x86_64-linux-gnu-v4.2.30-20240202_172130-292462.tgz
     mv agora_rtc_sdk/agora_sdk .
     rm -r agora_rtc_sdk
-fi
+fi

mix.exs

@@ -1,7 +1,7 @@
 defmodule Membrane.Agora.Mixfile do
   use Mix.Project
 
-  @version "0.2.5"
+  @version "0.3.0"
   @github_url "https://github.com/membraneframework/membrane_agora_plugin"
 
   def project do
@@ -44,7 +44,7 @@ defmodule Membrane.Agora.Mixfile do
       {:membrane_raw_audio_format, "~> 0.12.0"},
       {:unifex, "~> 1.1"},
       {:membrane_file_plugin, "~> 0.16.0", only: :test},
-      {:membrane_h264_plugin, "~> 0.9.0", only: :test},
+      {:membrane_h26x_plugin, "~> 0.10.0", only: :test},
       {:membrane_aac_plugin, "~> 0.18.1", only: :test},
       {:membrane_realtimer_plugin, "~> 0.9.0", only: :test},
       {:ex_doc, ">= 0.0.0", only: :dev, runtime: false},

mix.lock

@@ -23,7 +23,8 @@
   "membrane_core": {:hex, :membrane_core, "1.1.2", "3ca206893e1d3739a24d5092d21c06fcb4db326733a1798f9788fc53abb74829", [:mix], [{:bunch, "~> 1.6", [hex: :bunch, repo: "hexpm", optional: false]}, {:qex, "~> 0.3", [hex: :qex, repo: "hexpm", optional: false]}, {:ratio, "~> 3.0 or ~> 4.0", [hex: :ratio, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a989fd7e0516a7e66f5fb63950b1027315b7f8c8d82d8d685e178b0fb780901b"},
   "membrane_file_plugin": {:hex, :membrane_file_plugin, "0.16.0", "7917f6682c22b9bcfc2ca20ed960eee0f7d03ad31fd5f59ed850f1fe3ddd545a", [:mix], [{:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "b0727998f75a9b4dab8a2baefdfc13c3eac00a04e061ab1b0e61dc5566927acc"},
   "membrane_h264_format": {:hex, :membrane_h264_format, "0.6.1", "44836cd9de0abe989b146df1e114507787efc0cf0da2368f17a10c47b4e0738c", [:mix], [], "hexpm", "4b79be56465a876d2eac2c3af99e115374bbdc03eb1dea4f696ee9a8033cd4b0"},
-  "membrane_h264_plugin": {:hex, :membrane_h264_plugin, "0.9.3", "5b9407c5eaff97b04667778e62f5f851011aeea2494fa2d14fc2448109babe7a", [:mix], [{:bunch, "~> 1.4", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_h264_format, "~> 0.6.0", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}], "hexpm", "588e2e36051bc14d9a1e47dc6272fdccd6d24a7307fe7b4e417aa66afa962994"},
+  "membrane_h265_format": {:hex, :membrane_h265_format, "0.2.0", "1903c072cf7b0980c4d0c117ab61a2cd33e88782b696290de29570a7fab34819", [:mix], [], "hexpm", "6df418bdf242c0d9f7dbf2e5aea4c2d182e34ac9ad5a8b8cef2610c290002e83"},
+  "membrane_h26x_plugin": {:hex, :membrane_h26x_plugin, "0.10.2", "caf2790d8c107df35f8d456b45f4e09fb9c56ce6c7669a3a03f7d59972e6ed82", [:mix], [{:bunch, "~> 1.4", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}, {:membrane_h264_format, "~> 0.6.0", [hex: :membrane_h264_format, repo: "hexpm", optional: false]}, {:membrane_h265_format, "~> 0.2.0", [hex: :membrane_h265_format, repo: "hexpm", optional: false]}], "hexpm", "becf1ac4a589adecd850137ccd61a33058f686083a514a7e39fcd721bcf9fb2e"},
   "membrane_raw_audio_format": {:hex, :membrane_raw_audio_format, "0.12.0", "b574cd90f69ce2a8b6201b0ccf0826ca28b0fbc8245b8078d9f11cef65f7d5d5", [:mix], [{:bimap, "~> 1.1", [hex: :bimap, repo: "hexpm", optional: false]}, {:bunch, "~> 1.0", [hex: :bunch, repo: "hexpm", optional: false]}, {:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "6e6c98e3622a2b9df19eab50ba65d7eb45949b1ba306fa8423df6cdb12fd0b44"},
   "membrane_realtimer_plugin": {:hex, :membrane_realtimer_plugin, "0.9.0", "27210d5e32a5e8bfd101c41e4d8c1876e873a52cc129ebfbee4d0ccbea1cbd21", [:mix], [{:membrane_core, "~> 1.0", [hex: :membrane_core, repo: "hexpm", optional: false]}], "hexpm", "b2e96d62135ee57ef9a5fdea94b3a9ab1198e5ea8ee248391b89c671125d1b51"},
   "mime": {:hex, :mime, "2.0.6", "8f18486773d9b15f95f4f4f1e39b710045fa1de891fada4516559967276e4dc2", [:mix], [], "hexpm", "c9945363a6b26d747389aac3643f8e0e09d30499a138ad64fe8fd1d13d9b153e"},

test/integration_test.exs

@@ -53,7 +53,8 @@ defmodule Membrane.Agora.IntegrationTest do
   end
 
   defp get_h264_frames(path) do
-    alias Membrane.H264.Parser.{AUSplitter, NALuParser, NALuSplitter}
+    alias Membrane.H264.{AUSplitter, NALuParser}
+    alias Membrane.H26x.NALuSplitter
     bytestream = File.read!(path)
 
     nalu_splitter = NALuSplitter.new()