16 bpp video stream capture, render and WebGL usage - Realsense R200 & SR300 support.

media/base/video_frame.cc

Index: media/base/video_frame.cc
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index 66bbe38d5f5492bc55545252b5c6ad44f4637ae9..7b039286db0c613873bbd598e5cb21101da9e098 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -125,7 +125,7 @@ bool VideoFrame::IsValidConfig(VideoPixelFormat format,
     return true;
 
   // Make sure new formats are properly accounted for in the method.
-  static_assert(PIXEL_FORMAT_MAX == 21,
+  static_assert(PIXEL_FORMAT_MAX == 23,
                 "Added pixel format, please review IsValidConfig()");
 
   if (format == PIXEL_FORMAT_UNKNOWN) {
@@ -514,6 +514,8 @@ size_t VideoFrame::NumPlanes(VideoPixelFormat format) {
     case PIXEL_FORMAT_RGB24:
     case PIXEL_FORMAT_RGB32:
     case PIXEL_FORMAT_MJPEG:
+    case PIXEL_FORMAT_Y8:
+    case PIXEL_FORMAT_Y16:
       return 1;
     case PIXEL_FORMAT_NV12:
     case PIXEL_FORMAT_NV21:
@@ -801,8 +803,10 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalStorage(
 
   // TODO(miu): This function should support any pixel format.
   // http://crbug.com/555909
-  if (format != PIXEL_FORMAT_I420) {
-    LOG(DFATAL) << "Only PIXEL_FORMAT_I420 format supported: "
+  if (format != PIXEL_FORMAT_I420 && format != PIXEL_FORMAT_Y8 &&
+      format != PIXEL_FORMAT_Y16) {
+    LOG(DFATAL) << "Only PIXEL_FORMAT_I420, PIXEL_FORMAT_Y8 and "
+                   "PIXEL_FORMAT_Y16 formats are supported: "
                 << VideoPixelFormatToString(format);
     return nullptr;
   }
@@ -823,6 +827,15 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalStorage(
     frame = new VideoFrame(format, storage_type, coded_size, visible_rect,
                            natural_size, timestamp);
   }
+  if (format == PIXEL_FORMAT_Y8 || format == PIXEL_FORMAT_Y16) {
+    // TODO(astojilj) Make this code generic for all and move format specifics
+    // to static methods.
+    DCHECK_EQ(NumPlanes(format), 1);
+    const size_t i = 0;
+    frame->strides_[i] = coded_size.width() * BytesPerElement(format, i);
+    frame->data_[i] = data;
+    return frame;
+  }
   frame->strides_[kYPlane] = coded_size.width();
   // TODO(miu): This always rounds widths down, whereas VideoFrame::RowBytes()
   // always rounds up.  This inconsistency must be resolved.  Perhaps a
@@ -1002,6 +1015,7 @@ gfx::Size VideoFrame::SampleSize(VideoPixelFormat format, size_t plane) {
         case PIXEL_FORMAT_YV24:
         case PIXEL_FORMAT_YUV444P9:
         case PIXEL_FORMAT_YUV444P10:
+        case PIXEL_FORMAT_Y8:
           return gfx::Size(1, 1);
 
         case PIXEL_FORMAT_YV16:
@@ -1052,6 +1066,7 @@ int VideoFrame::BytesPerElement(VideoPixelFormat format, size_t plane) {
     case PIXEL_FORMAT_YUV420P10:
     case PIXEL_FORMAT_YUV422P10:
     case PIXEL_FORMAT_YUV444P10:
+    case PIXEL_FORMAT_Y16:
       return 2;
     case PIXEL_FORMAT_NV12:
     case PIXEL_FORMAT_NV21:
@@ -1065,6 +1080,7 @@ int VideoFrame::BytesPerElement(VideoPixelFormat format, size_t plane) {
     case PIXEL_FORMAT_YV16:
     case PIXEL_FORMAT_YV12A:
     case PIXEL_FORMAT_YV24:
+    case PIXEL_FORMAT_Y8:
       return 1;
     case PIXEL_FORMAT_MJPEG:
       return 0;