commit 7865664031afb7c4ae0bdb4ec3b57f1caaf99068
author oprypin <oprypin@webrtc.org> Tue Aug 22 20:57:48 2017
committer Commit Bot <commit-bot@chromium.org> Tue Aug 22 20:57:48 2017
tree a990aaf69529f3b3554604bf9a02df4ec47a0d55
parent e0d2fcfc77c570b5df0beb0ace2e5fbd047c599a

Fix an implicit narrowing conversion found by MSVC

Followup to https://codereview.webrtc.org/2999363002/

BUG=None

Review-Url: https://codereview.webrtc.org/3003133002
Cr-Original-Commit-Position: refs/heads/master@{#19456}
Cr-Mirrored-From: https://chromium.googlesource.com/external/webrtc
Cr-Mirrored-Commit: 0826fb2b3594ea49238da3800056ea20f1c82c97

api/audio_codecs/L16/audio_encoder_L16.cc

diff --git a/api/audio_codecs/L16/audio_encoder_L16.cc b/api/audio_codecs/L16/audio_encoder_L16.cc
index bd24389..a0acfe7 100644
--- a/api/audio_codecs/L16/audio_encoder_L16.cc
+++ b/api/audio_codecs/L16/audio_encoder_L16.cc
@@ -14,6 +14,7 @@
 #include "webrtc/modules/audio_coding/codecs/pcm16b/audio_encoder_pcm16b.h"
 #include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b_common.h"
 #include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/safe_conversions.h"
 
 namespace webrtc {
 
@@ -21,7 +22,7 @@
     const SdpAudioFormat& format) {
   Config config;
   config.sample_rate_hz = format.clockrate_hz;
-  config.num_channels = format.num_channels;
+  config.num_channels = rtc::checked_cast<int>(format.num_channels);
   return STR_CASE_CMP(format.name.c_str(), "L16") == 0 && config.IsOk()
              ? rtc::Optional<Config>(config)
              : rtc::Optional<Config>();

call/rtp_demuxer_unittest.cc

diff --git a/call/rtp_demuxer_unittest.cc b/call/rtp_demuxer_unittest.cc
index 39dc67b..6fe5fc8 100644
--- a/call/rtp_demuxer_unittest.cc
+++ b/call/rtp_demuxer_unittest.cc
@@ -24,6 +24,7 @@
 #include "webrtc/rtc_base/basictypes.h"
 #include "webrtc/rtc_base/checks.h"
 #include "webrtc/rtc_base/ptr_util.h"
+#include "webrtc/rtc_base/safe_conversions.h"
 #include "webrtc/test/gmock.h"
 #include "webrtc/test/gtest.h"
 
@@ -346,7 +347,8 @@
   }
 
   for (size_t i = 0; i < arraysize(rsids); i++) {
-    auto packet = CreatePacketWithSsrcRsid(i, rsids[i]);
+    auto packet = CreatePacketWithSsrcRsid(rtc::checked_cast<uint32_t>(i),
+                                           rsids[i]);
     EXPECT_CALL(sinks[i], OnRtpPacket(SamePacketAs(*packet))).Times(1);
     EXPECT_TRUE(demuxer_.OnRtpPacket(*packet));
   }
@@ -360,7 +362,8 @@
   }
 
   for (size_t i = 0; i < arraysize(mids); i++) {
-    auto packet = CreatePacketWithSsrcMid(i, mids[i]);
+    auto packet = CreatePacketWithSsrcMid(rtc::checked_cast<uint32_t>(i),
+                                          mids[i]);
     EXPECT_CALL(sinks[i], OnRtpPacket(SamePacketAs(*packet))).Times(1);
     EXPECT_TRUE(demuxer_.OnRtpPacket(*packet));
   }
@@ -414,7 +417,7 @@
   std::unique_ptr<RtpPacketReceived> packets[5];
   for (size_t i = 0; i < arraysize(packets); i++) {
     packets[i] = CreatePacketWithSsrc(ssrc);
-    packets[i]->SetSequenceNumber(i);
+    packets[i]->SetSequenceNumber(rtc::checked_cast<uint16_t>(i));
   }
 
   InSequence sequence;