Adding audio support to the new webmediaplyer

webkit/media/webmediaplayer_ms.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 "webkit/media/webmediaplayer_ms.h"
 
 #include <limits>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "media/base/media_log.h"
+#include "media/base/rtc_audio_renderer.h"
 #include "media/base/video_frame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMediaPlayerClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebRect.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebSize.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "webkit/media/media_stream_client.h"
 #include "webkit/media/video_frame_provider.h"
@@ skipping 34 matching lines @@
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_CREATED));
 }
 
 WebMediaPlayerMS::~WebMediaPlayerMS() {
   DVLOG(1) << "WebMediaPlayerMS::dtor";
   DCHECK(thread_checker_.CalledOnValidThread());
   if (video_frame_provider_) {
     video_frame_provider_->Stop();
   }
 
+  if (audio_renderer_) {
+    audio_renderer_->Stop();
+  }
+
   media_log_->AddEvent(
       media_log_->CreateEvent(media::MediaLogEvent::WEBMEDIAPLAYER_DESTROYED));
 
   if (delegate_)
     delegate_->PlayerGone(this);
 }
 
 void WebMediaPlayerMS::load(const WebKit::WebURL& url, CORSMode cors_mode) {
   DVLOG(1) << "WebMediaPlayerMS::load";
   DCHECK(thread_checker_.CalledOnValidThread());
 
   GURL gurl(url);
 
   setVolume(GetClient()->volume());
   SetNetworkState(WebMediaPlayer::NetworkStateLoading);
   SetReadyState(WebMediaPlayer::ReadyStateHaveNothing);
   media_log_->AddEvent(media_log_->CreateLoadEvent(url.spec()));
 
   // Check if this url is media stream.
   video_frame_provider_ = media_stream_client_->GetVideoFrameProvider(
       url,
       base::Bind(&WebMediaPlayerMS::OnSourceError, AsWeakPtr()),
       base::Bind(&WebMediaPlayerMS::OnFrameAvailable, AsWeakPtr()));
-  if (video_frame_provider_) {
+
+  audio_renderer_ = media_stream_client_->GetAudioRenderer(url);
+
+  if (video_frame_provider_ || audio_renderer_) {
     SetNetworkState(WebMediaPlayer::NetworkStateLoaded);
     GetClient()->sourceOpened();
     GetClient()->setOpaque(true);
     SetReadyState(WebMediaPlayer::ReadyStateHaveMetadata);
     SetReadyState(WebMediaPlayer::ReadyStateHaveEnoughData);
     RepaintInternal();
   } else {
     SetNetworkState(WebMediaPlayer::NetworkStateNetworkError);
   }
 }
 
 void WebMediaPlayerMS::cancelLoad() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void WebMediaPlayerMS::play() {
   DVLOG(1) << "WebMediaPlayerMS::play";
   DCHECK(thread_checker_.CalledOnValidThread());
 
   paused_ = false;
   if (video_frame_provider_) {
     if (video_frame_provider_started_) {
       video_frame_provider_->Play();
     } else {
       video_frame_provider_started_ = true;
       video_frame_provider_->Start();
     }
   }
-  // TODO(wjia): add audio. See crbug.com/142988.
+
+  if (audio_renderer_)
+    audio_renderer_->Play();
 
   media_log_->AddEvent(media_log_->CreateEvent(media::MediaLogEvent::PLAY));
 
   if (delegate_)
     delegate_->DidPlay(this);
 }
 
 void WebMediaPlayerMS::pause() {
   DVLOG(1) << "WebMediaPlayerMS::pause";
   DCHECK(thread_checker_.CalledOnValidThread());
 
   if (video_frame_provider_)
     video_frame_provider_->Pause();
-  // TODO(wjia): add audio. See crbug.com/142988.
+
+  if (audio_renderer_)
+    audio_renderer_->Pause();
   paused_ = true;
 
   media_log_->AddEvent(media_log_->CreateEvent(media::MediaLogEvent::PAUSE));
 
   if (delegate_)
     delegate_->DidPause(this);
 }
 
 bool WebMediaPlayerMS::supportsFullscreen() const {
   DCHECK(thread_checker_.CalledOnValidThread());
@@ skipping 12 matching lines @@
 void WebMediaPlayerMS::setEndTime(float seconds) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void WebMediaPlayerMS::setRate(float rate) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void WebMediaPlayerMS::setVolume(float volume) {
   DCHECK(thread_checker_.CalledOnValidThread());
-  // TODO(wjia): set audio volume. See crbug.com/142988.
-  NOTIMPLEMENTED();
+  if (audio_renderer_)
+    audio_renderer_->SetVolume(volume);
 }
 
 void WebMediaPlayerMS::setVisible(bool visible) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 void WebMediaPlayerMS::setPreload(WebMediaPlayer::Preload preload) {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 bool WebMediaPlayerMS::totalBytesKnown() {
   DCHECK(thread_checker_.CalledOnValidThread());
   return false;
 }
 
 bool WebMediaPlayerMS::hasVideo() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return (video_frame_provider_ != NULL);
 }
 
 bool WebMediaPlayerMS::hasAudio() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   // TODO(wjia): add audio support. See crbug.com/142988.

[wjia(left Chromium), 2012/10/24 22:05:15]

nit: remove this TODO.

[no longer working on chromium, 2012/10/25 10:19:41]

Done.

-  return false;
+  return (audio_renderer_);

[wjia(left Chromium), 2012/10/24 22:05:15]

nit: no need to have parentheses. 

[no longer working on chromium, 2012/10/25 10:19:41]

I changed it to be the same style as in hasVideo(), hope it is fine.

 }
 
 WebKit::WebSize WebMediaPlayerMS::naturalSize() const {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   gfx::Size size;
   if (current_frame_)
     size = current_frame_->natural_size();
   DVLOG(1) << "WebMediaPlayerMS::naturalSize, " << size.ToString();
   return WebKit::WebSize(size);
@@ skipping 194 matching lines @@
   GetClient()->readyStateChanged();
 }
 
 WebKit::WebMediaPlayerClient* WebMediaPlayerMS::GetClient() {
   DCHECK(thread_checker_.CalledOnValidThread());
   DCHECK(client_);
   return client_;
 }
 
 }  // namespace webkit_media