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

Side by Side Diff: webrtc/media/base/videobroadcaster.cc

Issue 2517173004: Move VideoFrame and related declarations to webrtc/api/video. (Closed)
Patch Set: Make rotation check clearer. Created 3 years, 11 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
« no previous file with comments | « webrtc/media/base/videobroadcaster.h ('k') | webrtc/media/base/videobroadcaster_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2016 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #include "webrtc/media/base/videobroadcaster.h" 11 #include "webrtc/media/base/videobroadcaster.h"
12 12
13 #include <limits> 13 #include <limits>
14 14
15 #include "webrtc/api/video/i420_buffer.h"
15 #include "webrtc/base/checks.h" 16 #include "webrtc/base/checks.h"
16 #include "webrtc/base/logging.h" 17 #include "webrtc/base/logging.h"
17 18
18 namespace rtc { 19 namespace rtc {
19 20
20 VideoBroadcaster::VideoBroadcaster() { 21 VideoBroadcaster::VideoBroadcaster() {
21 thread_checker_.DetachFromThread(); 22 thread_checker_.DetachFromThread();
22 } 23 }
23 24
24 void VideoBroadcaster::AddOrUpdateSink( 25 void VideoBroadcaster::AddOrUpdateSink(
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
102 wants.max_pixel_count_step_up = Optional<int>(); 103 wants.max_pixel_count_step_up = Optional<int>();
103 } 104 }
104 current_wants_ = wants; 105 current_wants_ = wants;
105 } 106 }
106 107
107 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& 108 const rtc::scoped_refptr<webrtc::VideoFrameBuffer>&
108 VideoBroadcaster::GetBlackFrameBuffer(int width, int height) { 109 VideoBroadcaster::GetBlackFrameBuffer(int width, int height) {
109 if (!black_frame_buffer_ || black_frame_buffer_->width() != width || 110 if (!black_frame_buffer_ || black_frame_buffer_->width() != width ||
110 black_frame_buffer_->height() != height) { 111 black_frame_buffer_->height() != height) {
111 rtc::scoped_refptr<webrtc::I420Buffer> buffer = 112 rtc::scoped_refptr<webrtc::I420Buffer> buffer =
112 new RefCountedObject<webrtc::I420Buffer>(width, height); 113 webrtc::I420Buffer::Create(width, height);
113 buffer->SetToBlack(); 114 webrtc::I420Buffer::SetBlack(buffer.get());
114 black_frame_buffer_ = buffer; 115 black_frame_buffer_ = buffer;
115 } 116 }
116 117
117 return black_frame_buffer_; 118 return black_frame_buffer_;
118 } 119 }
119 120
120 } // namespace rtc 121 } // namespace rtc
OLDNEW
« no previous file with comments | « webrtc/media/base/videobroadcaster.h ('k') | webrtc/media/base/videobroadcaster_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698