diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 00:17:16 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-11 00:17:16 +0000 |
| commit | f402ba034d0a796bbb57655a3a0781922b6a8b16 (patch) | |
| tree | 6291aabe2e9580fd61fcf4ea8cf56fb6411454f3 /webkit/media | |
| parent | c8c552d18c353fcea4ae92d815abd6549f4bb0f0 (diff) | |
| download | chromium_src-f402ba034d0a796bbb57655a3a0781922b6a8b16.zip chromium_src-f402ba034d0a796bbb57655a3a0781922b6a8b16.tar.gz chromium_src-f402ba034d0a796bbb57655a3a0781922b6a8b16.tar.bz2 | |
Cull unnecessary media::VideoFrame::Formats from the enum.
This removes the easy ones: RGB555, RGB565, RGB24, RGBA, NV12, and ASCII.
BUG=108306
TEST=videotestmatrix is still as happy as it was.
Review URL: http://codereview.chromium.org/10024072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131682 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/media')
| -rw-r--r-- | webkit/media/webvideoframe_impl.cc | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/webkit/media/webvideoframe_impl.cc b/webkit/media/webvideoframe_impl.cc index 58cfa62..d6e178c 100644 --- a/webkit/media/webvideoframe_impl.cc +++ b/webkit/media/webvideoframe_impl.cc @@ -33,16 +33,10 @@ WebVideoFrameImpl::~WebVideoFrameImpl() {} int(media::VideoFrame::chromium_name), \ mismatching_enums) COMPILE_ASSERT_MATCHING_ENUM(FormatInvalid, INVALID); -COMPILE_ASSERT_MATCHING_ENUM(FormatRGB555, RGB555); -COMPILE_ASSERT_MATCHING_ENUM(FormatRGB565, RGB565); -COMPILE_ASSERT_MATCHING_ENUM(FormatRGB24, RGB24); COMPILE_ASSERT_MATCHING_ENUM(FormatRGB32, RGB32); -COMPILE_ASSERT_MATCHING_ENUM(FormatRGBA, RGBA); COMPILE_ASSERT_MATCHING_ENUM(FormatYV12, YV12); COMPILE_ASSERT_MATCHING_ENUM(FormatYV16, YV16); -COMPILE_ASSERT_MATCHING_ENUM(FormatNV12, NV12); COMPILE_ASSERT_MATCHING_ENUM(FormatEmpty, EMPTY); -COMPILE_ASSERT_MATCHING_ENUM(FormatASCII, ASCII); COMPILE_ASSERT_MATCHING_ENUM(FormatI420, I420); COMPILE_ASSERT_MATCHING_ENUM(FormatNativeTexture, NATIVE_TEXTURE); @@ -68,19 +62,13 @@ unsigned WebVideoFrameImpl::planes() const { if (!video_frame_.get()) return 0; switch (video_frame_->format()) { - case media::VideoFrame::RGB555: - case media::VideoFrame::RGB565: - case media::VideoFrame::RGB24: case media::VideoFrame::RGB32: - case media::VideoFrame::RGBA: return 1; case media::VideoFrame::YV12: case media::VideoFrame::YV16: return 3; case media::VideoFrame::INVALID: - case media::VideoFrame::NV12: case media::VideoFrame::EMPTY: - case media::VideoFrame::ASCII: case media::VideoFrame::I420: break; case media::VideoFrame::NATIVE_TEXTURE: |