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

Unified Diff: content/renderer/media/webrtc_local_audio_track.cc

Issue 1547073003: Switch to standard integer types in content/renderer/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/webrtc_local_audio_track.cc
diff --git a/content/renderer/media/webrtc_local_audio_track.cc b/content/renderer/media/webrtc_local_audio_track.cc
index 26a88bdb25a6f28d0014a69665e956c36da84c29..cb48668eaeccc09a670c0a150b5d439e8d515778 100644
--- a/content/renderer/media/webrtc_local_audio_track.cc
+++ b/content/renderer/media/webrtc_local_audio_track.cc
@@ -4,6 +4,8 @@
#include "content/renderer/media/webrtc_local_audio_track.h"
+#include <stdint.h>
+
#include <limits>
#include "content/public/renderer/media_stream_audio_sink.h"
@@ -60,13 +62,14 @@ void WebRtcLocalAudioTrack::Capture(const media::AudioBus& audio_bus,
// post-processed data that may be all zeros even though the signal contained
// energy before the processing. In this case, report nonzero energy even if
// the energy of the data in |audio_bus| is zero.
- const float minimum_signal_level = force_report_nonzero_energy ?
- 1.0f / std::numeric_limits<int16>::max() : 0.0f;
+ const float minimum_signal_level =
+ force_report_nonzero_energy ? 1.0f / std::numeric_limits<int16_t>::max()
+ : 0.0f;
const float signal_level = std::max(
minimum_signal_level,
std::min(1.0f, level_calculator_->Calculate(audio_bus)));
const int signal_level_as_pcm16 =
- static_cast<int>(signal_level * std::numeric_limits<int16>::max() +
+ static_cast<int>(signal_level * std::numeric_limits<int16_t>::max() +
0.5f /* rounding to nearest int */);
adapter_->SetSignalLevel(signal_level_as_pcm16);
« no previous file with comments | « content/renderer/media/webrtc_local_audio_track.h ('k') | content/renderer/media/webrtc_local_audio_track_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698