-
Notifications
You must be signed in to change notification settings - Fork 3.1k
fix(vad): add support for vad reset directly without stream close #5687
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.
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
Open
chenghao-mou
wants to merge
5
commits into
main
Choose a base branch
from
chenghao/fix/vad-reset-with-stt
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
32e9c36
fix(vad): add support for vad reset directly without stream close
chenghao-mou ce721e1
address comments
chenghao-mou 71ff65f
Merge branch 'main' into chenghao/fix/vad-reset-with-stt
chenghao-mou dc88e00
add error for calling reset when not supported
chenghao-mou 09d4a36
update exp filter reset
chenghao-mou File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -71,6 +71,13 @@ class VADEvent: | |
| @dataclass | ||
| class VADCapabilities: | ||
| update_interval: float | ||
| supports_reset: bool = False | ||
| """Whether `VADStream.reset()` is honored by the implementation. | ||
| When True, callers may use `reset()` to clear per-segment state in-place | ||
| without having to recreate the stream. When False, `reset()` is a no-op | ||
| on the audio side; callers should recreate the stream instead. | ||
| """ | ||
|
|
||
|
|
||
| class VAD(ABC, rtc.EventEmitter[Literal["metrics_collected"]]): | ||
|
|
@@ -99,10 +106,15 @@ class VADStream(ABC): | |
| class _FlushSentinel: | ||
| pass | ||
|
|
||
| class _ResetSentinel: | ||
| pass | ||
|
|
||
| def __init__(self, vad: VAD) -> None: | ||
| self._vad = vad | ||
| self._last_activity_time = time.perf_counter() | ||
| self._input_ch = aio.Chan[rtc.AudioFrame | VADStream._FlushSentinel]() | ||
| self._input_ch = aio.Chan[ | ||
| rtc.AudioFrame | VADStream._FlushSentinel | VADStream._ResetSentinel | ||
| ]() | ||
| self._event_ch = aio.Chan[VADEvent]() | ||
|
|
||
| self._tee_aiter = aio.itertools.tee(self._event_ch, 2) | ||
|
|
@@ -158,6 +170,18 @@ def flush(self) -> None: | |
| self._check_not_closed() | ||
| self._input_ch.send_nowait(self._FlushSentinel()) | ||
|
|
||
| def reset(self) -> None: | ||
| """Reset per-segment state without closing the stream. | ||
| Only effective when the underlying VAD advertises | ||
| `VADCapabilities.supports_reset`. For implementations that do not | ||
| support reset, the sentinel is silently dropped; callers that need a | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. should we raise an error when reset is not supported?
Member
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. good point. I'll add that. |
||
| guaranteed reset should recreate the stream instead. | ||
| """ | ||
| self._check_input_not_ended() | ||
| self._check_not_closed() | ||
| self._input_ch.send_nowait(self._ResetSentinel()) | ||
|
|
||
| def end_input(self) -> None: | ||
| """Mark the end of input, no more audio will be pushed""" | ||
| self.flush() | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Do you think we need
reset? Maybeflushcould just do it?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
flush in silero is ignored today. we can reuse the signal to do the reset job.