Merge VideoCaptureDevice::Capability with media::VideoCaptureCapability

webkit/media/webvideoframe_impl.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/webvideoframe_impl.h"
 
 #include "base/logging.h"
 #include "media/base/video_frame.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebVideoFrame.h"
 
@@ skipping 55 matching lines @@
       return 1;
     case media::VideoFrame::YV12:
     case media::VideoFrame::YV16:
       return 3;
     case media::VideoFrame::INVALID:
     case media::VideoFrame::EMPTY:
     case media::VideoFrame::I420:
       break;
     case media::VideoFrame::NATIVE_TEXTURE:
       return 0;
+    case media::VideoFrame::kColorUnknown:
+    case media::VideoFrame::kI420:
+    case media::VideoFrame::kYUY2:
+    case media::VideoFrame::kUYVY:
+    case media::VideoFrame::kRGB24:
+    case media::VideoFrame::kARGB:
+    case media::VideoFrame::kMJPEG:
+      break;
   }
   NOTREACHED();
   return 0;
 }
 
 int WebVideoFrameImpl::stride(unsigned plane) const {
   if (video_frame_.get())
     return static_cast<int>(video_frame_->stride(plane));
   return 0;
 }
@@ skipping 10 matching lines @@
   return video_frame_->texture_id();
 }
 
 unsigned WebVideoFrameImpl::textureTarget() const {
   if (!video_frame_.get() || format() != FormatNativeTexture)
     return 0;
   return video_frame_->texture_target();
 }
 
 }  // namespace webkit_media