agora-python-server-sdk 2.0.8__tar.gz → 2.1.1__tar.gz

{agora_python_server_sdk-2.0.8/agora_python_server_sdk.egg-info → agora_python_server_sdk-2.1.1}/PKG-INFO

@@ -1,18 +1,18 @@
 Metadata-Version: 2.1
 Name: agora_python_server_sdk
-Version: 2.0.8
+Version: 2.1.1
 Summary: A Python SDK for Agora Server
 Home-page: https://github.com/AgoraIO-Extensions/Agora-Python-Server-SDK
+License: UNKNOWN
+Platform: UNKNOWN
 Classifier: Intended Audience :: Developers
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Topic :: Multimedia :: Sound/Audio
 Classifier: Topic :: Multimedia :: Video
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3 :: Only
-Requires-Python: >=3.8
+Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 
 # Note
@@ -34,7 +34,7 @@ Description-Content-Type: text/markdown
   - MacOS 13 and above
 
 - Python version:
-  - Python 3.8 and above
+  - Python 3.10 and above
 
 # Using Agora-Python-Server-SDK
 ```
@@ -48,6 +48,8 @@ pip install agora_python_server_sdk
 
 ## Executing Test Script
 ```
-python agora_rtc/examples/example_audio_pcm_send.py --appId=xxx --channelId=xxx --userId=xxx --audioFile=./test_data/demo.pcm --sampleRate=16000 --numOfChannels=1
+python agora_rtc/examples/example_audio_pcm_send.py --appId=xxx --channelId=xxx --audioFile=./test_data/demo.pcm --sampleRate=16000 --numOfChannels=1
 ```
 
+
+

{agora_python_server_sdk-2.0.8 → agora_python_server_sdk-2.1.1}/README.md

@@ -17,7 +17,7 @@
   - MacOS 13 and above
 
 - Python version:
-  - Python 3.8 and above
+  - Python 3.10 and above
 
 # Using Agora-Python-Server-SDK
 ```
@@ -31,6 +31,6 @@ pip install agora_python_server_sdk
 
 ## Executing Test Script
 ```
-python agora_rtc/examples/example_audio_pcm_send.py --appId=xxx --channelId=xxx --userId=xxx --audioFile=./test_data/demo.pcm --sampleRate=16000 --numOfChannels=1
+python agora_rtc/examples/example_audio_pcm_send.py --appId=xxx --channelId=xxx --audioFile=./test_data/demo.pcm --sampleRate=16000 --numOfChannels=1
 ```
 

{agora_python_server_sdk-2.0.8 → agora_python_server_sdk-2.1.1}/agora/rtc/__init__.py

@@ -1,16 +1,17 @@
 #!/usr/bin/env python
 
+import hashlib
+import ssl
+import zipfile
+import site
+from urllib import request
+import ctypes
 import os
 import sys
 import logging
 logger = logging.getLogger(__name__)
-import ctypes
-from urllib import request
-import site
-import zipfile
-import ssl
 ssl._create_default_https_context = ssl._create_unverified_context
-import hashlib
+
 
 def get_file_md5(file_path):
     hash_md5 = hashlib.md5()
@@ -19,25 +20,26 @@ def get_file_md5(file_path):
             hash_md5.update(chunk)
     return hash_md5.hexdigest()
 
+
 def _check_download_and_extract_sdk():
     agora_service_path = os.path.dirname(os.path.abspath(__file__))
     sdk_dir = os.path.join(agora_service_path, "agora_sdk")
     zip_path = os.path.join(agora_service_path, "agora_rtc_sdk.zip")
 
-    url = "https://download.agora.io/sdk/release/agora_rtc_sdk_linux_v4.4.30-20241003_233327-366740.zip"
+    url = "https://download.agora.io/sdk/release/agora_rtc_sdk-x86_64-linux-gnu-v4.4.30-20241024_101940-398537.zip"
     libagora_rtc_sdk_path = os.path.join(sdk_dir, "libagora_rtc_sdk.so")
