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

Unified Diff: webrtc/voice_engine/channel.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/channel.cc
diff --git a/webrtc/voice_engine/channel.cc b/webrtc/voice_engine/channel.cc
index ac424305b7627a5bceda8f69d7a967db87f2db3a..3324006e11b7fde453d35dbeb69432602666b920 100644
--- a/webrtc/voice_engine/channel.cc
+++ b/webrtc/voice_engine/channel.cc
@@ -589,7 +589,7 @@ MixerParticipant::AudioFrameInfo Channel::GetAudioFrameWithMuted(
// TODO(henrik.lundin): We should be able to do better than this. But we
// will have to go through all the cases below where the audio samples may
// be used, and handle the muted case in some way.
- audioFrame->Mute();
+ AudioFrameOperations::Mute(audioFrame);
}
// Convert module ID to internal VoE channel ID
@@ -3056,9 +3056,9 @@ int32_t Channel::MixOrReplaceAudioWithFile(int mixingFrequency) {
// Replace ACM audio with file.
// Currently file stream is always mono.
// TODO(xians): Change the code when FilePlayer supports real stereo.
- _audioFrame.UpdateFrame(
+ AudioFrameOperations::UpdateFrame(
_channelId, 0xFFFFFFFF, fileBuffer.get(), fileSamples, mixingFrequency,
- AudioFrame::kNormalSpeech, AudioFrame::kVadUnknown, 1);
+ AudioFrame::kNormalSpeech, AudioFrame::kVadUnknown, 1, &_audioFrame);
}
return 0;
}

Powered by Google App Engine
This is Rietveld 408576698