From 94200038935d2c5d80c86e355a9f084310129703 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Monnom?= Date: Thu, 6 Mar 2025 21:21:20 +0100 Subject: [PATCH 1/2] remove old resampler --- livekit-rtc/livekit/rtc/audio_frame.py | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/livekit-rtc/livekit/rtc/audio_frame.py b/livekit-rtc/livekit/rtc/audio_frame.py index 4c364efc..404620fb 100644 --- a/livekit-rtc/livekit/rtc/audio_frame.py +++ b/livekit-rtc/livekit/rtc/audio_frame.py @@ -93,28 +93,6 @@ def _from_owned_info(owned_info: proto_audio.OwnedAudioFrameBuffer) -> "AudioFra FfiHandle(owned_info.handle.id) return AudioFrame(data, info.sample_rate, info.num_channels, info.samples_per_channel) - def remix_and_resample(self, sample_rate: int, num_channels: int) -> "AudioFrame": - """Resample the audio frame to the given sample rate and number of channels. - - .. warning:: - This method is deprecated and will be removed in a future release. - Please use the `rtc.AudioResampler` class instead. - """ - req = proto_ffi.FfiRequest() - req.new_audio_resampler.CopyFrom(proto_audio.NewAudioResamplerRequest()) - - resp = FfiClient.instance.request(req) - resampler_handle = FfiHandle(resp.new_audio_resampler.resampler.handle.id) - - resample_req = proto_ffi.FfiRequest() - resample_req.remix_and_resample.resampler_handle = resampler_handle.handle - resample_req.remix_and_resample.buffer.CopyFrom(self._proto_info()) - resample_req.remix_and_resample.sample_rate = sample_rate - resample_req.remix_and_resample.num_channels = num_channels - - resp = FfiClient.instance.request(resample_req) - return AudioFrame._from_owned_info(resp.remix_and_resample.buffer) - def _proto_info(self) -> proto_audio.AudioFrameBufferInfo: audio_info = proto_audio.AudioFrameBufferInfo() audio_info.data_ptr = get_address(memoryview(self._data)) From fc0e88e2b77a7e448bea8143360525804cf2daeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?The=CC=81o=20Monnom?= Date: Thu, 6 Mar 2025 21:22:06 +0100 Subject: [PATCH 2/2] ruff --- livekit-rtc/livekit/rtc/audio_frame.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/livekit-rtc/livekit/rtc/audio_frame.py b/livekit-rtc/livekit/rtc/audio_frame.py index 404620fb..3dadabf0 100644 --- a/livekit-rtc/livekit/rtc/audio_frame.py +++ b/livekit-rtc/livekit/rtc/audio_frame.py @@ -13,9 +13,8 @@ # limitations under the License. import ctypes -from ._ffi_client import FfiHandle, FfiClient +from ._ffi_client import FfiHandle from ._proto import audio_frame_pb2 as proto_audio -from ._proto import ffi_pb2 as proto_ffi from ._utils import get_address from typing import Any, Union