-    rtc_md5 = "f3d5ac80cd56547b0a784f7489f0aca6"
+    rtc_md5 = "7031dd10d1681cd88fd89d68c5b54282"
     if sys.platform == 'darwin':
-        url = "https://download.agora.io/sdk/release/agora_rtc_sdk_mac_v4.4.30_22172_FULL_20241004_0009_366745.zip"
+        url = "https://download.agora.io/sdk/release/agora_rtc_sdk_mac_rel.v4.4.30_22472_FULL_20241024_1224_398653.zip"
         libagora_rtc_sdk_path = os.path.join(sdk_dir, "libAgoraRtcKit.dylib")
-        rtc_md5 = "338a4e4816ada2300c6cbd196b74e220"
+        rtc_md5 = "ca3ca14f9e2b7d97eb2594d1f32dab9f"
 
     if os.path.exists(libagora_rtc_sdk_path) and get_file_md5(libagora_rtc_sdk_path) == rtc_md5:
         return
 
     logger.error("missing agora sdk, now download it, please wait for a while...")
     if os.path.exists(sdk_dir):
-        os.system(f"rm -rf {sdk_dir}")        
+        os.system(f"rm -rf {sdk_dir}")
     os.makedirs(agora_service_path, exist_ok=True)
     if os.path.exists(zip_path):
         os.remove(zip_path)
@@ -52,6 +54,7 @@ def _check_download_and_extract_sdk():
 
     if os.path.exists(zip_path):
         os.remove(zip_path)
+    logger.error("download done, continue...")
 
 
 _check_download_and_extract_sdk()
@@ -61,15 +64,15 @@ lib_path = os.path.join(sdk_dir, 'agora_sdk')
 
 try:
     if sys.platform == 'darwin':
-        lib_agora_rtc_path =os.path.join(lib_path, 'libAgoraRtcKit.dylib')
+        lib_agora_rtc_path = os.path.join(lib_path, 'libAgoraRtcKit.dylib')
         agora_lib = ctypes.CDLL(lib_agora_rtc_path)
 
     elif sys.platform == 'linux':
-        lib_agora_rtc_path =os.path.join(lib_path, 'libagora_rtc_sdk.so')
+        lib_agora_rtc_path = os.path.join(lib_path, 'libagora_rtc_sdk.so')
         ctypes.CDLL(os.path.join(lib_path, 'libagora-fdkaac.so'))
         ctypes.CDLL(os.path.join(lib_path, 'libaosl.so'))
-        agora_lib = ctypes.CDLL(lib_agora_rtc_path)    
+        agora_lib = ctypes.CDLL(lib_agora_rtc_path)
 except OSError as e:
     logger.error(f"Error loading the library: {e}")
     logger.error(f"Attempted to load from: {lib_agora_rtc_path}")
-    sys.exit(1)
+    sys.exit(1)

{agora_python_server_sdk-2.0.8/agora/rtc → agora_python_server_sdk-2.1.1/agora/rtc/_ctypes_handle}/_audio_frame_observer.py

@@ -1,47 +1,11 @@
 import ctypes
-from .agora_base import *
-from .local_user import *
+from ..agora_base import *
+from ..local_user import *
 import ctypes
-from .audio_frame_observer import *
+from ..audio_frame_observer import *
 import logging
 logger = logging.getLogger(__name__)
