zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing warning C4267 on Win (more_configs).

Browse Source 
This is a follow-up of https://webrtc-review.googlesource.com/c/src/+/12921.

Bug: chromium:759980
Change-Id: Ifd39adb6541c0c7e0337f587a8b34b84a07331ed
Reviewed-on: https://webrtc-review.googlesource.com/13122
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20341}
This commit is contained in:
Mirko Bonadei
2017-10-19 09:00:17 +02:00
committed by Commit Bot
parent 117c48291c
commit 737e073f8d
16 changed files with 70 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
modules/audio_coding/codecs/opus/opus_unittest.cc
View File

@ -15,6 +15,7 @@
#include "modules/audio_coding/codecs/opus/opus_interface.h"
#include "modules/audio_coding/neteq/tools/audio_loop.h"
#include "rtc_base/checks.h"
#include "rtc_base/safe_conversions.h"
#include "test/gtest.h"
#include "test/testsupport/fileutils.h"
@ -334,7 +335,7 @@ void OpusTest::TestCbrEffect(bool cbr, int block_length_ms) {
int32_t diff = std::abs((int32_t)encoded_bytes_ - prev_pkt_size);
max_pkt_size_diff = std::max(max_pkt_size_diff, diff);
}
prev_pkt_size = encoded_bytes_;
prev_pkt_size = rtc::checked_cast<int32_t>(encoded_bytes_);
}
if (cbr) {
@ -736,7 +737,9 @@ TEST_P(OpusTest, OpusDecodeRepacketized) {
WebRtcOpus_Encode(opus_encoder_, speech_block.data(),
rtc::CheckedDivExact(speech_block.size(), channels_),
kMaxBytes, bitstream_);
if (opus_repacketizer_cat(rp, bitstream_, encoded_bytes_) == OPUS_OK) {
if (opus_repacketizer_cat(
rp, bitstream_,
rtc::checked_cast<opus_int32>(encoded_bytes_)) == OPUS_OK) {
++num_packets;
if (num_packets == kPackets) {
break;