generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adding a return value to ConvertRotationMode

Browse Source 
Review URL: http://webrtc-codereview.appspot.com/333023

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1304 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
mikhal@webrtc.org 2011-12-28 23:28:45 +00:00
parent 6d6a43d6e3
commit 67f294a48a
1 changed files with 6 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/common_video/libyuv/libyuv.cc
View File

@ -617,71 +617,49 @@ libyuv::RotationMode ConvertRotationMode(VideoRotationMode rotation) {
switch(rotation) { switch(rotation) {
case kRotateNone: case kRotateNone:
return libyuv::kRotate0; return libyuv::kRotate0;
break;
case kRotate90: case kRotate90:
return libyuv::kRotate90; return libyuv::kRotate90;
break;
case kRotate180: case kRotate180:
return libyuv::kRotate180; return libyuv::kRotate180;
break;
case kRotate270: case kRotate270:
return libyuv::kRotate270; return libyuv::kRotate270;
break; default:
assert(false);
return libyuv::kRotate0;
} }
assert(false);
} }
int ConvertVideoType(VideoType video_type) { int ConvertVideoType(VideoType video_type) {
switch(video_type) { switch(video_type) {
case kUnknown: case kUnknown:
return libyuv::FOURCC_ANY; return libyuv::FOURCC_ANY;
break;
case kI420: case kI420:
return libyuv::FOURCC_I420; return libyuv::FOURCC_I420;
break;
case kIYUV: // same as KYV12 case kIYUV: // same as KYV12
case kYV12: case kYV12:
return libyuv::FOURCC_YV12; return libyuv::FOURCC_YV12;
break;
case kRGB24: case kRGB24:
return libyuv::FOURCC_24BG; return libyuv::FOURCC_24BG;
break;
case kABGR: case kABGR:
return libyuv::FOURCC_ABGR; return libyuv::FOURCC_ABGR;
break;
case kARGB4444:
case kRGB565:
case kARGB1555:
case kARGBMac:
case kRGBAMac:
// TODO(mikhal): Not supported;
assert(false);
return libyuv::FOURCC_ANY;
break;
case kYUY2: case kYUY2:
return libyuv::FOURCC_YUY2; return libyuv::FOURCC_YUY2;
break;
case kUYVY: case kUYVY:
return libyuv::FOURCC_UYVY; return libyuv::FOURCC_UYVY;
break;
case kMJPG: case kMJPG:
return libyuv::FOURCC_MJPG; return libyuv::FOURCC_MJPG;
break;
case kNV21: case kNV21:
return libyuv::FOURCC_NV21; return libyuv::FOURCC_NV21;
break;
case kNV12: case kNV12:
return libyuv::FOURCC_NV12; return libyuv::FOURCC_NV12;
break;
case kARGB: case kARGB:
return libyuv::FOURCC_ARGB; return libyuv::FOURCC_ARGB;
break;
case kBGRA: case kBGRA:
return libyuv::FOURCC_BGRA; return libyuv::FOURCC_BGRA;
break; default:
assert(false);
return libyuv::FOURCC_ANY;
} }
// default value
return libyuv::FOURCC_ANY;
} }
int ConvertToI420(VideoType src_video_type, int ConvertToI420(VideoType src_video_type,