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

Commit 4532a36b authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "Replace cutils/log.h with either android/log.h or log/log.h" am: a05da2ee am: 9e97dc78 

am: 1121dfb5

Change-Id: Ie8bea1c228c602fef54012228ed714e8053d8fa6
parents 6bc76c88 1121dfb5

media/libeffects/downmix/EffectDownmix.c

+5 −2
Original line number Diff line number Diff line
@@ -16,11 +16,14 @@ 


#define LOG_TAG "EffectDownmix"

//#define LOG_NDEBUG 0

#include <log/log.h>



#include <inttypes.h>

#include <stdbool.h>

#include <stdlib.h>

#include <string.h>

#include <stdbool.h>



#include <android/log.h>



#include "EffectDownmix.h"



// Do not submit with DOWNMIX_TEST_CHANNEL_INDEX defined, strictly for testing

media/libeffects/factory/EffectsFactory.c

+7 −3
Original line number Diff line number Diff line
@@ -18,13 +18,17 @@ 
//#define LOG_NDEBUG 0



#include "EffectsFactory.h"

#include <string.h>

#include <stdlib.h>



#include <dlfcn.h>

#include <stdlib.h>

#include <string.h>

#include <unistd.h>



#include <cutils/misc.h>

#include <android/log.h>

#include <cutils/config_utils.h>

#include <cutils/misc.h>

#include <cutils/properties.h>



#include <audio_effects/audio_effects_conf.h>



static list_elem_t *gEffectList; // list of effect_entry_t: all currently created effects

media/libeffects/factory/EffectsFactory.h

+3 −2
Original line number Diff line number Diff line
@@ -17,9 +17,10 @@ 
#ifndef ANDROID_EFFECTSFACTORY_H_

#define ANDROID_EFFECTSFACTORY_H_



#include <cutils/log.h>

#include <pthread.h>

#include <dirent.h>

#include <pthread.h>



#include <android/log.h>

#include <hardware/audio_effect.h>



#if __cplusplus

media/libeffects/loudness/EffectLoudnessEnhancer.cpp

+6 −3
Original line number Diff line number Diff line
@@ -16,13 +16,16 @@ 


#define LOG_TAG "EffectLE"

//#define LOG_NDEBUG 0

#include <cutils/log.h>



#include <assert.h>

#include <math.h>

#include <new>

#include <stdlib.h>

#include <string.h>

#include <new>

#include <time.h>

#include <math.h>



#include <android/log.h>



#include <audio_effects/effect_loudnessenhancer.h>

#include "dsp/core/dynamic_range_compression.h"

media/libeffects/loudness/dsp/core/dynamic_range_compression-inl.h

+4 −2
Original line number Diff line number Diff line
@@ -16,13 +16,15 @@ 
#ifndef LE_FX_ENGINE_DSP_CORE_DYNAMIC_RANGE_COMPRESSION_INL_H_

#define LE_FX_ENGINE_DSP_CORE_DYNAMIC_RANGE_COMPRESSION_INL_H_



#ifndef LOG_TAG

#define LOG_TAG NULL

#endif

//#define LOG_NDEBUG 0

#include <cutils/log.h>



#include <android/log.h>



namespace le_fx {





inline void AdaptiveDynamicRangeCompression::set_knee_threshold(float decibel) {

  // Converts to 1og-base

  knee_threshold_in_decibel_ = decibel;