-
-
-class AudioFrameInner(ctypes.Structure):
-    _fields_ = [
-        ("type", ctypes.c_int),
-        ("samples_per_channel", ctypes.c_int),
-        ("bytes_per_sample", ctypes.c_int),
-        ("channels", ctypes.c_int),
-        ("samples_per_sec", ctypes.c_int),
-        ("buffer", ctypes.c_void_p),
-        ("render_time_ms", ctypes.c_int64),
-        ("avsync_type", ctypes.c_int),
-        ("far_field_flag", ctypes.c_int),
-        ("rms", ctypes.c_int),
-        ("voice_prob", ctypes.c_int),
-        ("music_prob", ctypes.c_int),
-        ("pitch", ctypes.c_int)
-    ]
-    def _to_audio_frame(self):
-        audio_frame = AudioFrame()
-        audio_frame.type = self.type
-        audio_frame.samples_per_channel = self.samples_per_channel
-        audio_frame.bytes_per_sample = self.bytes_per_sample
-        audio_frame.channels = self.channels
-        audio_frame.samples_per_sec = self.samples_per_sec
-        cdata = ctypes.string_at(self.buffer, self.samples_per_channel * self.bytes_per_sample * self.channels)
-        audio_frame.buffer = bytearray(cdata)
-        audio_frame.render_time_ms = self.render_time_ms
-        audio_frame.avsync_type = self.avsync_type
-        audio_frame.far_field_flag = self.far_field_flag
-        audio_frame.rms = self.rms
-        audio_frame.voice_prob = self.voice_prob
-        audio_frame.music_prob = self.music_prob
-        audio_frame.pitch = self.pitch
-
-        return audio_frame
-    
+#from ..audio_sessionctrl import *
 
 ON_RECORD_AUDIO_FRAME_CALLBACK = ctypes.CFUNCTYPE(ctypes.c_int, AGORA_HANDLE, ctypes.c_char_p, ctypes.POINTER(AudioFrameInner))
 ON_PLAYBACK_AUDIO_FRAME_CALLBACK = ctypes.CFUNCTYPE(ctypes.c_int, AGORA_HANDLE, ctypes.c_char_p, ctypes.POINTER(AudioFrameInner))
