Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1513)

Unified Diff: content/renderer/media/webrtc_audio_device_impl.cc

Issue 11783059: Ensures that WebRTC works for device selection using a different sample rate than default (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix after review from Chris Created 7 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webrtc_audio_device_impl.cc
diff --git a/content/renderer/media/webrtc_audio_device_impl.cc b/content/renderer/media/webrtc_audio_device_impl.cc
index d1968d55c0915d90828e6890dbb1023fca860f72..e2f270f5f99c8b7373237b1e9f5b33c68c428497 100644
--- a/content/renderer/media/webrtc_audio_device_impl.cc
+++ b/content/renderer/media/webrtc_audio_device_impl.cc
@@ -36,7 +36,6 @@ WebRtcAudioDeviceImpl::WebRtcAudioDeviceImpl()
output_delay_ms_(0),
last_error_(AudioDeviceModule::kAdmErrNone),
last_process_time_(base::TimeTicks::Now()),
- session_id_(0),
initialized_(false),
playing_(false),
agc_is_enabled_(false) {
@@ -214,6 +213,7 @@ void WebRtcAudioDeviceImpl::CaptureData(const int16* audio_data,
void WebRtcAudioDeviceImpl::SetCaptureFormat(
const media::AudioParameters& params) {
+ DVLOG(1) << "WebRtcAudioDeviceImpl::SetCaptureFormat()";
input_audio_parameters_ = params;
}
@@ -492,11 +492,6 @@ int32_t WebRtcAudioDeviceImpl::StartRecording() {
return -1;
}
- if (session_id_ <= 0) {
- LOG(ERROR) << session_id_ << " is an invalid session id.";
- return -1;
- }
-
if (capturer_->is_recording()) {
// webrtc::VoiceEngine assumes that it is OK to call Start() twice and
// that the call is ignored the second time.
@@ -505,8 +500,7 @@ int32_t WebRtcAudioDeviceImpl::StartRecording() {
start_capture_time_ = base::Time::Now();
- // Specify the session_id which is mapped to a certain device.
- capturer_->SetDevice(session_id_);
+ // Start capturing using the selected device.
capturer_->Start();
return 0;
}
@@ -880,8 +874,4 @@ int32_t WebRtcAudioDeviceImpl::GetLoudspeakerStatus(bool* enabled) const {
return -1;
}
-void WebRtcAudioDeviceImpl::SetSessionId(int session_id) {
- session_id_ = session_id;
-}
-
} // namespace content
« no previous file with comments | « content/renderer/media/webrtc_audio_device_impl.h ('k') | content/renderer/media/webrtc_audio_device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698