diff options
| author | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2014-03-18 10:20:56 +0000 |
| commit | a1401311d1ab56c4ed0a474bd38c108f75cb0cd9 (patch) | |
| tree | 3437151d9ae1ce20a1e53a0d98c19ca01c786394 /media/base/video_frame.cc | |
| parent | af5066f1e36c6579e74752647e6c584438f80f94 (diff) | |
| download | chromium_org-a1401311d1ab56c4ed0a474bd38c108f75cb0cd9.tar.gz | |
Merge from Chromium at DEPS revision 257591
This commit was generated by merge_to_master.py.
Change-Id: I0010df2ec3fbb5d4947cd026de2feb150ce7a6b5
Diffstat (limited to 'media/base/video_frame.cc')
| -rw-r--r-- | media/base/video_frame.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc index 7e654319c5..64e898987d 100644 --- a/media/base/video_frame.cc +++ b/media/base/video_frame.cc @@ -63,8 +63,6 @@ std::string VideoFrame::FormatToString(VideoFrame::Format format) { return "YV12A"; case VideoFrame::YV12J: return "YV12J"; - case VideoFrame::HISTOGRAM_MAX: - return "HISTOGRAM_MAX"; } NOTREACHED() << "Invalid videoframe format provided: " << format; return ""; @@ -182,10 +180,13 @@ scoped_refptr<VideoFrame> VideoFrame::WrapExternalYuvData( // static scoped_refptr<VideoFrame> VideoFrame::WrapVideoFrame( const scoped_refptr<VideoFrame>& frame, + const gfx::Rect& visible_rect, + const gfx::Size& natural_size, const base::Closure& no_longer_needed_cb) { + DCHECK(frame->visible_rect().Contains(visible_rect)); scoped_refptr<VideoFrame> wrapped_frame(new VideoFrame( - frame->format(), frame->coded_size(), frame->visible_rect(), - frame->natural_size(), frame->GetTimestamp(), frame->end_of_stream())); + frame->format(), frame->coded_size(), visible_rect, natural_size, + frame->GetTimestamp(), frame->end_of_stream())); for (size_t i = 0; i < NumPlanes(frame->format()); ++i) { wrapped_frame->strides_[i] = frame->stride(i); @@ -260,7 +261,6 @@ size_t VideoFrame::NumPlanes(Format format) { case VideoFrame::YV12A: return 4; case VideoFrame::UNKNOWN: - case VideoFrame::HISTOGRAM_MAX: break; } NOTREACHED() << "Unsupported video frame format: " << format; @@ -326,7 +326,6 @@ size_t VideoFrame::PlaneAllocationSize(Format format, } case VideoFrame::UNKNOWN: case VideoFrame::NATIVE_TEXTURE: - case VideoFrame::HISTOGRAM_MAX: #if defined(VIDEO_HOLE) case VideoFrame::HOLE: #endif // defined(VIDEO_HOLE) |