Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Expose remote audio sample buffers on RTCAudioTrack #84

Merged
merged 17 commits into from
Aug 24, 2023
Merged

Expose remote audio sample buffers on RTCAudioTrack #84

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
938a0de
audio renderer protocol
hiroshihorie Aug 5, 2023
55f98cc
basic set up
hiroshihorie Aug 5, 2023
f1e472e
progress
hiroshihorie Aug 5, 2023
c8717a2
update header year
hiroshihorie Aug 6, 2023
19c4bda
impl
hiroshihorie Aug 8, 2023
0c9367b
stereo
hiroshihorie Aug 11, 2023
82d88f2
fail gracefully
hiroshihorie Aug 11, 2023
ba3f52d
minor fix
hiroshihorie Aug 11, 2023
a4d14d5
doc
hiroshihorie Aug 11, 2023
499f778
optimize AudioStreamBasicDescription
hiroshihorie Aug 23, 2023
8526e1f
logging
hiroshihorie Aug 23, 2023
b5dbec7
minor refactoring
hiroshihorie Aug 23, 2023
5906052
weak reference to delegates
hiroshihorie Aug 23, 2023
1b80bda
fix timestamp computation
hiroshihorie Aug 23, 2023
c0d5abf
change swift delegate signature
hiroshihorie Aug 23, 2023
d309ecb
use os_unfair_lock instead
hiroshihorie Aug 24, 2023
de0ba1f
avoid deadlock
hiroshihorie Aug 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions sdk/objc/api/peerconnection/RTCAudioTrack.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,23 +42,26 @@ void OnData(const void *audio_data,
absl::optional<int64_t> absolute_capture_timestamp_ms) override {
/*
* Convert to CMSampleBuffer
* TODO: Handle case which number_of_channels could be 2 or more.
*/
int64_t elapsed_time_ms =
absolute_capture_timestamp_ms ? absolute_capture_timestamp_ms.value() : rtc::TimeMillis();

OSStatus status;

// Only mono or stereo is supported currently.
assert(number_of_channels == 1 || number_of_channels == 2);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this would crash the app right? should it fail gracefully?


AudioChannelLayout acl;
bzero(&acl, sizeof(acl));
acl.mChannelLayoutTag = kAudioChannelLayoutTag_Mono;
acl.mChannelLayoutTag =
number_of_channels == 2 ? kAudioChannelLayoutTag_Stereo : kAudioChannelLayoutTag_Mono;

AudioStreamBasicDescription audioFormat;
audioFormat.mSampleRate = sample_rate;
audioFormat.mFormatID = kAudioFormatLinearPCM;
audioFormat.mFormatFlags = kLinearPCMFormatFlagIsSignedInteger | kLinearPCMFormatFlagIsPacked;
audioFormat.mFramesPerPacket = 1;
audioFormat.mChannelsPerFrame = 1;
audioFormat.mFramesPerPacket = number_of_frames;
audioFormat.mChannelsPerFrame = number_of_channels;
audioFormat.mBitsPerChannel = 16;
audioFormat.mBytesPerPacket = audioFormat.mFramesPerPacket * audioFormat.mChannelsPerFrame *
audioFormat.mBitsPerChannel / 8;
Expand Down