From c00f91d62d888e03d0e98aecbdbfdd1d7024db85 Mon Sep 17 00:00:00 2001 From: "mikhal@webrtc.org" Date: Tue, 3 Jan 2012 18:49:15 +0000 Subject: [PATCH] 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 | 1 + src/common_video/libyuv/libyuv.cc | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/src/common_types.h b/src/common_types.h index cd3ad02b7b..74b7db7b52 100644 --- a/src/common_types.h +++ b/src/common_types.h @@ -433,6 +433,7 @@ enum RawVideoType kVideoMJPEG = 10, kVideoNV12 = 11, kVideoNV21 = 12, + kVideoBGRA = 13, kVideoUnknown = 99 }; diff --git a/src/common_video/libyuv/libyuv.cc b/src/common_video/libyuv/libyuv.cc index 7f94b2d6fb..af80968a83 100644 --- a/src/common_video/libyuv/libyuv.cc +++ b/src/common_video/libyuv/libyuv.cc @@ -47,6 +47,8 @@ VideoType RawVideoTypeToCommonVideoVideoType(RawVideoType type) { return kNV21; case kVideoNV12: return kNV12; + case kVideoBGRA: + return kBGRA; default: assert(false); } @@ -73,6 +75,7 @@ int CalcBufferSize(VideoType type, int width, int height) { case kRGB24: bits_per_pixel = 24; break; + case kBGRA: case kARGB: bits_per_pixel = 32; break; @@ -105,6 +108,7 @@ int CalcBufferSize(VideoType src_video_type, case kRGB24: src_bits_per_pixel = 24; break; + case kBGRA: case kARGB: src_bits_per_pixel = 32; break; @@ -130,6 +134,7 @@ int CalcBufferSize(VideoType src_video_type, case kRGB24: dst_bits_per_pixel = 24; break; + case kBGRA: case kARGB: dst_bits_per_pixel = 32; break;