Revert "WebRtcVideoCapturerAdapter mods for Texture-backed VideoFrames"

content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"
 
 #include "base/bind.h"
 #include "base/memory/aligned_memory.h"
 #include "base/trace_event/trace_event.h"
 #include "media/base/video_frame.h"
@@ skipping 101 matching lines @@
   cricket::VideoFrame* CreateAliasedFrame(
       const cricket::CapturedFrame* input_frame,
       int cropped_input_width,
       int cropped_input_height,
       int output_width,
       int output_height) const override {
     // Check that captured_frame is actually our frame.
     DCHECK(input_frame == &captured_frame_);
     DCHECK(frame_.get());
 
-    const int64_t timestamp_ns = frame_->timestamp().InMicroseconds() *
-                                 base::Time::kNanosecondsPerMicrosecond;
-
-    if (frame_->format() == media::VideoFrame::NATIVE_TEXTURE) {
-      return new cricket::WebRtcVideoFrame(
-          new rtc::RefCountedObject<VideoFrameWrapper>(frame_),
-          captured_frame_.elapsed_time, timestamp_ns);
-    }
-
     // Create a centered cropped visible rect that preservers aspect ratio for
     // cropped natural size.
     gfx::Rect visible_rect = frame_->visible_rect();
     visible_rect.ClampToCenteredSize(gfx::Size(
         visible_rect.width() * cropped_input_width / input_frame->width,
         visible_rect.height() * cropped_input_height / input_frame->height));
 
     const gfx::Size output_size(output_width, output_height);
     scoped_refptr<media::VideoFrame> video_frame =
         media::VideoFrame::WrapVideoFrame(
             frame_, visible_rect, output_size,
             base::Bind(&ReleaseOriginalFrame, frame_));
 
+    const int64_t timestamp_ns = frame_->timestamp().InMicroseconds() *
+                                 base::Time::kNanosecondsPerMicrosecond;
+
     // If no scaling is needed, return a wrapped version of |frame_| directly.
     if (video_frame->natural_size() == video_frame->visible_rect().size()) {
       return new cricket::WebRtcVideoFrame(
           new rtc::RefCountedObject<VideoFrameWrapper>(video_frame),
           captured_frame_.elapsed_time, timestamp_ns);
     }
 
     // We need to scale the frame before we hand it over to cricket.
     scoped_refptr<media::VideoFrame> scaled_frame =
         scaled_frame_pool_.CreateFrame(media::VideoFrame::I420, output_size,
@@ skipping 102 matching lines @@
   best_format->fourcc = cricket::FOURCC_I420;
   best_format->interval = desired.interval;
   return true;
 }
 
 void WebRtcVideoCapturerAdapter::OnFrameCaptured(
     const scoped_refptr<media::VideoFrame>& frame) {
   DCHECK(thread_checker_.CalledOnValidThread());
   TRACE_EVENT0("video", "WebRtcVideoCapturerAdapter::OnFrameCaptured");
   if (!(media::VideoFrame::I420 == frame->format() ||
-        media::VideoFrame::YV12 == frame->format() ||
-        media::VideoFrame::NATIVE_TEXTURE == frame->format())) {
+        media::VideoFrame::YV12 == frame->format())) {
+    // Some types of sources support textures as output. Since connecting
+    // sources and sinks do not check the format, we need to just ignore
+    // formats that we can not handle.
     NOTREACHED();

[Justin Chuang, 2015/05/18 11:41:21]

The NOTREACHED() will be hit when reproducing 485323

     return;
   }
 
   if (first_frame_timestamp_ == media::kNoTimestamp())
     first_frame_timestamp_ = frame->timestamp();
 
   const int64 elapsed_time =
       (frame->timestamp() - first_frame_timestamp_).InMicroseconds() *
       base::Time::kNanosecondsPerMicrosecond;
 
   // Inject the frame via the VideoFrameFractory.
   DCHECK(frame_factory_ == frame_factory());
   frame_factory_->SetFrame(frame, elapsed_time);
 
   // This signals to libJingle that a new VideoFrame is available.
   SignalFrameCaptured(this, frame_factory_->GetCapturedFrame());
 
   frame_factory_->ReleaseFrame();  // Release the frame ASAP.
 }
 
 }  // namespace content