YangWX/crossdesk
1
0
Fork 0
mirror of https://github.com/kunkundi/crossdesk.git synced 2025-12-17 04:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

[fix] macOS: fix audio capture, refs #29

Browse Source
This commit is contained in:
dijunkun
2025-11-30 17:13:02 +08:00
parent feb9f2f460
commit 91d42b6561
2 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/gui/render.cpp
View File

@@ -365,13 +365,16 @@ int Render::StartSpeakerCapturer() {
if (speaker_capturer_) { if (speaker_capturer_) {
speaker_capturer_->Start(); speaker_capturer_->Start();
start_speaker_capturer_ = true;
} }
return 0; return 0;
} }
int Render::StopSpeakerCapturer() { int Render::StopSpeakerCapturer() {
if (speaker_capturer_) { if (speaker_capturer_) {
speaker_capturer_->Stop(); speaker_capturer_->Stop();
start_speaker_capturer_ = false;
} }
return 0; return 0;

47
src/speaker_capturer/macosx/speaker_capturer_macosx.mm
View File

@@ -38,8 +38,50 @@ class SpeakerCapturerMacosx;
if (_owner->cb_ && dataPtr && length > 0 && asbd) { if (_owner->cb_ && dataPtr && length > 0 && asbd) {
std::vector<short> out_pcm16; std::vector<short> out_pcm16;
// ... 数据转换逻辑保持不变 ... if (asbd->mFormatFlags & kAudioFormatFlagIsFloat) {
// 调用回调 int channels = asbd->mChannelsPerFrame;
int samples = (int)(length / sizeof(float));
float* floatData = (float*)dataPtr;
std::vector<short> pcm16(samples);
for (int i = 0; i < samples; ++i) {
float v = floatData[i];
if (v > 1.0f) v = 1.0f;
if (v < -1.0f) v = -1.0f;
pcm16[i] = (short)(v * 32767.0f);
}
if (channels > 1) {
int mono_samples = samples / channels;
out_pcm16.resize(mono_samples);
for (int i = 0; i < mono_samples; ++i) {
int sum = 0;
for (int c = 0; c < channels; ++c) {
sum += pcm16[i * channels + c];
}
out_pcm16[i] = sum / channels;
}
} else {
out_pcm16 = std::move(pcm16);
}
} else if (asbd->mBitsPerChannel == 16) {
int channels = asbd->mChannelsPerFrame;
int samples = (int)(length / 2);
short* src = (short*)dataPtr;
if (channels > 1) {
int mono_samples = samples / channels;
out_pcm16.resize(mono_samples);
for (int i = 0; i < mono_samples; ++i) {
int sum = 0;
for (int c = 0; c < channels; ++c) {
sum += src[i * channels + c];
}
out_pcm16[i] = sum / channels;
}
} else {
out_pcm16.assign(src, src + samples);
}
}
size_t frame_bytes = 960; // 480 * 2 size_t frame_bytes = 960; // 480 * 2
size_t total_bytes = out_pcm16.size() * sizeof(short); size_t total_bytes = out_pcm16.size() * sizeof(short);
unsigned char* p = (unsigned char*)out_pcm16.data(); unsigned char* p = (unsigned char*)out_pcm16.data();
@@ -48,6 +90,7 @@ class SpeakerCapturerMacosx;
} }
} }
} }
@end @end
namespace crossdesk { namespace crossdesk {