summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Kasten <gkasten@android.com>2014-02-26 20:29:12 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-02-26 20:29:12 +0000
commit0f722c7f09ce67e058eb1cfaabf1d85f1abdf797 (patch)
tree5ed0d00471b622c61c93c6ee7063771149d5d76b
parent52c430fc98ff1b8b9f683814587ee364d2be14c8 (diff)
parentb73cce87638ee104a0411418bd0245b8cc803c79 (diff)
downloadvoip-idea133-weekly-release.tar.gz
Merge "jni: rtp: fix c++11 narrowing violations"android-l-preview_r2l-previewidea133-weekly-release
-rw-r--r--src/jni/rtp/AudioGroup.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/jni/rtp/AudioGroup.cpp b/src/jni/rtp/AudioGroup.cpp
index 691fcf4..5dce123 100644
--- a/src/jni/rtp/AudioGroup.cpp
+++ b/src/jni/rtp/AudioGroup.cpp
@@ -284,10 +284,10 @@ void AudioStream::encode(int tick, AudioStream *chain)
if (duration >= 0 && duration < mSampleRate * DTMF_PERIOD) {
duration += mSampleCount;
int32_t buffer[4] = {
- htonl(mDtmfMagic | mSequence),
- htonl(mDtmfStart),
- mSsrc,
- htonl(mDtmfEvent | duration),
+ static_cast<int32_t>(htonl(mDtmfMagic | mSequence)),
+ static_cast<int32_t>(htonl(mDtmfStart)),
+ static_cast<int32_t>(mSsrc),
+ static_cast<int32_t>(htonl(mDtmfEvent | duration)),
};
if (duration >= mSampleRate * DTMF_PERIOD) {
buffer[3] |= htonl(1 << 23);