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

content/renderer/media/android/webmediaplayer_android.cc

Index: content/renderer/media/android/webmediaplayer_android.cc
diff --git a/content/renderer/media/android/webmediaplayer_android.cc b/content/renderer/media/android/webmediaplayer_android.cc
index 1bcfca04d383e6175f7a8c2c5d45c3417c0e7ab1..75bb8943aef5819ba665f9d6faeff39d4dd17bfd 100644
--- a/content/renderer/media/android/webmediaplayer_android.cc
+++ b/content/renderer/media/android/webmediaplayer_android.cc
@@ -660,9 +660,9 @@ bool WebMediaPlayerAndroid::copyVideoTextureToPlatformTexture(
   }
 
   if (!video_frame.get() ||
-      video_frame->format() != media::VideoFrame::NATIVE_TEXTURE)
+      video_frame->storage_type() != media::VideoFrame::STORAGE_TEXTURE)
     return false;
-  DCHECK_EQ(1u, media::VideoFrame::NumTextures(video_frame->texture_format()));
+  DCHECK_EQ(1u, media::VideoFrame::NumPlanes(video_frame->format()));
   const gpu::MailboxHolder& mailbox_holder = video_frame->mailbox_holder(0);
   DCHECK((!is_remote_ &&
           mailbox_holder.texture_target == GL_TEXTURE_EXTERNAL_OES) ||