Fully configure frame processors when they are used directly on an audio stream#679
Fully configure frame processors when they are used directly on an audio stream#6791egoman wants to merge 28 commits into
Conversation
3e5a9ab to
f62c247
Compare
564b2c7 to
8d3f4fe
Compare
| num_channels: int = 1, | ||
| frame_size_ms: int | None = None, | ||
| noise_cancellation: Optional[NoiseCancellationOptions | FrameProcessor[AudioFrame]] = None, | ||
| noise_cancellation_leave_open: bool = False, |
There was a problem hiding this comment.
| noise_cancellation_leave_open: bool = False, |
Can we move that inside NoiseCancellationOptions?
There was a problem hiding this comment.
Unfortunately, no - this is important to the FrameProcessor[AudioFrame] side of that noise_cancellation union. Open to putting it somewhere else but it needs to be settable in the FrameProcessor path.
There was a problem hiding this comment.
hmm, not sure if it's a good idea, but could it be a field on the FrameProcessor interface instead?
Then we could add it to NoiseCancellationOptions and new FrameProcessors would be able to set it on the processor itself
There was a problem hiding this comment.
It's not a setting that a frame processor would always want to have set or not have set, so I'm not sure that would really make sense either.
For context, the reason this is here is so the agents sdk can reuse a single FrameProcessor across multiple underlying tracks. Previously, this wasn't a problem in the way this used to work, because the agents sdk had the responsibility of closing the FrameProcessor, so it could easily do it at room disconnection time. But in order to support the ability to use FrameProcessors directly on an AudioStream, calling close needs to be pushed down deeper than the agents sdk layer. This flag allows the caller to explictly tell AudioStream that they will manage cleaning up the FrameProcessor so that both use cases can continue to work.
There was a problem hiding this comment.
I think this flag is not really configuring the noise suppression behavior, but how AudioStream deals with its own noise suppression, maybe the naming of noise_cancellation_leave_open is a bit confusing ?
how about close_noise_cancellation_on_stream_close or manage_noise_cancellation_processor ?
There was a problem hiding this comment.
It's not a setting that a frame processor would always want to have set or not have set
it could stay undefined by default? 🤷
I understand however that it feels a bit weird for it to live on the processor if the processor itself doesn't really use the field.
We shortly discussed also the option to introduce a restart method on the processor. I think this could still be a viable alternative?
There was a problem hiding this comment.
We shortly discussed also the option to introduce a restart method on the processor. I think this could still be a viable alternative?
It could, but the con there is it's a breaking api change to FrameProcessor.
Just generally, I want to understand what folks' concerns are in more detail. Is it just the noise_cancellation_ prefix naming like shijing suggested (I think out of the two suggestions, I like manage_noise_cancellation_processor better)? Or is there something deeper behavior wise that is concerning?
FWIW, two fairly similar patterns I found:
There was a problem hiding this comment.
Talked to @lukasIO in a 1:1 and he confirmed his concern was mostly with the naming, not with the broad approach, which is helpful.
A few other name ideas, in addition to shijing's suggestions (close_noise_cancellation_on_stream_close / manage_noise_cancellation_processor) - some of these would involve flipping the flag:
shared_noise_cancellationnoise_cancellation_externally_managedauto_close_noise_cancellationowns_noise_cancellation
Out of the above, I think I like auto_close_noise_cancellation the best:
# Usage within agents sdk:
AudioStream.from_track(
# ...
noise_cancellation=frame_processor,
auto_close_noise_cancellation=False,
)I'm going to update the pull request to use it for now in 8d5e656.
Another possible idea: maybe something like the below could be a different way to package the same data which could better contain it. In a world like this, noise_cancellation would be of type Union[NoiseCancellationOptions, FrameProcessorOptions, FrameProcessor]:
AudioStream.from_track(
# ...
noise_cancellation=FrameProcessorOptions(frame_processor=self, leave_open=True)
)Do any of these ideas look better than the current state?
There was a problem hiding this comment.
@theomonnom @xianshijing-lk Lukas gave a a general 👍 to the rename to auto_close_noise_cancellation addressing his concern. Do either of you have further concerns beyond what this rename could accomplish with this approach?
If not / I don't hear anything in the next few days I think I am good to merge this.
…io stream And extracting metadata from that room that can be fed into the frame processor.
…oStream This makes it less complex.
The agents sdk can pass this opt-out flag so that it can reuse the frame processor across many audio tracks
Need to think about this a bit more, this pattern as written won't work, since the FrameProcessor today can't have a set of no-op credentials pushed.
…Processor methods, and use them when moving a track out of a room
These tests exercise all the frame processor track reparenting under room / etc paths.
8d5e656 to
8e3a461
Compare
…ll reconnect When the room does a full reconnect, make sure the audiostream metadata gets a new push with the updated track sid
| if republished.track is not None: | ||
| # Keep the local-track invariant (track.sid == publication.sid, | ||
| # set at publish_track) intact across republish, then re-push | ||
| # metadata so any attached FrameProcessor learns the new | ||
| # publication SID / credentials. _set_room with the same room | ||
| # is a no-op for the token_refreshed listener but re-fans the | ||
| # metadata to every registered AudioStream. | ||
| republished.track._info.sid = republished.sid | ||
| republished.track._set_room(self) |
There was a problem hiding this comment.
Note to any reviewers: the Devin bot surfaced this case where when a full reconnect happens, tracks would not have their metadata kept up to date. I'm not sure if republished.track._info.sid = republished.sid is a good pattern, but wanted to give an opportunity for folks to weigh in on these final late breaking changes before merging.
There was a problem hiding this comment.
didn't dive too deep into this, just a thought: if it's about the metadata being outdated, shouldn't we override all of the track's info ?
There was a problem hiding this comment.
Dug into this a big more - actually, it's not quite that straightforward, since republished.track._info is a TrackInfo, but local_track_republished.info is a TrackPublicationInfo. The overlapping fields are fairly minimal and I think not things which would change on a full reconnect - sid, name, kind, muted, and remote. So I think this is good as is.
…handlers once Previously, calling track._set_room(None) twice would call the handlers twice.
Set _track to None AFTER the unpublished event is fired to be 100% backwards compatible
Updates the python sdk so that
FrameProcessor-based noise cancellation providers can be used directly onAudioStream, without having to go through the agent's RoomIO to be able to initialize itself with credentials.For example, with this change, something like the below becomes possible:
The way this works -
Tracks now keep track of which room they are part of (holding aweakrefvalue). When the room a track is in changes, it computes new frame processor options and sends these to anyAudioStreams which are associated with the track.The
noise_cancellation_leave_openparameter allows the agents sdk to call thisfrom_trackmethod with a frame processor which remains open across the whole session, and won't be auto-closed when the track is closed.This goes along with livekit/agents#5867, which removes the relevant event handling logic in the agents sdk. I will follow up with a node version of this once the python one is in a good state.
Todo