diff options
| author | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-29 01:49:55 +0000 |
|---|---|---|
| committer | fischman@chromium.org <fischman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-29 01:49:55 +0000 |
| commit | 6fdf57766b26fdec6374bbfce16d230f9ec3e5a7 (patch) | |
| tree | a8cc0c851fb0e09527947dd9c4f7a5baf868bb89 /webkit | |
| parent | 9b36f289370e3bfa542d2d047e6d52e0cc131c33 (diff) | |
| download | chromium_src-6fdf57766b26fdec6374bbfce16d230f9ec3e5a7.zip chromium_src-6fdf57766b26fdec6374bbfce16d230f9ec3e5a7.tar.gz chromium_src-6fdf57766b26fdec6374bbfce16d230f9ec3e5a7.tar.bz2 | |
Delete media::VideoFrame::planes() and ::planes_ since they can be derived from format().
This lets us delete craxy code that first asks for format() and then ensures
that the world hasn't gone crazy and given an RGB frame 4 planes (for example).
BUG=107043
TEST=trybots.
Review URL: http://codereview.chromium.org/8989067
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115942 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/media/video_renderer_impl.cc | 2 | ||||
| -rw-r--r-- | webkit/media/webvideoframe_impl.cc | 24 |
2 files changed, 22 insertions, 4 deletions
diff --git a/webkit/media/video_renderer_impl.cc b/webkit/media/video_renderer_impl.cc index 3efb5f6..87f4955 100644 --- a/webkit/media/video_renderer_impl.cc +++ b/webkit/media/video_renderer_impl.cc @@ -91,7 +91,6 @@ static void FastPaint( video_frame->format() == media::VideoFrame::YV16); DCHECK_EQ(video_frame->stride(media::VideoFrame::kUPlane), video_frame->stride(media::VideoFrame::kVPlane)); - DCHECK(video_frame->planes() == media::VideoFrame::kNumYUVPlanes); const SkBitmap& bitmap = canvas->getDevice()->accessBitmap(true); media::YUVType yuv_type = (video_frame->format() == media::VideoFrame::YV12) ? @@ -200,7 +199,6 @@ static void ConvertVideoFrameToBitmap( video_frame->format() == media::VideoFrame::YV16); DCHECK(video_frame->stride(media::VideoFrame::kUPlane) == video_frame->stride(media::VideoFrame::kVPlane)); - DCHECK(video_frame->planes() == media::VideoFrame::kNumYUVPlanes); // Check if |bitmap| needs to be (re)allocated. if (bitmap->isNull() || diff --git a/webkit/media/webvideoframe_impl.cc b/webkit/media/webvideoframe_impl.cc index 93970f0..3e843f4 100644 --- a/webkit/media/webvideoframe_impl.cc +++ b/webkit/media/webvideoframe_impl.cc @@ -65,8 +65,28 @@ unsigned WebVideoFrameImpl::height() const { } unsigned WebVideoFrameImpl::planes() const { - if (video_frame_.get()) - return video_frame_->planes(); + 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: + return 0; + } + NOTREACHED(); return 0; } |