Merge 198717 "Fixed the crash when the WebRtcAudioCapturer::|buf..."

content/renderer/media/webrtc_audio_capturer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webrtc_audio_capturer.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
@@ skipping 183 matching lines @@
 WebRtcAudioCapturer::~WebRtcAudioCapturer() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(tracks_.empty());
   DCHECK(!running_);
   DVLOG(1) << "WebRtcAudioCapturer::~WebRtcAudioCapturer()";
 }
 
 void WebRtcAudioCapturer::AddSink(
     WebRtcAudioCapturerSink* track) {
   DCHECK(thread_checker_.CalledOnValidThread());
+  DCHECK(track);
   DVLOG(1) << "WebRtcAudioCapturer::AddSink()";
   base::AutoLock auto_lock(lock_);
   // Verify that |track| is not already added to the list.
   DCHECK(std::find_if(
       tracks_.begin(), tracks_.end(),
       WebRtcAudioCapturerSinkOwner::WrapsSink(track)) == tracks_.end());
+
+  if (buffer_.get()) {
+    track->SetCaptureFormat(buffer_->params());
+  } else {
+    DLOG(WARNING) << "The format of the capturer has not been correctly "
+                  <<  "initialized";
+  }
+
   // Create (and add to the list) a new WebRtcAudioCapturerSinkOwner which owns
   // the |track| and delagates all calls to the WebRtcAudioCapturerSink
   // interface.
   tracks_.push_back(new WebRtcAudioCapturerSinkOwner(track));
   // TODO(xians): should we call SetCapturerFormat() to each track?
 }
 
 void WebRtcAudioCapturer::RemoveSink(
     WebRtcAudioCapturerSink* track) {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 152 matching lines @@
                        audio_delay_milliseconds, volume);
   }
 }
 
 void WebRtcAudioCapturer::OnCaptureError() {
   NOTIMPLEMENTED();
 }
 
 media::AudioParameters WebRtcAudioCapturer::audio_parameters() const {
   base::AutoLock auto_lock(lock_);
-  return buffer_->params();
+  // |buffer_| can be NULL when SetCapturerSource() or Initialize() has not
+  // been called.
+  return buffer_.get() ? buffer_->params() : media::AudioParameters();
 }
 
 }  // namespace content