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

Unified Diff: webrtc/voice_engine/transmit_mixer.cc

Issue 2424173003: Move functionality out from AudioFrame and into AudioFrameOperations. (Closed)
Patch Set: Created 4 years, 2 months 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: webrtc/voice_engine/transmit_mixer.cc
diff --git a/webrtc/voice_engine/transmit_mixer.cc b/webrtc/voice_engine/transmit_mixer.cc
index 834510d8f697d9f992c198e0501c805027cda03f..de84db9665d4e6a71ba01d4b4bfd7f693dc24127 100644
--- a/webrtc/voice_engine/transmit_mixer.cc
+++ b/webrtc/voice_engine/transmit_mixer.cc
@@ -1121,14 +1121,10 @@ int32_t TransmitMixer::MixOrReplaceAudioWithFile(
// Replace ACM audio with file.
// Currently file stream is always mono.
// TODO(xians): Change the code when FilePlayer supports real stereo.
- _audioFrame.UpdateFrame(-1,
- 0xFFFFFFFF,
- fileBuffer.get(),
- fileSamples,
- mixingFrequency,
- AudioFrame::kNormalSpeech,
- AudioFrame::kVadUnknown,
- 1);
+ AudioFrameOperations::UpdateFrame(
+ -1, 0xFFFFFFFF, fileBuffer.get(), fileSamples, mixingFrequency,
+ AudioFrame::kNormalSpeech, AudioFrame::kVadUnknown, 1,
+ &_audioFrame);
}
return 0;
}

Powered by Google App Engine
This is Rietveld 408576698