Reland of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame.

webrtc/api/androidvideotracksource.cc

 /*
  *  Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 77 matching lines @@
   nv12toi420_scaler_.NV12ToI420Scale(
       y_plane, width,
       uv_plane, uv_width * 2,
       crop_width, crop_height,
       buffer->MutableDataY(), buffer->StrideY(),
       // Swap U and V, since we have NV21, not NV12.
       buffer->MutableDataV(), buffer->StrideV(),
       buffer->MutableDataU(), buffer->StrideU(),
       buffer->width(), buffer->height());
 
-  OnFrame(cricket::WebRtcVideoFrame(
-              buffer, static_cast<webrtc::VideoRotation>(rotation),
-              translated_camera_time_us));
+  OnFrame(VideoFrame(buffer, static_cast<webrtc::VideoRotation>(rotation),
+                     translated_camera_time_us));
 }
 
 void AndroidVideoTrackSource::OnTextureFrameCaptured(
     int width,
     int height,
     int rotation,
     int64_t timestamp_ns,
     const webrtc_jni::NativeHandleImpl& handle) {
   RTC_DCHECK(camera_thread_checker_.CalledOnValidThread());
   RTC_DCHECK(rotation == 0 || rotation == 90 || rotation == 180 ||
@@ skipping 29 matching lines @@
   bool do_rotate = apply_rotation();
 
   if (do_rotate) {
     if (rotation == webrtc::kVideoRotation_90 ||
         rotation == webrtc::kVideoRotation_270) {
       std::swap(adapted_width, adapted_height);
     }
     matrix.Rotate(static_cast<webrtc::VideoRotation>(rotation));
   }
 
-  OnFrame(cricket::WebRtcVideoFrame(
-              surface_texture_helper_->CreateTextureFrame(
-                  adapted_width, adapted_height,
-                  webrtc_jni::NativeHandleImpl(handle.oes_texture_id, matrix)),
-              do_rotate ? webrtc::kVideoRotation_0
-                        : static_cast<webrtc::VideoRotation>(rotation),
-              translated_camera_time_us));
+  OnFrame(VideoFrame(
+      surface_texture_helper_->CreateTextureFrame(
+          adapted_width, adapted_height,
+          webrtc_jni::NativeHandleImpl(handle.oes_texture_id, matrix)),
+      do_rotate ? webrtc::kVideoRotation_0
+                : static_cast<webrtc::VideoRotation>(rotation),
+      translated_camera_time_us));
 }
 
 void AndroidVideoTrackSource::OnOutputFormatRequest(int width,
                                                     int height,
                                                     int fps) {
   cricket::VideoFormat format(width, height,
                               cricket::VideoFormat::FpsToInterval(fps), 0);
   video_adapter()->OnOutputFormatRequest(format);
 }
 
 }  // namespace webrtc