Relanding 1143663007: VideoFrame: Separate Pixel Format from Storage Type.

media/blink/webmediaplayer_impl.cc

 // Copyright 2013 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 "media/blink/webmediaplayer_impl.h"
 
 #include <algorithm>
 #include <cmath>
 #include <limits>
 
@@ skipping 492 matching lines @@
                                unsigned char alpha,
                                SkXfermode::Mode mode) {
   DCHECK(main_task_runner_->BelongsToCurrentThread());
   TRACE_EVENT0("media", "WebMediaPlayerImpl:paint");
 
   // TODO(scherkus): Clarify paint() API contract to better understand when and
   // why it's being called. For example, today paint() is called when:
   //   - We haven't reached HAVE_CURRENT_DATA and need to paint black
   //   - We're painting to a canvas
   // See http://crbug.com/341225 http://crbug.com/342621 for details.
-  scoped_refptr<VideoFrame> video_frame =
-      GetCurrentFrameFromCompositor();
+  scoped_refptr<VideoFrame> video_frame = GetCurrentFrameFromCompositor();
 
   gfx::Rect gfx_rect(rect);
   Context3D context_3d;
   if (video_frame.get() &&
-      video_frame->format() == VideoFrame::NATIVE_TEXTURE) {
-    if (!context_3d_cb_.is_null()) {
+      video_frame->storage_type() == VideoFrame::STORAGE_TEXTURE) {
+    if (!context_3d_cb_.is_null())
       context_3d = context_3d_cb_.Run();
-    }
     // GPU Process crashed.
     if (!context_3d.gl)
       return;
   }
   skcanvas_video_renderer_.Paint(video_frame, canvas, gfx_rect, alpha, mode,
                                  pipeline_metadata_.video_rotation, context_3d);
 }
 
 bool WebMediaPlayerImpl::hasSingleSecurityOrigin() const {
   if (data_source_)
@@ skipping 54 matching lines @@
 
 bool WebMediaPlayerImpl::copyVideoTextureToPlatformTexture(
     blink::WebGraphicsContext3D* web_graphics_context,
     unsigned int texture,
     unsigned int internal_format,
     unsigned int type,
     bool premultiply_alpha,
     bool flip_y) {
   TRACE_EVENT0("media", "WebMediaPlayerImpl:copyVideoTextureToPlatformTexture");
 
-  scoped_refptr<VideoFrame> video_frame =
-      GetCurrentFrameFromCompositor();
+  scoped_refptr<VideoFrame> video_frame = GetCurrentFrameFromCompositor();
 
   if (!video_frame.get() ||
-      video_frame->format() != VideoFrame::NATIVE_TEXTURE) {
+      video_frame->storage_type() != VideoFrame::STORAGE_TEXTURE) {
     return false;
   }
 
   // TODO(dshwang): need more elegant way to convert WebGraphicsContext3D to
   // GLES2Interface.
   gpu::gles2::GLES2Interface* gl =
       static_cast<gpu_blink::WebGraphicsContext3DImpl*>(web_graphics_context)
           ->GetGLInterface();
   SkCanvasVideoRenderer::CopyVideoFrameTextureToGLTexture(
       gl, video_frame.get(), texture, internal_format, type, premultiply_alpha,
@@ skipping 399 matching lines @@
 
   // pause() may be called after playback has ended and the HTMLMediaElement
   // requires that currentTime() == duration() after ending.  We want to ensure
   // |paused_time_| matches currentTime() in this case or a future seek() may
   // incorrectly discard what it thinks is a seek to the existing time.
   paused_time_ =
       ended_ ? pipeline_.GetMediaDuration() : pipeline_.GetMediaTime();
 }
 
 }  // namespace media