commit c00f91d62d888e03d0e98aecbdbfdd1d7024db85
author mikhal@webrtc.org <mikhal@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jan 03 18:49:15 2012
committer mikhal@webrtc.org <mikhal@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Tue Jan 03 18:49:15 2012
tree 80121b5b0a705b8400a254a143d9533695987d50
parent 877c54e2301dffeac4e46697070d323547cefead

Adding BGRA as a video type.

This CL is a prerequisite for the capture module update CL. 
Review URL: http://webrtc-codereview.appspot.com/329021

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1317 4adac7df-926f-26a2-2b94-8c16560cd09d

src/common_types.h

diff --git a/src/common_types.h b/src/common_types.h
index cd3ad02..74b7db7 100644
--- a/src/common_types.h
+++ b/src/common_types.h
@@ -433,6 +433,7 @@
     kVideoMJPEG    = 10,
     kVideoNV12     = 11,
     kVideoNV21     = 12,
+    kVideoBGRA     = 13,
     kVideoUnknown  = 99
 };
 

src/common_video/libyuv/libyuv.cc

diff --git a/src/common_video/libyuv/libyuv.cc b/src/common_video/libyuv/libyuv.cc
index 7f94b2d..af80968 100644
--- a/src/common_video/libyuv/libyuv.cc
+++ b/src/common_video/libyuv/libyuv.cc
@@ -47,6 +47,8 @@
       return kNV21;
     case kVideoNV12:
       return kNV12;
+    case kVideoBGRA:
+      return kBGRA;
     default:
       assert(false);
   }
@@ -73,6 +75,7 @@
     case kRGB24:
       bits_per_pixel = 24;
       break;
+    case kBGRA:
     case kARGB:
       bits_per_pixel = 32;
       break;
@@ -105,6 +108,7 @@
     case kRGB24:
       src_bits_per_pixel = 24;
       break;
+    case kBGRA:
     case kARGB:
       src_bits_per_pixel = 32;
       break;
@@ -130,6 +134,7 @@
     case kRGB24:
       dst_bits_per_pixel = 24;
       break;
+    case kBGRA:
     case kARGB:
       dst_bits_per_pixel = 32;
       break;