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

media/video/gpu_memory_buffer_video_frame_pool.cc

 // Copyright 2015 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/video/gpu_memory_buffer_video_frame_pool.h"
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
 
 #include <list>
@@ skipping 314 matching lines @@
 
 scoped_refptr<VideoFrame>
 GpuMemoryBufferVideoFramePool::MaybeCreateHardwareFrame(
     const scoped_refptr<VideoFrame>& video_frame) {
   switch (video_frame->format()) {
     // Supported cases.
     case VideoFrame::YV12:
     case VideoFrame::I420:
       return pool_impl_->CreateHardwareFrame(video_frame);
     // Unsupported cases.
-    case media::VideoFrame::YV12A:
-    case media::VideoFrame::YV16:
-    case media::VideoFrame::YV24:
-#if defined(VIDEO_HOLE)
-    case media::VideoFrame::HOLE:
-#endif  // defined(VIDEO_HOLE)
-    case media::VideoFrame::ARGB:
-    case media::VideoFrame::NATIVE_TEXTURE:
-    case media::VideoFrame::UNKNOWN:
-    case media::VideoFrame::NV12:
+    case VideoFrame::YV12A:
+    case VideoFrame::YV16:
+    case VideoFrame::YV24:
+#if defined(OS_MACOSX) || defined(OS_CHROMEOS)
+    case VideoFrame::NV12:
+#endif
+    case VideoFrame::ARGB:
+    case VideoFrame::XRGB:
+    case VideoFrame::UNKNOWN:
       break;
   }
   return video_frame;
 }
 
 }  // namespace media