commit cbae0b475c332c7b31ea7d5ab5ee63e1e2c77791
author nisse <nisse@webrtc.org> Wed Sep 14 05:45:06 2016 -0700
committer Commit bot <commit-bot@chromium.org> Wed Sep 14 12:45:31 2016 +0000
tree b95dc5590cc0589bb45f326689cb386d79150332
parent bc18fc07beb3909c632cc4dbb73370fb5ec2062b

Use I420Buffer rather than VideoFrameBuffer when writing pixels.

Prepares for deleting VideoFrameBuffer::MutableDataY{,U,V}. Android
changes extracted from cl https://codereview.webrtc.org/2278883002/.

BUG=webrtc:5921

Review-Url: https://codereview.webrtc.org/2331383005
Cr-Commit-Position: refs/heads/master@{#14213}

webrtc/api/android/jni/androidmediadecoder_jni.cc

diff --git a/webrtc/api/android/jni/androidmediadecoder_jni.cc b/webrtc/api/android/jni/androidmediadecoder_jni.cc
index 2a7e689..96c0fc2 100644
--- a/webrtc/api/android/jni/androidmediadecoder_jni.cc
+++ b/webrtc/api/android/jni/androidmediadecoder_jni.cc
@@ -782,7 +782,9 @@
     payload += output_buffer_offset;
 
     // Create yuv420 frame.
-    frame_buffer = decoded_frame_pool_.CreateBuffer(width, height);
+    rtc::scoped_refptr<webrtc::I420Buffer> i420_buffer;
+
+    i420_buffer = decoded_frame_pool_.CreateBuffer(width, height);
     if (color_format == COLOR_FormatYUV420Planar) {
       RTC_CHECK_EQ(0, stride % 2);
       RTC_CHECK_EQ(0, slice_height % 2);
@@ -791,31 +793,23 @@
       const uint8_t* y_ptr = payload;
       const uint8_t* u_ptr = y_ptr + stride * slice_height;
       const uint8_t* v_ptr = u_ptr + uv_stride * u_slice_height;
-      libyuv::I420Copy(y_ptr, stride,
-                       u_ptr, uv_stride,
-                       v_ptr, uv_stride,
-                       frame_buffer->MutableDataY(),
-                       frame_buffer->StrideY(),
-                       frame_buffer->MutableDataU(),
-                       frame_buffer->StrideU(),
-                       frame_buffer->MutableDataV(),
-                       frame_buffer->StrideV(),
+      libyuv::I420Copy(y_ptr, stride, u_ptr, uv_stride, v_ptr, uv_stride,
+                       i420_buffer->MutableDataY(), i420_buffer->StrideY(),
+                       i420_buffer->MutableDataU(), i420_buffer->StrideU(),
+                       i420_buffer->MutableDataV(), i420_buffer->StrideV(),
                        width, height);
     } else {
       // All other supported formats are nv12.
       const uint8_t* y_ptr = payload;
       const uint8_t* uv_ptr = y_ptr + stride * slice_height;
-      libyuv::NV12ToI420(
-          y_ptr, stride,
-          uv_ptr, stride,
-          frame_buffer->MutableDataY(),
-          frame_buffer->StrideY(),
-          frame_buffer->MutableDataU(),
-          frame_buffer->StrideU(),
-          frame_buffer->MutableDataV(),
-          frame_buffer->StrideV(),
-          width, height);
+      libyuv::NV12ToI420(y_ptr, stride, uv_ptr, stride,
+                         i420_buffer->MutableDataY(), i420_buffer->StrideY(),
+                         i420_buffer->MutableDataU(), i420_buffer->StrideU(),
+                         i420_buffer->MutableDataV(), i420_buffer->StrideV(),
+                         width, height);
     }
+    frame_buffer = i420_buffer;
+
     // Return output byte buffer back to codec.
     jni->CallVoidMethod(
         *j_media_codec_video_decoder_,

webrtc/api/androidvideotracksource.cc

diff --git a/webrtc/api/androidvideotracksource.cc b/webrtc/api/androidvideotracksource.cc
index f49cc30..7fd033e 100644
--- a/webrtc/api/androidvideotracksource.cc
+++ b/webrtc/api/androidvideotracksource.cc
@@ -115,7 +115,7 @@
     std::swap(rotated_width, rotated_height);
   }
 
-  rtc::scoped_refptr<webrtc::VideoFrameBuffer> buffer =
+  rtc::scoped_refptr<webrtc::I420Buffer> buffer =
       pre_scale_pool_.CreateBuffer(rotated_width, rotated_height);
 
   const uint8_t* y_plane = static_cast<const uint8_t*>(frame_data);