diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:27:47 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-06 12:27:47 +0000 |
| commit | 0f1bc08d4cfcc34181b0b5cbf065c40f687bf740 (patch) | |
| tree | 08e3fb2fdca3674ceb4d6cf527cb65e755cd993e /media/base/video_frame.cc | |
| parent | 0bdaf95291fc46702f274f40e8e5081e9ef23011 (diff) | |
| download | chromium_org-0f1bc08d4cfcc34181b0b5cbf065c40f687bf740.tar.gz | |
Merge from Chromium at DEPS revision 232870
This commit was generated by merge_to_master.py.
Change-Id: I9cd2139013538e8bcd17966e8ff30ca5651d1a3d
Diffstat (limited to 'media/base/video_frame.cc')
| -rw-r--r-- | media/base/video_frame.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc index a372889cb5..9c07251e59 100644 --- a/media/base/video_frame.cc +++ b/media/base/video_frame.cc @@ -46,8 +46,8 @@ scoped_refptr<VideoFrame> VideoFrame::CreateFrame( // static std::string VideoFrame::FormatToString(VideoFrame::Format format) { switch (format) { - case VideoFrame::INVALID: - return "INVALID"; + case VideoFrame::UNKNOWN: + return "UNKNOWN"; case VideoFrame::RGB32: return "RGB32"; case VideoFrame::YV12: @@ -76,7 +76,7 @@ bool VideoFrame::IsValidConfig(VideoFrame::Format format, const gfx::Size& coded_size, const gfx::Rect& visible_rect, const gfx::Size& natural_size) { - return (format != VideoFrame::INVALID && + return (format != VideoFrame::UNKNOWN && !coded_size.IsEmpty() && coded_size.GetArea() <= limits::kMaxCanvas && coded_size.width() <= limits::kMaxDimension && @@ -240,7 +240,7 @@ size_t VideoFrame::NumPlanes(Format format) { case VideoFrame::YV12A: return 4; case VideoFrame::EMPTY: - case VideoFrame::INVALID: + case VideoFrame::UNKNOWN: break; } NOTREACHED() << "Unsupported video frame format: " << format; @@ -274,7 +274,7 @@ size_t VideoFrame::AllocationSize(Format format, const gfx::Size& coded_size) { RoundUp(coded_size.width(), 2) * RoundUp(coded_size.height(), 2); return rounded_size * 2; } - case VideoFrame::INVALID: + case VideoFrame::UNKNOWN: case VideoFrame::EMPTY: case VideoFrame::NATIVE_TEXTURE: #if defined(GOOGLE_TV) |