@@ -54,6 +18,7 @@ ON_GET_RECORD_AUDIO_FRAME_PARAM_CALLBACK = ctypes.CFUNCTYPE(AudioParams, AGORA_H
 ON_GET_MIXED_AUDIO_FRAME_PARAM_CALLBACK = ctypes.CFUNCTYPE(AudioParams, AGORA_HANDLE)
 ON_GET_EAR_MONITORING_AUDIO_FRAME_PARAM_CALLBACK = ctypes.CFUNCTYPE(AudioParams, AGORA_HANDLE)
 
+
 class AudioFrameObserverInner(ctypes.Structure):
     _fields_ = [
         ("on_record_audio_frame", ON_RECORD_AUDIO_FRAME_CALLBACK),
@@ -65,12 +30,12 @@ class AudioFrameObserverInner(ctypes.Structure):
         ("on_get_audio_frame_position", ON_GET_AUDIO_FRAME_POSITION_CALLBACK),
         ("on_get_playback_audio_frame_param", ON_GET_PLAYBACK_AUDIO_FRAME_PARAM_CALLBACK),
         ("on_get_record_audio_frame_param", ON_GET_RECORD_AUDIO_FRAME_PARAM_CALLBACK),
-        
+
         ("on_get_mixed_audio_frame_param", ON_GET_MIXED_AUDIO_FRAME_PARAM_CALLBACK),
         ("on_get_ear_monitoring_audio_frame_param", ON_GET_EAR_MONITORING_AUDIO_FRAME_PARAM_CALLBACK)
     ]
 
-    def __init__(self, observer:IAudioFrameObserver, local_user: 'LocalUser'):
+    def __init__(self, observer: IAudioFrameObserver, local_user: 'LocalUser'):
         self.observer = observer
         self.local_user = local_user
         self.on_record_audio_frame = ON_RECORD_AUDIO_FRAME_CALLBACK(self._on_record_audio_frame)
@@ -79,6 +44,7 @@ class AudioFrameObserverInner(ctypes.Structure):
         self.on_ear_monitoring_audio_frame = ON_EAR_MONITORING_AUDIO_FRAME_CALLBACK(self._on_ear_monitoring_audio_frame)
         self.on_playback_audio_frame_before_mixing = ON_PLAYBACK_AUDIO_FRAME_BEFORE_MIXING_CALLBACK(self._on_playback_audio_frame_before_mixing)
         self.on_get_audio_frame_position = ON_GET_AUDIO_FRAME_POSITION_CALLBACK(self._on_get_audio_frame_position)
+        self._session_ctrl_manager = None #SessionCtrlManager()
 
         # self.on_get_playback_audio_frame_param = ON_GET_PLAYBACK_AUDIO_FRAME_PARAM_CALLBACK(self._on_get_playback_audio_frame_param)
         # self.on_get_record_audio_frame_param = ON_GET_RECORD_AUDIO_FRAME_PARAM_CALLBACK(self._on_get_record_audio_frame_param)
@@ -88,14 +54,14 @@ class AudioFrameObserverInner(ctypes.Structure):
     def _on_record_audio_frame(self, local_user_handle, channel_id, audio_frame_inner):
         logger.debug(f"AudioFrameObserverInner _on_record_audio_frame: {local_user_handle}, {channel_id}, {audio_frame_inner}")
         channel_id_str = channel_id.decode('utf-8')
-        frame = audio_frame_inner.contents._to_audio_frame()
+        frame = audio_frame_inner.contents.get()
         ret = self.observer.on_record_audio_frame(self.local_user, channel_id_str, frame)
         return ret
 
     def _on_playback_audio_frame(self, local_user_handle, channel_id, audio_frame_inner):
         logger.debug(f"AudioFrameObserverInner _on_playback_audio_frame: {local_user_handle}, {channel_id}, {audio_frame_inner}")
         channel_id_str = channel_id.decode('utf-8')
-        frame = audio_frame_inner.contents._to_audio_frame()
+        frame = audio_frame_inner.contents.get()
         ret = self.observer.on_playback_audio_frame(self.local_user, channel_id_str, frame)
         return ret
 
@@ -110,6 +76,10 @@ class AudioFrameObserverInner(ctypes.Structure):
         return ret
 
     def _on_playback_audio_frame_before_mixing(self, local_user_handle, channel_id, user_id, audio_frame_inner):
+        #session control here !
+        #ret, c_data = self._session_ctrl_manager.process_audio_frame(user_id, audio_frame_inner.contents.buffer, audio_frame_inner.contents.samples_per_channel)
+        
+        #print("ret = ", ret)
         #logger.debug(f"AudioFrameObserverInner _on_playback_audio_frame_before_mixing: {local_user_handle}, {channel_id}, {user_id}, {audio_frame_inner}")
         if channel_id is None:
             channel_id_str = ""
@@ -117,10 +87,10 @@ class AudioFrameObserverInner(ctypes.Structure):
             channel_id_str = channel_id.decode('utf-8')
 
         user_id_str = user_id.decode('utf-8')
-        frame = audio_frame_inner.contents._to_audio_frame()
+        frame = audio_frame_inner.contents.get()
         ret = self.observer.on_playback_audio_frame_before_mixing(self.local_user, channel_id_str, user_id_str, frame)
         return ret
-    
+
     def _on_get_audio_frame_position(self, local_user_handle):
         logger.debug(f"AudioFrameObserverInner _on_get_audio_frame_position: {local_user_handle}")
         return self.observer.on_get_audio_frame_position(self.local_user)
@@ -140,4 +110,3 @@ class AudioFrameObserverInner(ctypes.Structure):
     def _on_get_ear_monitoring_audio_frame_param(self, local_user_handle) -> AudioParams:
         logger.debug(f"AudioFrameObserverInner _on_get_ear_monitoring_audio_frame_param: {local_user_handle}")
         return self.observer.on_get_ear_monitoring_audio_frame_param(self.local_user)
-