Add distinction between RGB and RGBA native texture video frames and resources

media/base/video_frame.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 "media/base/video_frame.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 227 matching lines @@
 }
 
 // static
 scoped_refptr<VideoFrame> VideoFrame::WrapNativeTexture(
     const gpu::MailboxHolder& mailbox_holder,
     const ReleaseMailboxCB& mailbox_holder_release_cb,
     const gfx::Size& coded_size,
     const gfx::Rect& visible_rect,
     const gfx::Size& natural_size,
     base::TimeDelta timestamp,
-    bool allow_overlay) {
+    bool allow_overlay,
+    bool has_alpha) {
   gpu::MailboxHolder mailbox_holders[kMaxPlanes];
   mailbox_holders[kARGBPlane] = mailbox_holder;
+  TextureFormat texture_format = has_alpha ? TEXTURE_RGBA : TEXTURE_RGB;
   scoped_refptr<VideoFrame> frame(
       new VideoFrame(NATIVE_TEXTURE, coded_size, visible_rect, natural_size,
-                     mailbox_holders, TEXTURE_RGBA, timestamp, false));
+                     mailbox_holders, texture_format, timestamp, false));
   frame->mailbox_holders_release_cb_ = mailbox_holder_release_cb;
   frame->allow_overlay_ = allow_overlay;
   return frame;
 }
 
 // static
 scoped_refptr<VideoFrame> VideoFrame::WrapYUV420NativeTextures(
     const gpu::MailboxHolder& y_mailbox_holder,
     const gpu::MailboxHolder& u_mailbox_holder,
     const gpu::MailboxHolder& v_mailbox_holder,
@@ skipping 285 matching lines @@
       break;
   }
   NOTREACHED() << "Unsupported video frame format: " << format;
   return 0;
 }
 
 // static
 size_t VideoFrame::NumTextures(TextureFormat texture_format) {
   switch (texture_format) {
     case TEXTURE_RGBA:
+    case TEXTURE_RGB:
       return 1;
     case TEXTURE_YUV_420:
       return 3;
   }
 
   NOTREACHED();
   return 0;
 }
 
 // static
@@ skipping 246 matching lines @@
   for (size_t plane = 0; plane < NumPlanes(format_); ++plane) {
     for (int row = 0; row < rows(plane); ++row) {
       base::MD5Update(context, base::StringPiece(
           reinterpret_cast<char*>(data(plane) + stride(plane) * row),
           row_bytes(plane)));
     }
   }
 }
 
 }  // namespace media