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

Side by Side Diff: webrtc/video/video_send_stream.cc

Issue 1403363003: Move VoiceEngineObserver into AudioSendStream so that we detect typing noises and return properly i… (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: that's all folks! (incl rebase), or is it? 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 | « webrtc/call/call_unittest.cc ('k') | webrtc/webrtc.gyp » ('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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 91
92 std::string VideoSendStream::Config::ToString() const { 92 std::string VideoSendStream::Config::ToString() const {
93 std::stringstream ss; 93 std::stringstream ss;
94 ss << "{encoder_settings: " << encoder_settings.ToString(); 94 ss << "{encoder_settings: " << encoder_settings.ToString();
95 ss << ", rtp: " << rtp.ToString(); 95 ss << ", rtp: " << rtp.ToString();
96 ss << ", pre_encode_callback: " 96 ss << ", pre_encode_callback: "
97 << (pre_encode_callback != nullptr ? "(I420FrameCallback)" : "nullptr"); 97 << (pre_encode_callback != nullptr ? "(I420FrameCallback)" : "nullptr");
98 ss << ", post_encode_callback: " << (post_encode_callback != nullptr 98 ss << ", post_encode_callback: " << (post_encode_callback != nullptr
99 ? "(EncodedFrameObserver)" 99 ? "(EncodedFrameObserver)"
100 : "nullptr"); 100 : "nullptr");
101 ss << "local_renderer: " << (local_renderer != nullptr ? "(VideoRenderer)" 101 ss << ", local_renderer: " << (local_renderer != nullptr ? "(VideoRenderer)"
102 : "nullptr"); 102 : "nullptr");
103 ss << ", render_delay_ms: " << render_delay_ms; 103 ss << ", render_delay_ms: " << render_delay_ms;
104 ss << ", target_delay_ms: " << target_delay_ms; 104 ss << ", target_delay_ms: " << target_delay_ms;
105 ss << ", suspend_below_min_bitrate: " << (suspend_below_min_bitrate ? "on" 105 ss << ", suspend_below_min_bitrate: " << (suspend_below_min_bitrate ? "on"
106 : "off"); 106 : "off");
107 ss << '}'; 107 ss << '}';
108 return ss.str(); 108 return ss.str();
109 } 109 }
110 110
111 namespace internal { 111 namespace internal {
(...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after
566 vie_channel_->IsSendingFecEnabled()); 566 vie_channel_->IsSendingFecEnabled());
567 567
568 // Restart the media flow 568 // Restart the media flow
569 vie_encoder_->Restart(); 569 vie_encoder_->Restart();
570 570
571 return true; 571 return true;
572 } 572 }
573 573
574 } // namespace internal 574 } // namespace internal
575 } // namespace webrtc 575 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/call/call_unittest.cc ('k') | webrtc/webrtc.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698