Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1002)

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: b4cd612a Comments, added framerate to RequestEncodingParametersChange 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
Index: media/base/video_frame.cc
diff --git a/media/base/video_frame.cc b/media/base/video_frame.cc
index de7440ae20cf386df0e2b0caa8a52ded697f5c26..8f211ef1c1ea9a567fbe41beb69ee27c6fa59f1f 100644
--- a/media/base/video_frame.cc
+++ b/media/base/video_frame.cc
@@ -170,11 +170,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;
}
@@ -323,9 +323,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;

Powered by Google App Engine
This is Rietveld 408576698