Bug 1397793 - Misc stuff that I found in my patch set. I don't think they are useful.
MozReview-Commit-ID: 3MjroQl1wf4
--- a/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
+++ b/dom/media/webrtc/MediaEngineWebRTCAudio.cpp
@@ -442,34 +442,22 @@ MediaEngineWebRTCMicrophoneSource::Updat
switch (mState) {
case kReleased:
MOZ_ASSERT(aHandle);
if (sChannelsOpen != 0) {
// Until we fix (or wallpaper) support for multiple mic input
// (Bug 1238038) fail allocation for a second device
return NS_ERROR_FAILURE;
}
- if (mAudioInput->SetRecordingDevice(mCapIndex)) {
- return NS_ERROR_FAILURE;
- }
mAudioInput->SetUserChannelCount(prefs.mChannels);
if (!AllocChannel()) {
FreeChannel();
LOG(("Audio device is not initalized"));
return NS_ERROR_FAILURE;
}
- LOG(("Audio device %d allocated", mCapIndex));
- {
- // Update with the actual applied channelCount in order
- // to store it in settings.
- uint32_t channelCount = 0;
- mAudioInput->GetChannelCount(channelCount);
- MOZ_ASSERT(channelCount > 0);
- prefs.mChannels = channelCount;
- }
break;
case kStarted:
if (prefs == mLastPrefs) {
return NS_OK;
}
if (prefs.mChannels != mLastPrefs.mChannels) {
@@ -1063,18 +1051,16 @@ MediaEngineWebRTCMicrophoneSource::Shutd
}
while (mRegisteredHandles.Length()) {
MOZ_ASSERT(mState == kAllocated || mState == kStopped);
// on last Deallocate(), FreeChannel()s and DeInit()s if all channels are released
Deallocate(mRegisteredHandles[0].get());
}
MOZ_ASSERT(mState == kReleased);
-
- mAudioInput = nullptr;
}
void
MediaEngineWebRTCAudioCaptureSource::GetName(nsAString &aName) const
{
aName.AssignLiteral("AudioCapture");
}