Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e039394 authored by Glenn Kasten's avatar Glenn Kasten Committed by Android (Google) Code Review
Browse files

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

parents 00bf9d38 6bf707f4

services/audioflinger/FastMixer.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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 <media/AudioMixer.h>

#include "FastMixer.h"

services/audioflinger/Threads.cpp

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ 


#include <private/media/AudioTrackShared.h>

#include <private/android_filesystem_config.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>