media/base/video_frame.cc - Issue 20632002: Add media::VideoEncodeAccelerator with WebRTC integration

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/base/video_frame.cc

Issue 20632002: Add media::VideoEncodeAccelerator with WebRTC integration (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@git-svn

Patch Set: 6243184e VEA reentrancy. Created 7 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/common/gpu/media/gpu_video_encode_accelerator.cc ('K') | « content/renderer/render_view_impl.cc ('k') | media/filters/gpu_video_accelerator_factories.h » ('j') | media/video/video_encode_accelerator.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/base/video_frame.cc

diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc

index 10ad0511ffa925ef60a9431d6699e0315c95190c..076106e0780ddec573acec9ae2d60d5aeec07ed8 100644

--- a/media/base/video_frame.cc

+++ b/media/base/video_frame.cc

@@ -198,11 +198,11 @@ size_t VideoFrame::NumPlanes(Format format) {

return 1;

case VideoFrame::YV12:

case VideoFrame::YV16:

+ case VideoFrame::I420:

return 3;

case VideoFrame::YV12A:

return 4;

case VideoFrame::EMPTY:

- case VideoFrame::I420:

case VideoFrame::INVALID:

break;

}

@@ -351,9 +351,13 @@ int VideoFrame::rows(size_t plane) const {

case YV16:

return height;

- case YV12:

case YV12A:

- if (plane == kYPlane || plane == kAPlane)

+ if (plane == kAPlane)

+ return height;

+ // fallthrough.

+ case YV12:

+ case I420:

+ if (plane == kYPlane)

return height;

return RoundUp(height, 2) / 2;