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

Side by Side Diff: webrtc/media/engine/webrtcvideocapturer.cc

Issue 2411953002: Reland of Make cricket::VideoFrame inherit webrtc::VideoFrame. (Closed)
Patch Set: Fix for windows build. Created 4 years, 2 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/devices/gtkvideorenderer.h ('k') | webrtc/media/engine/webrtcvideoengine2.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 /* 1 /*
2 * Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2011 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
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 ++captured_frames_; 348 ++captured_frames_;
349 // Log the size and pixel aspect ratio of the first captured frame. 349 // Log the size and pixel aspect ratio of the first captured frame.
350 if (1 == captured_frames_) { 350 if (1 == captured_frames_) {
351 LOG(LS_INFO) << "Captured frame size " 351 LOG(LS_INFO) << "Captured frame size "
352 << sample.width() << "x" << sample.height() 352 << sample.width() << "x" << sample.height()
353 << ". Expected format " << GetCaptureFormat()->ToString(); 353 << ". Expected format " << GetCaptureFormat()->ToString();
354 } 354 }
355 355
356 OnFrame(cricket::WebRtcVideoFrame( 356 OnFrame(cricket::WebRtcVideoFrame(
357 sample.video_frame_buffer(), sample.rotation(), 357 sample.video_frame_buffer(), sample.rotation(),
358 sample.render_time_ms() * rtc::kNumMicrosecsPerMillisec, 0), 358 sample.render_time_ms() * rtc::kNumMicrosecsPerMillisec),
359 sample.width(), sample.height()); 359 sample.width(), sample.height());
360 } 360 }
361 361
362 void WebRtcVideoCapturer::OnCaptureDelayChanged(const int32_t id, 362 void WebRtcVideoCapturer::OnCaptureDelayChanged(const int32_t id,
363 const int32_t delay) { 363 const int32_t delay) {
364 LOG(LS_INFO) << "Capture delay changed to " << delay << " ms"; 364 LOG(LS_INFO) << "Capture delay changed to " << delay << " ms";
365 } 365 }
366 366
367 } // namespace cricket 367 } // namespace cricket
OLDNEW
« no previous file with comments | « webrtc/media/devices/gtkvideorenderer.h ('k') | webrtc/media/engine/webrtcvideoengine2.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698