Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(162)

Side by Side Diff: content/renderer/media/webrtc/webrtc_video_capturer_adapter.cc

Issue 1267003004: Revert to zero-initializing buffers for FFmpegVideoDecoder (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Changed method name. Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h" 5 #include "content/renderer/media/webrtc/webrtc_video_capturer_adapter.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/memory/aligned_memory.h" 8 #include "base/memory/aligned_memory.h"
9 #include "base/trace_event/trace_event.h" 9 #include "base/trace_event/trace_event.h"
10 #include "content/renderer/media/webrtc/webrtc_video_frame_adapter.h" 10 #include "content/renderer/media/webrtc/webrtc_video_frame_adapter.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 if (video_frame->natural_size() == video_frame->visible_rect().size()) { 99 if (video_frame->natural_size() == video_frame->visible_rect().size()) {
100 return new cricket::WebRtcVideoFrame( 100 return new cricket::WebRtcVideoFrame(
101 new rtc::RefCountedObject<WebRtcVideoFrameAdapter>(video_frame), 101 new rtc::RefCountedObject<WebRtcVideoFrameAdapter>(video_frame),
102 captured_frame_.elapsed_time, timestamp_ns); 102 captured_frame_.elapsed_time, timestamp_ns);
103 } 103 }
104 104
105 // We need to scale the frame before we hand it over to cricket. 105 // We need to scale the frame before we hand it over to cricket.
106 scoped_refptr<media::VideoFrame> scaled_frame = 106 scoped_refptr<media::VideoFrame> scaled_frame =
107 scaled_frame_pool_.CreateFrame(media::PIXEL_FORMAT_I420, output_size, 107 scaled_frame_pool_.CreateFrame(media::PIXEL_FORMAT_I420, output_size,
108 gfx::Rect(output_size), output_size, 108 gfx::Rect(output_size), output_size,
109 frame_->timestamp()); 109 frame_->timestamp(), false);
110 libyuv::I420Scale(video_frame->visible_data(media::VideoFrame::kYPlane), 110 libyuv::I420Scale(video_frame->visible_data(media::VideoFrame::kYPlane),
111 video_frame->stride(media::VideoFrame::kYPlane), 111 video_frame->stride(media::VideoFrame::kYPlane),
112 video_frame->visible_data(media::VideoFrame::kUPlane), 112 video_frame->visible_data(media::VideoFrame::kUPlane),
113 video_frame->stride(media::VideoFrame::kUPlane), 113 video_frame->stride(media::VideoFrame::kUPlane),
114 video_frame->visible_data(media::VideoFrame::kVPlane), 114 video_frame->visible_data(media::VideoFrame::kVPlane),
115 video_frame->stride(media::VideoFrame::kVPlane), 115 video_frame->stride(media::VideoFrame::kVPlane),
116 video_frame->visible_rect().width(), 116 video_frame->visible_rect().width(),
117 video_frame->visible_rect().height(), 117 video_frame->visible_rect().height(),
118 scaled_frame->data(media::VideoFrame::kYPlane), 118 scaled_frame->data(media::VideoFrame::kYPlane),
119 scaled_frame->stride(media::VideoFrame::kYPlane), 119 scaled_frame->stride(media::VideoFrame::kYPlane),
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 reinterpret_cast<MediaVideoFrameFactory*>(frame_factory()); 237 reinterpret_cast<MediaVideoFrameFactory*>(frame_factory());
238 media_video_frame_factory->SetFrame(frame, elapsed_time); 238 media_video_frame_factory->SetFrame(frame, elapsed_time);
239 239
240 // This signals to libJingle that a new VideoFrame is available. 240 // This signals to libJingle that a new VideoFrame is available.
241 SignalFrameCaptured(this, media_video_frame_factory->GetCapturedFrame()); 241 SignalFrameCaptured(this, media_video_frame_factory->GetCapturedFrame());
242 242
243 media_video_frame_factory->ReleaseFrame(); // Release the frame ASAP. 243 media_video_frame_factory->ReleaseFrame(); // Release the frame ASAP.
244 } 244 }
245 245
246 } // namespace content 246 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698