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

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

Issue 1454053002: Update common_video/interface -> common_video/include. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month 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
« no previous file with comments | « no previous file | content/renderer/media/webrtc/webrtc_video_frame_adapter.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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"
11 #include "media/base/timestamp_constants.h" 11 #include "media/base/timestamp_constants.h"
12 #include "media/base/video_frame.h" 12 #include "media/base/video_frame.h"
13 #include "media/base/video_frame_pool.h" 13 #include "media/base/video_frame_pool.h"
14 #include "third_party/libjingle/source/talk/media/base/videoframefactory.h" 14 #include "third_party/libjingle/source/talk/media/base/videoframefactory.h"
15 #include "third_party/libjingle/source/talk/media/webrtc/webrtcvideoframe.h" 15 #include "third_party/libjingle/source/talk/media/webrtc/webrtcvideoframe.h"
16 #include "third_party/libyuv/include/libyuv/convert_from.h" 16 #include "third_party/libyuv/include/libyuv/convert_from.h"
17 #include "third_party/libyuv/include/libyuv/scale.h" 17 #include "third_party/libyuv/include/libyuv/scale.h"
18 #include "third_party/webrtc/common_video/interface/video_frame_buffer.h" 18 #include "third_party/webrtc/common_video/include/video_frame_buffer.h"
19 #include "third_party/webrtc/common_video/rotation.h" 19 #include "third_party/webrtc/common_video/rotation.h"
20 20
21 namespace content { 21 namespace content {
22 namespace { 22 namespace {
23 23
24 // Empty method used for keeping a reference to the original media::VideoFrame. 24 // Empty method used for keeping a reference to the original media::VideoFrame.
25 // The reference to |frame| is kept in the closure that calls this method. 25 // The reference to |frame| is kept in the closure that calls this method.
26 void ReleaseOriginalFrame(const scoped_refptr<media::VideoFrame>& frame) { 26 void ReleaseOriginalFrame(const scoped_refptr<media::VideoFrame>& frame) {
27 } 27 }
28 28
(...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 reinterpret_cast<MediaVideoFrameFactory*>(frame_factory()); 240 reinterpret_cast<MediaVideoFrameFactory*>(frame_factory());
241 media_video_frame_factory->SetFrame(frame, elapsed_time); 241 media_video_frame_factory->SetFrame(frame, elapsed_time);
242 242
243 // This signals to libJingle that a new VideoFrame is available. 243 // This signals to libJingle that a new VideoFrame is available.
244 SignalFrameCaptured(this, media_video_frame_factory->GetCapturedFrame()); 244 SignalFrameCaptured(this, media_video_frame_factory->GetCapturedFrame());
245 245
246 media_video_frame_factory->ReleaseFrame(); // Release the frame ASAP. 246 media_video_frame_factory->ReleaseFrame(); // Release the frame ASAP.
247 } 247 }
248 248
249 } // namespace content 249 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/renderer/media/webrtc/webrtc_video_frame_adapter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698