Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / renderer / media / webmediaplayer_ms.cc

diff --git a/src/content/renderer/media/webmediaplayer_ms.cc b/src/content/renderer/media/webmediaplayer_ms.cc
index 9fe9306..f2a3e70 100644 (file)
--- a/src/content/renderer/media/webmediaplayer_ms.cc
+++ b/src/content/renderer/media/webmediaplayer_ms.cc
@@ -41,13 +41,14 @@ namespace {
 scoped_refptr<media::VideoFrame> CopyFrameToYV12(
     const scoped_refptr<media::VideoFrame>& frame) {
   DCHECK(frame->format() == media::VideoFrame::YV12 ||
+         frame->format() == media::VideoFrame::I420 ||
          frame->format() == media::VideoFrame::NATIVE_TEXTURE);
   scoped_refptr<media::VideoFrame> new_frame =
       media::VideoFrame::CreateFrame(media::VideoFrame::YV12,
                                      frame->coded_size(),
                                      frame->visible_rect(),
                                      frame->natural_size(),
-                                     frame->GetTimestamp());
+                                     frame->timestamp());
 
   if (frame->format() == media::VideoFrame::NATIVE_TEXTURE) {
     SkBitmap bitmap;
@@ -151,7 +152,6 @@ void WebMediaPlayerMS::load(LoadType load_type,
     RenderFrame::FromWebFrame(frame_)->GetRoutingID());
 
   if (video_frame_provider_.get() || audio_renderer_.get()) {
-    GetClient()->setOpaque(true);
     if (audio_renderer_.get())
       audio_renderer_->Start();
 
@@ -416,6 +416,7 @@ void WebMediaPlayerMS::OnFrameAvailable(
     if (video_frame_provider_) {
       video_weblayer_.reset(
           new webkit::WebLayerImpl(cc::VideoLayer::Create(this)));
+      video_weblayer_->setOpaque(true);
       GetClient()->setWebLayer(video_weblayer_.get());
     }
   }
@@ -426,7 +427,7 @@ void WebMediaPlayerMS::OnFrameAvailable(
 
   if (!sequence_started_) {
     sequence_started_ = true;
-    start_time_ = frame->GetTimestamp();
+    start_time_ = frame->timestamp();
   }
   bool size_changed = !current_frame_.get() ||
                       current_frame_->natural_size() != frame->natural_size();
@@ -436,7 +437,7 @@ void WebMediaPlayerMS::OnFrameAvailable(
     if (!current_frame_used_ && current_frame_.get())
       ++dropped_frame_count_;
     current_frame_ = frame;
-    current_time_ = frame->GetTimestamp() - start_time_;
+    current_time_ = frame->timestamp() - start_time_;
     current_frame_used_ = false;
   }