commit 4765070b8d6f024509c717c04d9b708750666927
author Miguel Casas-Sanchez <mcasas@webrtc.org> Fri May 29 17:21:40 2015 -0700
committer Miguel Casas-Sanchez <mcasas@webrtc.org> Sat May 30 00:21:56 2015 +0000
tree 64548980e1c649e9ab2653c3388a29d33cd041ed
parent c2cb266c93d5918f7a54fd62c07c387dde9186a2

Rename I420VideoFrame to VideoFrame.

This is a mechanical change since it affects so many
files.
I420VideoFrame -> VideoFrame
and reformatted.

Rationale: in the next CL I420VideoFrame will
get an indication of Pixel Format (I420 for
starters) and of storage type: usually
UNOWNED, could be SHMEM, and in the near
future will be possibly TEXTURE. See
https://codereview.chromium.org/1154153003
for the change that happened in Cr.

BUG=4730, chromium:440843
R=jiayl@webrtc.org, niklas.enbom@webrtc.org, pthatcher@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/52629004

Cr-Commit-Position: refs/heads/master@{#9339}

talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

diff --git a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
index 2c2c12d..b92b2de 100644
--- a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
+++ b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc
@@ -51,7 +51,7 @@
 using webrtc::CodecSpecificInfo;
 using webrtc::DecodedImageCallback;
 using webrtc::EncodedImage;
-using webrtc::I420VideoFrame;
+using webrtc::VideoFrame;
 using webrtc::RTPFragmentationHeader;
 using webrtc::TickTime;
 using webrtc::VideoCodec;
@@ -108,7 +108,7 @@
   bool use_surface_;
   int error_count_;
   VideoCodec codec_;
-  I420VideoFrame decoded_image_;
+  VideoFrame decoded_image_;
   NativeHandleImpl native_handle_;
   DecodedImageCallback* callback_;
   int frames_received_;  // Number of frames received by decoder.
@@ -654,9 +654,9 @@
   int32_t callback_status = WEBRTC_VIDEO_CODEC_OK;
   if (use_surface_) {
     native_handle_.SetTextureObject(surface_texture_, texture_id);
-    I420VideoFrame texture_image(&native_handle_, width, height,
-                                 output_timestamp_, 0, webrtc::kVideoRotation_0,
-                                 rtc::Callback0<void>());
+    VideoFrame texture_image(&native_handle_, width, height, output_timestamp_,
+                             0, webrtc::kVideoRotation_0,
+                             rtc::Callback0<void>());
     texture_image.set_ntp_time_ms(output_ntp_time_ms_);
     callback_status = callback_->Decoded(texture_image);
   } else {