projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
webrtc
/
voice_engine
/
transmit_mixer.cc
diff --git
a/src/third_party/webrtc/voice_engine/transmit_mixer.cc
b/src/third_party/webrtc/voice_engine/transmit_mixer.cc
index
76b507f
..
2f1c9dc
100644
(file)
--- a/
src/third_party/webrtc/voice_engine/transmit_mixer.cc
+++ b/
src/third_party/webrtc/voice_engine/transmit_mixer.cc
@@
-1236,7
+1236,7
@@
int32_t TransmitMixer::MixOrReplaceAudioWithFile(
// Currently file stream is always mono.
// TODO(xians): Change the code when FilePlayer supports real stereo.
_audioFrame.UpdateFrame(-1,
-
-1
,
+
0xFFFFFFFF
,
fileBuffer.get(),
fileSamples,
mixingFrequency,