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: talk/media/webrtc/webrtcvoiceengine.cc

Issue 1457653003: Remove SetVideoLogging/SetAudioLogging from ChannelManager and down the stack. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: moar dy 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
OLDNEW
1 /* 1 /*
2 * libjingle 2 * libjingle
3 * Copyright 2004 Google Inc. 3 * Copyright 2004 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 1123 matching lines...) Expand 10 before | Expand all | Expand 10 after
1134 } 1134 }
1135 } 1135 }
1136 return false; 1136 return false;
1137 } 1137 }
1138 const std::vector<RtpHeaderExtension>& 1138 const std::vector<RtpHeaderExtension>&
1139 WebRtcVoiceEngine::rtp_header_extensions() const { 1139 WebRtcVoiceEngine::rtp_header_extensions() const {
1140 RTC_DCHECK(signal_thread_checker_.CalledOnValidThread()); 1140 RTC_DCHECK(signal_thread_checker_.CalledOnValidThread());
1141 return rtp_header_extensions_; 1141 return rtp_header_extensions_;
1142 } 1142 }
1143 1143
1144 void WebRtcVoiceEngine::SetLogging(int min_sev, const char* filter) {
1145 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
1146 // if min_sev == -1, we keep the current log level.
1147 if (min_sev >= 0) {
1148 SetTraceFilter(SeverityToFilter(min_sev));
1149 }
1150 log_options_ = filter;
1151 SetTraceOptions(initialized_ ? log_options_ : "");
1152 }
1153
1154 int WebRtcVoiceEngine::GetLastEngineError() { 1144 int WebRtcVoiceEngine::GetLastEngineError() {
1155 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 1145 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
1156 return voe_wrapper_->error(); 1146 return voe_wrapper_->error();
1157 } 1147 }
1158 1148
1159 void WebRtcVoiceEngine::SetTraceFilter(int filter) { 1149 void WebRtcVoiceEngine::SetTraceFilter(int filter) {
1160 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread()); 1150 RTC_DCHECK(worker_thread_checker_.CalledOnValidThread());
1161 log_filter_ = filter; 1151 log_filter_ = filter;
1162 tracing_->SetTraceFilter(filter); 1152 tracing_->SetTraceFilter(filter);
1163 } 1153 }
(...skipping 1665 matching lines...) Expand 10 before | Expand all | Expand 10 after
2829 LOG(LS_WARNING) << "Unknown codec " << ToString(codec); 2819 LOG(LS_WARNING) << "Unknown codec " << ToString(codec);
2830 return false; 2820 return false;
2831 } 2821 }
2832 } 2822 }
2833 return true; 2823 return true;
2834 } 2824 }
2835 2825
2836 } // namespace cricket 2826 } // namespace cricket
2837 2827
2838 #endif // HAVE_WEBRTC_VOICE 2828 #endif // HAVE_WEBRTC_VOICE
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698