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

Side by Side Diff: webrtc/modules/audio_coding/main/acm2/audio_coding_module_impl.cc

Issue 1181033009: Workaround a (Windows) linker bug when doing a PGO build. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Add a comment. Created 5 years, 6 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 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
265 265
266 return codec_manager_.CurrentEncoder()->SampleRateHz(); 266 return codec_manager_.CurrentEncoder()->SampleRateHz();
267 } 267 }
268 268
269 // Get encode bitrate. 269 // Get encode bitrate.
270 // Adaptive rate codecs return their current encode target rate, while other 270 // Adaptive rate codecs return their current encode target rate, while other
271 // codecs return there longterm avarage or their fixed rate. 271 // codecs return there longterm avarage or their fixed rate.
272 // TODO(henrik.lundin): Remove; not used. 272 // TODO(henrik.lundin): Remove; not used.
273 int AudioCodingModuleImpl::SendBitrate() const { 273 int AudioCodingModuleImpl::SendBitrate() const {
274 FATAL() << "Deprecated"; 274 FATAL() << "Deprecated";
275 // This return statement is required to workaround a bug in VS2013 Update 4
276 // when turning on the whole program optimizations. Without hit the linker
277 // will hang because it doesn't seem to find an exit path for this function.
278 // This is likely a bug in link.exe and would probably be fixed in VS2015.
279 return -1;
275 // CriticalSectionScoped lock(acm_crit_sect_); 280 // CriticalSectionScoped lock(acm_crit_sect_);
276 // 281 //
277 // if (!codec_manager_.current_encoder()) { 282 // if (!codec_manager_.current_encoder()) {
278 // WEBRTC_TRACE(webrtc::kTraceStream, webrtc::kTraceAudioCoding, id_, 283 // WEBRTC_TRACE(webrtc::kTraceStream, webrtc::kTraceAudioCoding, id_,
279 // "SendBitrate Failed, no codec is registered"); 284 // "SendBitrate Failed, no codec is registered");
280 // return -1; 285 // return -1;
281 // } 286 // }
282 // 287 //
283 // WebRtcACMCodecParams encoder_param; 288 // WebRtcACMCodecParams encoder_param;
284 // codec_manager_.current_encoder()->EncoderParams(&encoder_param); 289 // codec_manager_.current_encoder()->EncoderParams(&encoder_param);
(...skipping 973 matching lines...) Expand 10 before | Expand all | Expand 10 after
1258 *channels = 1; 1263 *channels = 1;
1259 break; 1264 break;
1260 #endif 1265 #endif
1261 default: 1266 default:
1262 FATAL() << "Codec type " << codec_type << " not supported."; 1267 FATAL() << "Codec type " << codec_type << " not supported.";
1263 } 1268 }
1264 return true; 1269 return true;
1265 } 1270 }
1266 1271
1267 } // namespace webrtc 1272 } // namespace webrtc
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