Skip to content

fix: Restarting the playout without audio send streams makes the mic indicator off. #50

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

Closed
cloudwebrtc wants to merge 1 commit into from
Closed

fix: Restarting the playout without audio send streams makes the mic indicator off. #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 11 additions & 0 deletions audio/audio_state.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,17 @@ void AudioState::RemoveSendingStream(webrtc::AudioSendStream* stream) {
UpdateAudioTransportWithSendingStreams();
if (sending_streams_.empty()) {
config_.audio_device_module->StopRecording();
#if defined(WEBRTC_IOS)
auto* adm = config_.audio_device_module.get();
if (adm->Playing()) {
adm->StopPlayout();
if (adm->InitPlayout() == 0) {
Copy link
Member

@davidzhao davidzhao Nov 11, 2022

Choose a reason for hiding this comment

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

what does this mean? we are starting playout after stopping it?

Copy link
Member Author

@cloudwebrtc cloudwebrtc Nov 12, 2022

Choose a reason for hiding this comment

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

Through repeated tests, when the mode is changed to playback, the RTCAudioSession must be reset to stop the capture of the microphone.

Copy link
Member Author

@cloudwebrtc cloudwebrtc Nov 12, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

I'll add a commen describing the intent of this PR.

Copy link
Member

@davidzhao davidzhao Nov 12, 2022

Choose a reason for hiding this comment

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

got it, so it'd have to be restarted after Playout is stopped?

Copy link
Member Author

@cloudwebrtc cloudwebrtc Nov 12, 2022 •
edited
Loading

Choose a reason for hiding this comment

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

If playout is stopped, we should not need to restart it, only need to deal with adm->StopRecording() && adm->Playing()

It means that after the last audio send stream is closed, 1,stop recording, 2, and then reset to release the mic capture state.

if (playout_enabled_) {
adm->StartPlayout();
}
}
}
#endif
}
}

Expand Down
2 changes: 1 addition & 1 deletion sdk/objc/api/peerconnection/RTCAudioDeviceModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

NS_ASSUME_NONNULL_BEGIN

typedef void (^RTCOnAudioDevicesDidUpdate)();
typedef void (^RTCOnAudioDevicesDidUpdate)(void);

RTC_OBJC_EXPORT
@interface RTC_OBJC_TYPE (RTCAudioDeviceModule) : NSObject
Expand Down
4 changes: 2 additions & 2 deletions sdk/objc/components/audio/RTCAudioSession+Configuration.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
@implementation RTC_OBJC_TYPE (RTCAudioSession)
(Configuration)

- (BOOL)setConfiguration : (RTC_OBJC_TYPE(RTCAudioSessionConfiguration) *)configuration error
: (NSError **)outError {
- (BOOL)setConfiguration: (RTC_OBJC_TYPE(RTCAudioSessionConfiguration) *)configuration
error: (NSError **)outError {
return [self setConfiguration:configuration
active:NO
shouldSetActive:NO
Expand Down
11 changes: 5 additions & 6 deletions sdk/objc/components/audio/RTCAudioSession+Private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ NS_ASSUME_NONNULL_BEGIN

@class RTC_OBJC_TYPE(RTCAudioSessionConfiguration);

@interface RTC_OBJC_TYPE (RTCAudioSession)
()
@interface RTC_OBJC_TYPE (RTCAudioSession)()

/** Number of times setActive:YES has succeeded without a balanced call to
* setActive:NO.
*/
@property(nonatomic, readonly) int activationCount;
/** Number of times setActive:YES has succeeded without a balanced call to
* setActive:NO.
*/
@property(nonatomic, readonly) int activationCount;

/** The number of times `beginWebRTCSession` was called without a balanced call
* to `endWebRTCSession`.
Expand Down
4 changes: 2 additions & 2 deletions sdk/objc/components/audio/RTCAudioSession.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ RTC_OBJC_EXPORT
* returned.
* `lockForConfiguration` must be called first.
*/
- (BOOL)setConfiguration : (RTC_OBJC_TYPE(RTCAudioSessionConfiguration) *)configuration error
: (NSError **)outError;
- (BOOL)setConfiguration: (RTC_OBJC_TYPE(RTCAudioSessionConfiguration) *)configuration
error: (NSError **)outError;

/** Convenience method that calls both setConfiguration and setActive.
* `lockForConfiguration` must be called first.
Expand Down