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

Side by Side Diff: talk/media/webrtc/webrtcvideoengine2.cc

Issue 1324263004: Remove cricket::VideoFrame::Set/GetElapsedTime() (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebased. Re-added CapturedFrame.elapsed_time. Remove once Chromium is updated. Created 5 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2014 Google Inc. 3 * Copyright 2014 Google Inc.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are met: 6 * modification, are permitted provided that the following conditions are met:
7 * 7 *
8 * 1. Redistributions of source code must retain the above copyright notice, 8 * 1. Redistributions of source code must retain the above copyright notice,
9 * this list of conditions and the following disclaimer. 9 * this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright notice, 10 * 2. Redistributions in binary form must reproduce the above copyright notice,
(...skipping 2519 matching lines...) Expand 10 before | Expand all | Expand 10 after
2530 LOG(LS_WARNING) << "VideoReceiveStream not connected to a VideoRenderer."; 2530 LOG(LS_WARNING) << "VideoReceiveStream not connected to a VideoRenderer.";
2531 return; 2531 return;
2532 } 2532 }
2533 2533
2534 if (frame.width() != last_width_ || frame.height() != last_height_) { 2534 if (frame.width() != last_width_ || frame.height() != last_height_) {
2535 SetSize(frame.width(), frame.height()); 2535 SetSize(frame.width(), frame.height());
2536 } 2536 }
2537 2537
2538 const WebRtcVideoFrame render_frame( 2538 const WebRtcVideoFrame render_frame(
2539 frame.video_frame_buffer(), 2539 frame.video_frame_buffer(),
2540 elapsed_time_ms * rtc::kNumNanosecsPerMillisec,
2541 frame.render_time_ms() * rtc::kNumNanosecsPerMillisec, frame.rotation()); 2540 frame.render_time_ms() * rtc::kNumNanosecsPerMillisec, frame.rotation());
2542 renderer_->RenderFrame(&render_frame); 2541 renderer_->RenderFrame(&render_frame);
2543 } 2542 }
2544 2543
2545 bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsTextureSupported() const { 2544 bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsTextureSupported() const {
2546 return true; 2545 return true;
2547 } 2546 }
2548 2547
2549 bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsDefaultStream() const { 2548 bool WebRtcVideoChannel2::WebRtcVideoReceiveStream::IsDefaultStream() const {
2550 return default_stream_; 2549 return default_stream_;
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after
2737 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2736 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2738 } 2737 }
2739 } 2738 }
2740 2739
2741 return video_codecs; 2740 return video_codecs;
2742 } 2741 }
2743 2742
2744 } // namespace cricket 2743 } // namespace cricket
2745 2744
2746 #endif // HAVE_WEBRTC_VIDEO 2745 #endif // HAVE_WEBRTC_VIDEO
OLDNEW
« no previous file with comments | « talk/media/webrtc/webrtcvideocapturer.cc ('k') | talk/media/webrtc/webrtcvideoengine2_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698