Merge "Rename audio_utils/conversion.h to mono_blend.h"

7 years ago · d3463e15be
parent 84f7e6acb9 da623c4ff0
commit d3463e15be
2 changed files with 2 additions and 2 deletions
--- a/services/audioflinger/FastMixer.cpp
+++ b/services/audioflinger/FastMixer.cpp
@ -37,7 +37,7 @@
 #include <cpustats/ThreadCpuUsage.h>
 #endif
 #endif
-#include <audio_utils/conversion.h>
+#include <audio_utils/mono_blend.h>
 #include <audio_utils/format.h>
 #include "AudioMixer.h"
 #include "FastMixer.h"
--- a/services/audioflinger/Threads.cpp
+++ b/services/audioflinger/Threads.cpp
@ -36,7 +36,7 @@
 #include <hardware/audio.h>
 #include <audio_effects/effect_ns.h>
 #include <audio_effects/effect_aec.h>
-#include <audio_utils/conversion.h>
+#include <audio_utils/mono_blend.h>
 #include <audio_utils/primitives.h>
 #include <audio_utils/format.h>
 #include <audio_utils/minifloat.h>