commit 7a721e84f84b5205ff260a34fb87bf8e56c85cd1
author Magnus Jedvert <magjed@webrtc.org> Wed Jun 14 09:28:08 2017
committer Commit Bot <commit-bot@chromium.org> Wed Jun 14 13:46:38 2017
tree d0ea755ec0124078fa2295116d32fde242b5cdd5
parent 3c938fc5ea57d4a90dbc550eb235bbff53a079f7

Update webrtc/media and webrtc/modules to new VideoFrameBuffer interface

TBR=stefan

Bug: webrtc:7632
Change-Id: Ifdaf4a591061595a53f677441baad85820336b34
Reviewed-on: https://chromium-review.googlesource.com/530844
Commit-Queue: Magnus Jedvert <magjed@webrtc.org>
Reviewed-by: Niels Moller <nisse@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#18591}

webrtc/media/base/fakevideorenderer.h

diff --git a/webrtc/media/base/fakevideorenderer.h b/webrtc/media/base/fakevideorenderer.h
index 86fc027..a678c97 100644
--- a/webrtc/media/base/fakevideorenderer.h
+++ b/webrtc/media/base/fakevideorenderer.h
@@ -84,12 +84,14 @@
     if (!frame || !frame->video_frame_buffer()) {
       return false;
     }
+    rtc::scoped_refptr<const webrtc::I420BufferInterface> i420_buffer =
+        frame->video_frame_buffer()->ToI420();
     // Y
     int y_width = frame->width();
     int y_height = frame->height();
-    const uint8_t* y_plane = frame->video_frame_buffer()->DataY();
+    const uint8_t* y_plane = i420_buffer->DataY();
     const uint8_t* y_pos = y_plane;
-    int32_t y_pitch = frame->video_frame_buffer()->StrideY();
+    int32_t y_pitch = i420_buffer->StrideY();
     for (int i = 0; i < y_height; ++i) {
       for (int j = 0; j < y_width; ++j) {
         uint8_t y_value = *(y_pos + j);
@@ -100,14 +102,14 @@
       y_pos += y_pitch;
     }
     // U and V
-    int chroma_width = (frame->width() + 1)/2;
-    int chroma_height = (frame->height() + 1)/2;
-    const uint8_t* u_plane = frame->video_frame_buffer()->DataU();
-    const uint8_t* v_plane = frame->video_frame_buffer()->DataV();
+    int chroma_width = i420_buffer->ChromaWidth();
+    int chroma_height = i420_buffer->ChromaHeight();
+    const uint8_t* u_plane = i420_buffer->DataU();
+    const uint8_t* v_plane = i420_buffer->DataV();
     const uint8_t* u_pos = u_plane;
     const uint8_t* v_pos = v_plane;
-    int32_t u_pitch = frame->video_frame_buffer()->StrideU();
-    int32_t v_pitch = frame->video_frame_buffer()->StrideV();
+    int32_t u_pitch = i420_buffer->StrideU();
+    int32_t v_pitch = i420_buffer->StrideV();
     for (int i = 0; i < chroma_height; ++i) {
       for (int j = 0; j < chroma_width; ++j) {
         uint8_t u_value = *(u_pos + j);