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

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

Issue 1302173004: Remove per-frame captured frame logging. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 5 years, 3 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 | « no previous file | no next file » | 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 * 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 1806 matching lines...) Expand 10 before | Expand all | Expand 10 after
1817 if (first_frame_timestamp_ms_ == 0) { 1817 if (first_frame_timestamp_ms_ == 0) {
1818 first_frame_timestamp_ms_ = rtc::Time() - frame_delta_ms; 1818 first_frame_timestamp_ms_ = rtc::Time() - frame_delta_ms;
1819 } 1819 }
1820 1820
1821 last_frame_timestamp_ms_ = first_frame_timestamp_ms_ + frame_delta_ms; 1821 last_frame_timestamp_ms_ = first_frame_timestamp_ms_ + frame_delta_ms;
1822 video_frame.set_render_time_ms(last_frame_timestamp_ms_); 1822 video_frame.set_render_time_ms(last_frame_timestamp_ms_);
1823 // Reconfigure codec if necessary. 1823 // Reconfigure codec if necessary.
1824 SetDimensions( 1824 SetDimensions(
1825 video_frame.width(), video_frame.height(), capturer->IsScreencast()); 1825 video_frame.width(), video_frame.height(), capturer->IsScreencast());
1826 1826
1827 LOG(LS_VERBOSE) << "IncomingCapturedFrame: " << video_frame.width() << "x"
1828 << video_frame.height() << " -> (codec) "
1829 << parameters_.encoder_config.streams.back().width << "x"
1830 << parameters_.encoder_config.streams.back().height;
1831 stream_->Input()->IncomingCapturedFrame(video_frame); 1827 stream_->Input()->IncomingCapturedFrame(video_frame);
1832 } 1828 }
1833 1829
1834 bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetCapturer( 1830 bool WebRtcVideoChannel2::WebRtcVideoSendStream::SetCapturer(
1835 VideoCapturer* capturer) { 1831 VideoCapturer* capturer) {
1836 TRACE_EVENT0("webrtc", "WebRtcVideoSendStream::SetCapturer"); 1832 TRACE_EVENT0("webrtc", "WebRtcVideoSendStream::SetCapturer");
1837 if (!DisconnectCapturer() && capturer == NULL) { 1833 if (!DisconnectCapturer() && capturer == NULL) {
1838 return false; 1834 return false;
1839 } 1835 }
1840 1836
(...skipping 881 matching lines...) Expand 10 before | Expand all | Expand 10 after
2722 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id]; 2718 video_codecs[i].rtx_payload_type = rtx_mapping[video_codecs[i].codec.id];
2723 } 2719 }
2724 } 2720 }
2725 2721
2726 return video_codecs; 2722 return video_codecs;
2727 } 2723 }
2728 2724
2729 } // namespace cricket 2725 } // namespace cricket
2730 2726
2731 #endif // HAVE_WEBRTC_VIDEO 2727 #endif // HAVE_WEBRTC_VIDEO
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698