summaryrefslogtreecommitdiffstats
path: root/webkit/media/webmediaplayer_ms.cc
diff options
context:
space:
mode:
authorxians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-24 23:57:01 +0000
committerxians@chromium.org <xians@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-24 23:57:01 +0000
commitf5b8debf70c5949bb8ea1fd977f3934ba3340d70 (patch)
treef29f1da6e7435c56e2be54a92bfb2606fbc07c07 /webkit/media/webmediaplayer_ms.cc
parent2c7beb035c0a62ed94e2fffeea722520fd02b5ea (diff)
downloadchromium_src-f5b8debf70c5949bb8ea1fd977f3934ba3340d70.zip
chromium_src-f5b8debf70c5949bb8ea1fd977f3934ba3340d70.tar.gz
chromium_src-f5b8debf70c5949bb8ea1fd977f3934ba3340d70.tar.bz2
Allowing multiple MediaPlayers to connect to WebRtcAudioDeviceImpl by sharing one WebRtcAudioRenderer.
The audio is gone when new peerconnection is connecting to a media stream. What is happening is that the stream will pause the existing MediaPlayer and create new MediaPlayers to associated to it. But since we only allow one WebRtcAudioRenderer to connect to WebRtcAudioDeviceImpl, the new MediaPlayers audio won't be able to associate to stream. This patch fixes the problem by allowing multiple MediaPlayers to connect to WebRtcAudioDeviceImpl by sharing one WebRtcAudioRenderer BUG=158721 TEST= Use http://www.corp.google.com/~xians/rtc_peerconnection_multi.html to allow the page to create two mediastreams. 2. Click on the add button once to create a PeerConnection. Notice that you can here audio. 3. Click on the add button again. Notice that you can see another video stream but the audio playout stops. Review URL: https://chromiumcodereview.appspot.com/11896089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@178699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media/webmediaplayer_ms.cc')
-rw-r--r--webkit/media/webmediaplayer_ms.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/webkit/media/webmediaplayer_ms.cc b/webkit/media/webmediaplayer_ms.cc
index de5ce35..ac9a430 100644
--- a/webkit/media/webmediaplayer_ms.cc
+++ b/webkit/media/webmediaplayer_ms.cc
@@ -157,7 +157,7 @@ void WebMediaPlayerMS::pause() {
if (video_frame_provider_)
video_frame_provider_->Pause();
- if (audio_renderer_)
+ if (audio_renderer_ && !paused_)
audio_renderer_->Pause();
paused_ = true;