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

Commit 59b8aadb authored by Shunkai Yao's avatar Shunkai Yao Committed by Automerger Merge Worker
Browse files

Merge "Fix LOG_TAG in several files of libeffects" am: 3b70fc40 am:... 

Merge "Fix LOG_TAG in several files of libeffects" am: 3b70fc40 am: e3c62793 am: d7b35306 am: 195fb250 am: d5f8848a

Original change: https://android-review.googlesource.com/c/platform/frameworks/av/+/2645843



Change-Id: I19b3dd85a1b9e41ed60d706b9ffae7ef3a61e574
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7e40948f d5f8848a

media/libeffects/lvm/wrapper/Aidl/EffectBundleAidl.cpp

+7 −7
Original line number Diff line number Diff line
@@ -14,21 +14,21 @@ 
 * limitations under the License.

 */



#include "BundleTypes.h"

#define LOG_TAG "EffectBundleAidl"

#include <Utils.h>

#include <algorithm>

#include <limits.h>

#include <unordered_set>

#define LOG_TAG "EffectBundleAidl"



#include <android-base/logging.h>

#include <fmq/AidlMessageQueue.h>

#include <audio_effects/effect_bassboost.h>

#include <audio_effects/effect_equalizer.h>

#include <audio_effects/effect_virtualizer.h>

#include <android-base/logging.h>

#include <fmq/AidlMessageQueue.h>

#include <LVM.h>

#include <Utils.h>



#include "BundleTypes.h"

#include "EffectBundleAidl.h"

#include <LVM.h>

#include <limits.h>



using aidl::android::hardware::audio::effect::getEffectImplUuidBassBoostBundle;

using aidl::android::hardware::audio::effect::Descriptor;

media/libeffects/lvm/wrapper/Reverb/aidl/EffectReverb.cpp

+7 −6
Original line number Diff line number Diff line
@@ -14,20 +14,21 @@ 
 * limitations under the License.

 */



#include "ReverbTypes.h"

#define LOG_TAG "EffectReverb"

#include <Utils.h>

#include <algorithm>

#include <limits.h>

#include <unordered_set>



#include <android-base/logging.h>

#include <fmq/AidlMessageQueue.h>

#define LOG_TAG "EffectReverb"



#include <audio_effects/effect_bassboost.h>

#include <audio_effects/effect_equalizer.h>

#include <audio_effects/effect_virtualizer.h>

#include <android-base/logging.h>

#include <fmq/AidlMessageQueue.h>

#include <Utils.h>



#include "EffectReverb.h"

#include <limits.h>

#include "ReverbTypes.h"



using aidl::android::hardware::audio::effect::Descriptor;

using aidl::android::hardware::audio::effect::EffectReverb;