Index: media/blink/video_frame_compositor.cc |
diff --git a/media/blink/video_frame_compositor.cc b/media/blink/video_frame_compositor.cc |
index 2be84adab3c80b15e015f62d942cebaed08f58f9..d815fd18137246dd87d840346a6e89f76b08f446 100644 |
--- a/media/blink/video_frame_compositor.cc |
+++ b/media/blink/video_frame_compositor.cc |
@@ -16,21 +16,20 @@ namespace media { |
// background rendering to keep the Render() callbacks moving. |
const int kBackgroundRenderingTimeoutMs = 250; |
+// Returns true if the format has no Alpha channel (hence is always opaque). |
static bool IsOpaque(const scoped_refptr<VideoFrame>& frame) { |
switch (frame->format()) { |
case VideoFrame::UNKNOWN: |
case VideoFrame::YV12: |
- case VideoFrame::YV16: |
case VideoFrame::I420: |
+ case VideoFrame::YV16: |
case VideoFrame::YV24: |
+#if defined(OS_MACOSX) || defined(OS_CHROMEOS) |
case VideoFrame::NV12: |
+#endif |
+ case VideoFrame::XRGB: |
return true; |
- |
case VideoFrame::YV12A: |
-#if defined(VIDEO_HOLE) |
- case VideoFrame::HOLE: |
-#endif // defined(VIDEO_HOLE) |
- case VideoFrame::NATIVE_TEXTURE: |
case VideoFrame::ARGB: |
break; |
} |