From 3856b090cd04ba5dd4a59a12430ed724d5995909 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Thu, 20 Oct 2011 11:56:00 +0100 Subject: Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF) DO NOT MERGE See https://android-git.corp.google.com/g/#/c/143865 Bug: 5449033 Change-Id: I0122812ed6ff6f5b59fe4a43ab8bff0577adde0a --- .../libeffects/lvm/wrapper/Bundle/EffectBundle.cpp | 666 ++++++++++----------- 1 file changed, 333 insertions(+), 333 deletions(-) (limited to 'media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp') diff --git a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp index efa1c45..f7ffbcf 100644 --- a/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp +++ b/media/libeffects/lvm/wrapper/Bundle/EffectBundle.cpp @@ -32,19 +32,19 @@ extern "C" const struct effect_interface_s gLvmEffectInterface; #define LVM_ERROR_CHECK(LvmStatus, callingFunc, calledFunc){\ if (LvmStatus == LVM_NULLADDRESS){\ - LOGV("\tLVM_ERROR : Parameter error - "\ + ALOGV("\tLVM_ERROR : Parameter error - "\ "null pointer returned by %s in %s\n\n\n\n", callingFunc, calledFunc);\ }\ if (LvmStatus == LVM_ALIGNMENTERROR){\ - LOGV("\tLVM_ERROR : Parameter error - "\ + ALOGV("\tLVM_ERROR : Parameter error - "\ "bad alignment returned by %s in %s\n\n\n\n", callingFunc, calledFunc);\ }\ if (LvmStatus == LVM_INVALIDNUMSAMPLES){\ - LOGV("\tLVM_ERROR : Parameter error - "\ + ALOGV("\tLVM_ERROR : Parameter error - "\ "bad number of samples returned by %s in %s\n\n\n\n", callingFunc, calledFunc);\ }\ if (LvmStatus == LVM_OUTOFRANGE){\ - LOGV("\tLVM_ERROR : Parameter error - "\ + ALOGV("\tLVM_ERROR : Parameter error - "\ "out of range returned by %s in %s\n", callingFunc, calledFunc);\ }\ } @@ -61,7 +61,7 @@ int SessionIndex[LVM_MAX_SESSIONS]; /* local functions */ #define CHECK_ARG(cond) { \ if (!(cond)) { \ - LOGV("\tLVM_ERROR : Invalid argument: "#cond); \ + ALOGV("\tLVM_ERROR : Invalid argument: "#cond); \ return -EINVAL; \ } \ } @@ -148,39 +148,39 @@ int Effect_setEnabled(EffectContext *pContext, bool enabled); /* Effect Library Interface Implementation */ extern "C" int EffectQueryNumberEffects(uint32_t *pNumEffects){ - LOGV("\n\tEffectQueryNumberEffects start"); + ALOGV("\n\tEffectQueryNumberEffects start"); *pNumEffects = 4; - LOGV("\tEffectQueryNumberEffects creating %d effects", *pNumEffects); - LOGV("\tEffectQueryNumberEffects end\n"); + ALOGV("\tEffectQueryNumberEffects creating %d effects", *pNumEffects); + ALOGV("\tEffectQueryNumberEffects end\n"); return 0; } /* end EffectQueryNumberEffects */ extern "C" int EffectQueryEffect(uint32_t index, effect_descriptor_t *pDescriptor){ - LOGV("\n\tEffectQueryEffect start"); - LOGV("\tEffectQueryEffect processing index %d", index); + ALOGV("\n\tEffectQueryEffect start"); + ALOGV("\tEffectQueryEffect processing index %d", index); if (pDescriptor == NULL){ - LOGV("\tLVM_ERROR : EffectQueryEffect was passed NULL pointer"); + ALOGV("\tLVM_ERROR : EffectQueryEffect was passed NULL pointer"); return -EINVAL; } if (index > 3){ - LOGV("\tLVM_ERROR : EffectQueryEffect index out of range %d", index); + ALOGV("\tLVM_ERROR : EffectQueryEffect index out of range %d", index); return -ENOENT; } if(index == LVM_BASS_BOOST){ - LOGV("\tEffectQueryEffect processing LVM_BASS_BOOST"); + ALOGV("\tEffectQueryEffect processing LVM_BASS_BOOST"); memcpy(pDescriptor, &gBassBoostDescriptor, sizeof(effect_descriptor_t)); }else if(index == LVM_VIRTUALIZER){ - LOGV("\tEffectQueryEffect processing LVM_VIRTUALIZER"); + ALOGV("\tEffectQueryEffect processing LVM_VIRTUALIZER"); memcpy(pDescriptor, &gVirtualizerDescriptor, sizeof(effect_descriptor_t)); } else if(index == LVM_EQUALIZER){ - LOGV("\tEffectQueryEffect processing LVM_EQUALIZER"); + ALOGV("\tEffectQueryEffect processing LVM_EQUALIZER"); memcpy(pDescriptor, &gEqualizerDescriptor, sizeof(effect_descriptor_t)); } else if(index == LVM_VOLUME){ - LOGV("\tEffectQueryEffect processing LVM_VOLUME"); + ALOGV("\tEffectQueryEffect processing LVM_VOLUME"); memcpy(pDescriptor, &gVolumeDescriptor, sizeof(effect_descriptor_t)); } - LOGV("\tEffectQueryEffect end\n"); + ALOGV("\tEffectQueryEffect end\n"); return 0; } /* end EffectQueryEffect */ @@ -195,17 +195,17 @@ extern "C" int EffectCreate(effect_uuid_t *uuid, bool newBundle = false; SessionContext *pSessionContext; - LOGV("\n\tEffectCreate start session %d", sessionId); + ALOGV("\n\tEffectCreate start session %d", sessionId); if (pHandle == NULL || uuid == NULL){ - LOGV("\tLVM_ERROR : EffectCreate() called with NULL pointer"); + ALOGV("\tLVM_ERROR : EffectCreate() called with NULL pointer"); ret = -EINVAL; goto exit; } if(LvmInitFlag == LVM_FALSE){ LvmInitFlag = LVM_TRUE; - LOGV("\tEffectCreate - Initializing all global memory"); + ALOGV("\tEffectCreate - Initializing all global memory"); LvmGlobalBundle_init(); } @@ -214,13 +214,13 @@ extern "C" int EffectCreate(effect_uuid_t *uuid, if((SessionIndex[i] == LVM_UNUSED_SESSION)||(SessionIndex[i] == sessionId)){ sessionNo = i; SessionIndex[i] = sessionId; - LOGV("\tEffectCreate: Allocating SessionNo %d for SessionId %d\n", sessionNo,sessionId); + ALOGV("\tEffectCreate: Allocating SessionNo %d for SessionId %d\n", sessionNo,sessionId); break; } } if(i==LVM_MAX_SESSIONS){ - LOGV("\tLVM_ERROR : Cannot find memory to allocate for current session"); + ALOGV("\tLVM_ERROR : Cannot find memory to allocate for current session"); ret = -EINVAL; goto exit; } @@ -229,7 +229,7 @@ extern "C" int EffectCreate(effect_uuid_t *uuid, // If this is the first create in this session if(GlobalSessionMemory[sessionNo].bBundledEffectsEnabled == LVM_FALSE){ - LOGV("\tEffectCreate - This is the first effect in current sessionId %d sessionNo %d", + ALOGV("\tEffectCreate - This is the first effect in current sessionId %d sessionNo %d", sessionId, sessionNo); GlobalSessionMemory[sessionNo].bBundledEffectsEnabled = LVM_TRUE; @@ -255,7 +255,7 @@ extern "C" int EffectCreate(effect_uuid_t *uuid, snprintf(fileName, 256, "/data/tmp/bundle_%p_pcm_in.pcm", pContext->pBundledContext); pContext->pBundledContext->PcmInPtr = fopen(fileName, "w"); if (pContext->pBundledContext->PcmInPtr == NULL) { - LOGV("cannot open %s", fileName); + ALOGV("cannot open %s", fileName); ret = -EINVAL; goto exit; } @@ -263,7 +263,7 @@ extern "C" int EffectCreate(effect_uuid_t *uuid, snprintf(fileName, 256, "/data/tmp/bundle_%p_pcm_out.pcm", pContext->pBundledContext); pContext->pBundledContext->PcmOutPtr = fopen(fileName, "w"); if (pContext->pBundledContext->PcmOutPtr == NULL) { - LOGV("cannot open %s", fileName); + ALOGV("cannot open %s", fileName); fclose(pContext->pBundledContext->PcmInPtr); pContext->pBundledContext->PcmInPtr = NULL; ret = -EINVAL; @@ -288,28 +288,28 @@ extern "C" int EffectCreate(effect_uuid_t *uuid, pContext->pBundledContext->SamplesToExitCountBb = 0; pContext->pBundledContext->SamplesToExitCountEq = 0; - LOGV("\tEffectCreate - Calling LvmBundle_init"); + ALOGV("\tEffectCreate - Calling LvmBundle_init"); ret = LvmBundle_init(pContext); if (ret < 0){ - LOGV("\tLVM_ERROR : EffectCreate() Bundle init failed"); + ALOGV("\tLVM_ERROR : EffectCreate() Bundle init failed"); goto exit; } } else{ - LOGV("\tEffectCreate - Assigning memory for previously created effect on sessionNo %d", + ALOGV("\tEffectCreate - Assigning memory for previously created effect on sessionNo %d", sessionNo); pContext->pBundledContext = GlobalSessionMemory[sessionNo].pBundledContext; } - LOGV("\tEffectCreate - pBundledContext is %p", pContext->pBundledContext); + ALOGV("\tEffectCreate - pBundledContext is %p", pContext->pBundledContext); pSessionContext = &GlobalSessionMemory[pContext->pBundledContext->SessionNo]; // Create each Effect if (memcmp(uuid, &gBassBoostDescriptor.uuid, sizeof(effect_uuid_t)) == 0){ // Create Bass Boost - LOGV("\tEffectCreate - Effect to be created is LVM_BASS_BOOST"); + ALOGV("\tEffectCreate - Effect to be created is LVM_BASS_BOOST"); pSessionContext->bBassInstantiated = LVM_TRUE; pContext->pBundledContext->SamplesToExitCountBb = 0; @@ -317,7 +317,7 @@ extern "C" int EffectCreate(effect_uuid_t *uuid, pContext->EffectType = LVM_BASS_BOOST; } else if (memcmp(uuid, &gVirtualizerDescriptor.uuid, sizeof(effect_uuid_t)) == 0){ // Create Virtualizer - LOGV("\tEffectCreate - Effect to be created is LVM_VIRTUALIZER"); + ALOGV("\tEffectCreate - Effect to be created is LVM_VIRTUALIZER"); pSessionContext->bVirtualizerInstantiated=LVM_TRUE; pContext->pBundledContext->SamplesToExitCountVirt = 0; @@ -325,7 +325,7 @@ extern "C" int EffectCreate(effect_uuid_t *uuid, pContext->EffectType = LVM_VIRTUALIZER; } else if (memcmp(uuid, &gEqualizerDescriptor.uuid, sizeof(effect_uuid_t)) == 0){ // Create Equalizer - LOGV("\tEffectCreate - Effect to be created is LVM_EQUALIZER"); + ALOGV("\tEffectCreate - Effect to be created is LVM_EQUALIZER"); pSessionContext->bEqualizerInstantiated = LVM_TRUE; pContext->pBundledContext->SamplesToExitCountEq = 0; @@ -333,14 +333,14 @@ extern "C" int EffectCreate(effect_uuid_t *uuid, pContext->EffectType = LVM_EQUALIZER; } else if (memcmp(uuid, &gVolumeDescriptor.uuid, sizeof(effect_uuid_t)) == 0){ // Create Volume - LOGV("\tEffectCreate - Effect to be created is LVM_VOLUME"); + ALOGV("\tEffectCreate - Effect to be created is LVM_VOLUME"); pSessionContext->bVolumeInstantiated = LVM_TRUE; pContext->itfe = &gLvmEffectInterface; pContext->EffectType = LVM_VOLUME; } else{ - LOGV("\tLVM_ERROR : EffectCreate() invalid UUID"); + ALOGV("\tLVM_ERROR : EffectCreate() invalid UUID"); ret = -EINVAL; goto exit; } @@ -359,17 +359,17 @@ exit: } else { *pHandle = (effect_handle_t)pContext; } - LOGV("\tEffectCreate end..\n\n"); + ALOGV("\tEffectCreate end..\n\n"); return ret; } /* end EffectCreate */ extern "C" int EffectRelease(effect_handle_t handle){ - LOGV("\n\tEffectRelease start %p", handle); + ALOGV("\n\tEffectRelease start %p", handle); EffectContext * pContext = (EffectContext *)handle; - LOGV("\tEffectRelease start handle: %p, context %p", handle, pContext->pBundledContext); + ALOGV("\tEffectRelease start handle: %p, context %p", handle, pContext->pBundledContext); if (pContext == NULL){ - LOGV("\tLVM_ERROR : EffectRelease called with NULL pointer"); + ALOGV("\tLVM_ERROR : EffectRelease called with NULL pointer"); return -EINVAL; } @@ -378,34 +378,34 @@ extern "C" int EffectRelease(effect_handle_t handle){ // Clear the instantiated flag for the effect // protect agains the case where an effect is un-instantiated without being disabled if(pContext->EffectType == LVM_BASS_BOOST) { - LOGV("\tEffectRelease LVM_BASS_BOOST Clearing global intstantiated flag"); + ALOGV("\tEffectRelease LVM_BASS_BOOST Clearing global intstantiated flag"); pSessionContext->bBassInstantiated = LVM_FALSE; if(pContext->pBundledContext->SamplesToExitCountBb > 0){ pContext->pBundledContext->NumberEffectsEnabled--; } pContext->pBundledContext->SamplesToExitCountBb = 0; } else if(pContext->EffectType == LVM_VIRTUALIZER) { - LOGV("\tEffectRelease LVM_VIRTUALIZER Clearing global intstantiated flag"); + ALOGV("\tEffectRelease LVM_VIRTUALIZER Clearing global intstantiated flag"); pSessionContext->bVirtualizerInstantiated = LVM_FALSE; if(pContext->pBundledContext->SamplesToExitCountVirt > 0){ pContext->pBundledContext->NumberEffectsEnabled--; } pContext->pBundledContext->SamplesToExitCountVirt = 0; } else if(pContext->EffectType == LVM_EQUALIZER) { - LOGV("\tEffectRelease LVM_EQUALIZER Clearing global intstantiated flag"); + ALOGV("\tEffectRelease LVM_EQUALIZER Clearing global intstantiated flag"); pSessionContext->bEqualizerInstantiated =LVM_FALSE; if(pContext->pBundledContext->SamplesToExitCountEq > 0){ pContext->pBundledContext->NumberEffectsEnabled--; } pContext->pBundledContext->SamplesToExitCountEq = 0; } else if(pContext->EffectType == LVM_VOLUME) { - LOGV("\tEffectRelease LVM_VOLUME Clearing global intstantiated flag"); + ALOGV("\tEffectRelease LVM_VOLUME Clearing global intstantiated flag"); pSessionContext->bVolumeInstantiated = LVM_FALSE; if (pContext->pBundledContext->bVolumeEnabled == LVM_TRUE){ pContext->pBundledContext->NumberEffectsEnabled--; } } else { - LOGV("\tLVM_ERROR : EffectRelease : Unsupported effect\n\n\n\n\n\n\n"); + ALOGV("\tLVM_ERROR : EffectRelease : Unsupported effect\n\n\n\n\n\n\n"); } // Disable effect, in this case ignore errors (return codes) @@ -434,18 +434,18 @@ extern "C" int EffectRelease(effect_handle_t handle){ for(int i=0; ipBundledContext->SessionId){ SessionIndex[i] = LVM_UNUSED_SESSION; - LOGV("\tEffectRelease: Clearing SessionIndex SessionNo %d for SessionId %d\n", + ALOGV("\tEffectRelease: Clearing SessionIndex SessionNo %d for SessionId %d\n", i, pContext->pBundledContext->SessionId); break; } } - LOGV("\tEffectRelease: All effects are no longer instantiated\n"); + ALOGV("\tEffectRelease: All effects are no longer instantiated\n"); pSessionContext->bBundledEffectsEnabled = LVM_FALSE; pSessionContext->pBundledContext = LVM_NULL; - LOGV("\tEffectRelease: Freeing LVM Bundle memory\n"); + ALOGV("\tEffectRelease: Freeing LVM Bundle memory\n"); LvmEffect_free(pContext); - LOGV("\tEffectRelease: Deleting LVM Bundle context %p\n", pContext->pBundledContext); + ALOGV("\tEffectRelease: Deleting LVM Bundle context %p\n", pContext->pBundledContext); if (pContext->pBundledContext->workBuffer != NULL) { free(pContext->pBundledContext->workBuffer); } @@ -455,7 +455,7 @@ extern "C" int EffectRelease(effect_handle_t handle){ // free the effect context for current effect delete pContext; - LOGV("\tEffectRelease end\n"); + ALOGV("\tEffectRelease end\n"); return 0; } /* end EffectRelease */ @@ -465,7 +465,7 @@ extern "C" int EffectGetDescriptor(effect_uuid_t *uuid, const effect_descriptor_t *desc = NULL; if (pDescriptor == NULL || uuid == NULL){ - LOGV("EffectGetDescriptor() called with NULL pointer"); + ALOGV("EffectGetDescriptor() called with NULL pointer"); return -EINVAL; } @@ -489,7 +489,7 @@ extern "C" int EffectGetDescriptor(effect_uuid_t *uuid, } /* end EffectGetDescriptor */ void LvmGlobalBundle_init(){ - LOGV("\tLvmGlobalBundle_init start"); + ALOGV("\tLvmGlobalBundle_init start"); for(int i=0; iconfig.inputCfg.accessMode = EFFECT_BUFFER_ACCESS_READ; pContext->config.inputCfg.channels = AUDIO_CHANNEL_OUT_STEREO; @@ -540,12 +540,12 @@ int LvmBundle_init(EffectContext *pContext){ CHECK_ARG(pContext != NULL); if (pContext->pBundledContext->hInstance != NULL){ - LOGV("\tLvmBundle_init pContext->pBassBoost != NULL " + ALOGV("\tLvmBundle_init pContext->pBassBoost != NULL " "-> Calling pContext->pBassBoost->free()"); LvmEffect_free(pContext); - LOGV("\tLvmBundle_init pContext->pBassBoost != NULL " + ALOGV("\tLvmBundle_init pContext->pBassBoost != NULL " "-> Called pContext->pBassBoost->free()"); } @@ -572,7 +572,7 @@ int LvmBundle_init(EffectContext *pContext){ LVM_ERROR_CHECK(LvmStatus, "LVM_GetMemoryTable", "LvmBundle_init") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - LOGV("\tCreateInstance Succesfully called LVM_GetMemoryTable\n"); + ALOGV("\tCreateInstance Succesfully called LVM_GetMemoryTable\n"); /* Allocate memory */ for (int i=0; ipBundledContext->hInstance = LVM_NULL; @@ -620,7 +620,7 @@ int LvmBundle_init(EffectContext *pContext){ LVM_ERROR_CHECK(LvmStatus, "LVM_GetInstanceHandle", "LvmBundle_init") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - LOGV("\tLvmBundle_init CreateInstance Succesfully called LVM_GetInstanceHandle\n"); + ALOGV("\tLvmBundle_init CreateInstance Succesfully called LVM_GetInstanceHandle\n"); /* Set the initial process parameters */ /* General parameters */ @@ -682,7 +682,7 @@ int LvmBundle_init(EffectContext *pContext){ LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "LvmBundle_init") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - LOGV("\tLvmBundle_init CreateInstance Succesfully called LVM_SetControlParameters\n"); + ALOGV("\tLvmBundle_init CreateInstance Succesfully called LVM_SetControlParameters\n"); /* Set the headroom parameters */ HeadroomBandDef[0].Limit_Low = 20; @@ -701,8 +701,8 @@ int LvmBundle_init(EffectContext *pContext){ LVM_ERROR_CHECK(LvmStatus, "LVM_SetHeadroomParams", "LvmBundle_init") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - LOGV("\tLvmBundle_init CreateInstance Succesfully called LVM_SetHeadroomParams\n"); - LOGV("\tLvmBundle_init End"); + ALOGV("\tLvmBundle_init CreateInstance Succesfully called LVM_SetHeadroomParams\n"); + ALOGV("\tLvmBundle_init End"); return 0; } /* end LvmBundle_init */ @@ -754,7 +754,7 @@ int LvmBundle_process(LVM_INT16 *pIn, } pOutTmp = pContext->pBundledContext->workBuffer; }else{ - LOGV("LVM_ERROR : LvmBundle_process invalid access mode"); + ALOGV("LVM_ERROR : LvmBundle_process invalid access mode"); return -EINVAL; } @@ -763,7 +763,7 @@ int LvmBundle_process(LVM_INT16 *pIn, fflush(pContext->pBundledContext->PcmInPtr); #endif - //LOGV("Calling LVM_Process"); + //ALOGV("Calling LVM_Process"); /* Process the samples */ LvmStatus = LVM_Process(pContext->pBundledContext->hInstance, /* Instance handle */ @@ -801,7 +801,7 @@ int LvmBundle_process(LVM_INT16 *pIn, //---------------------------------------------------------------------------- int LvmEffect_enable(EffectContext *pContext){ - //LOGV("\tLvmEffect_enable start"); + //ALOGV("\tLvmEffect_enable start"); LVM_ControlParams_t ActiveParams; /* Current control Parameters */ LVM_ReturnStatus_en LvmStatus = LVM_SUCCESS; /* Function call status */ @@ -812,30 +812,30 @@ int LvmEffect_enable(EffectContext *pContext){ LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "LvmEffect_enable") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tLvmEffect_enable Succesfully called LVM_GetControlParameters\n"); + //ALOGV("\tLvmEffect_enable Succesfully called LVM_GetControlParameters\n"); if(pContext->EffectType == LVM_BASS_BOOST) { - LOGV("\tLvmEffect_enable : Enabling LVM_BASS_BOOST"); + ALOGV("\tLvmEffect_enable : Enabling LVM_BASS_BOOST"); ActiveParams.BE_OperatingMode = LVM_BE_ON; } if(pContext->EffectType == LVM_VIRTUALIZER) { - LOGV("\tLvmEffect_enable : Enabling LVM_VIRTUALIZER"); + ALOGV("\tLvmEffect_enable : Enabling LVM_VIRTUALIZER"); ActiveParams.VirtualizerOperatingMode = LVM_MODE_ON; } if(pContext->EffectType == LVM_EQUALIZER) { - LOGV("\tLvmEffect_enable : Enabling LVM_EQUALIZER"); + ALOGV("\tLvmEffect_enable : Enabling LVM_EQUALIZER"); ActiveParams.EQNB_OperatingMode = LVM_EQNB_ON; } if(pContext->EffectType == LVM_VOLUME) { - LOGV("\tLvmEffect_enable : Enabling LVM_VOLUME"); + ALOGV("\tLvmEffect_enable : Enabling LVM_VOLUME"); } LvmStatus = LVM_SetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "LvmEffect_enable") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tLvmEffect_enable Succesfully called LVM_SetControlParameters\n"); - //LOGV("\tLvmEffect_enable end"); + //ALOGV("\tLvmEffect_enable Succesfully called LVM_SetControlParameters\n"); + //ALOGV("\tLvmEffect_enable end"); return 0; } @@ -852,7 +852,7 @@ int LvmEffect_enable(EffectContext *pContext){ //---------------------------------------------------------------------------- int LvmEffect_disable(EffectContext *pContext){ - //LOGV("\tLvmEffect_disable start"); + //ALOGV("\tLvmEffect_disable start"); LVM_ControlParams_t ActiveParams; /* Current control Parameters */ LVM_ReturnStatus_en LvmStatus = LVM_SUCCESS; /* Function call status */ @@ -862,30 +862,30 @@ int LvmEffect_disable(EffectContext *pContext){ LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "LvmEffect_disable") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tLvmEffect_disable Succesfully called LVM_GetControlParameters\n"); + //ALOGV("\tLvmEffect_disable Succesfully called LVM_GetControlParameters\n"); if(pContext->EffectType == LVM_BASS_BOOST) { - LOGV("\tLvmEffect_disable : Disabling LVM_BASS_BOOST"); + ALOGV("\tLvmEffect_disable : Disabling LVM_BASS_BOOST"); ActiveParams.BE_OperatingMode = LVM_BE_OFF; } if(pContext->EffectType == LVM_VIRTUALIZER) { - LOGV("\tLvmEffect_disable : Disabling LVM_VIRTUALIZER"); + ALOGV("\tLvmEffect_disable : Disabling LVM_VIRTUALIZER"); ActiveParams.VirtualizerOperatingMode = LVM_MODE_OFF; } if(pContext->EffectType == LVM_EQUALIZER) { - LOGV("\tLvmEffect_disable : Disabling LVM_EQUALIZER"); + ALOGV("\tLvmEffect_disable : Disabling LVM_EQUALIZER"); ActiveParams.EQNB_OperatingMode = LVM_EQNB_OFF; } if(pContext->EffectType == LVM_VOLUME) { - LOGV("\tLvmEffect_disable : Disabling LVM_VOLUME"); + ALOGV("\tLvmEffect_disable : Disabling LVM_VOLUME"); } LvmStatus = LVM_SetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "LvmEffect_disable") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tLvmEffect_disable Succesfully called LVM_SetControlParameters\n"); - //LOGV("\tLvmEffect_disable end"); + //ALOGV("\tLvmEffect_disable Succesfully called LVM_SetControlParameters\n"); + //ALOGV("\tLvmEffect_disable end"); return 0; } @@ -916,15 +916,15 @@ void LvmEffect_free(EffectContext *pContext){ for (int i=0; ipBundledContext->SamplesPerSecond = 48000*2; // 2 secs Stereo break; default: - LOGV("\tEffect_Configure invalid sampling rate %d", pConfig->inputCfg.samplingRate); + ALOGV("\tEffect_Configure invalid sampling rate %d", pConfig->inputCfg.samplingRate); return -EINVAL; } @@ -998,7 +998,7 @@ int Effect_configure(EffectContext *pContext, effect_config_t *pConfig){ LVM_ControlParams_t ActiveParams; LVM_ReturnStatus_en LvmStatus = LVM_SUCCESS; - LOGV("\tEffect_configure change sampling rate to %d", SampleRate); + ALOGV("\tEffect_configure change sampling rate to %d", SampleRate); /* Get the current settings */ LvmStatus = LVM_GetControlParameters(pContext->pBundledContext->hInstance, @@ -1010,14 +1010,14 @@ int Effect_configure(EffectContext *pContext, effect_config_t *pConfig){ LvmStatus = LVM_SetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "Effect_configure") - LOGV("\tEffect_configure Succesfully called LVM_SetControlParameters\n"); + ALOGV("\tEffect_configure Succesfully called LVM_SetControlParameters\n"); pContext->pBundledContext->SampleRate = SampleRate; }else{ - //LOGV("\tEffect_configure keep sampling rate at %d", SampleRate); + //ALOGV("\tEffect_configure keep sampling rate at %d", SampleRate); } - //LOGV("\tEffect_configure End...."); + //ALOGV("\tEffect_configure End...."); return 0; } /* end Effect_configure */ @@ -1036,7 +1036,7 @@ int Effect_configure(EffectContext *pContext, effect_config_t *pConfig){ //---------------------------------------------------------------------------- uint32_t BassGetStrength(EffectContext *pContext){ - //LOGV("\tBassGetStrength() (0-1000) -> %d\n", pContext->pBundledContext->BassStrengthSaved); + //ALOGV("\tBassGetStrength() (0-1000) -> %d\n", pContext->pBundledContext->BassStrengthSaved); LVM_ControlParams_t ActiveParams; /* Current control Parameters */ LVM_ReturnStatus_en LvmStatus = LVM_SUCCESS; /* Function call status */ @@ -1047,18 +1047,18 @@ uint32_t BassGetStrength(EffectContext *pContext){ LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "BassGetStrength") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tBassGetStrength Succesfully returned from LVM_GetControlParameters\n"); + //ALOGV("\tBassGetStrength Succesfully returned from LVM_GetControlParameters\n"); /* Check that the strength returned matches the strength that was set earlier */ if(ActiveParams.BE_EffectLevel != (LVM_INT16)((15*pContext->pBundledContext->BassStrengthSaved)/1000)){ - LOGV("\tLVM_ERROR : BassGetStrength module strength does not match savedStrength %d %d\n", + ALOGV("\tLVM_ERROR : BassGetStrength module strength does not match savedStrength %d %d\n", ActiveParams.BE_EffectLevel, pContext->pBundledContext->BassStrengthSaved); return -EINVAL; } - //LOGV("\tBassGetStrength() (0-15) -> %d\n", ActiveParams.BE_EffectLevel ); - //LOGV("\tBassGetStrength() (saved) -> %d\n", pContext->pBundledContext->BassStrengthSaved ); + //ALOGV("\tBassGetStrength() (0-15) -> %d\n", ActiveParams.BE_EffectLevel ); + //ALOGV("\tBassGetStrength() (saved) -> %d\n", pContext->pBundledContext->BassStrengthSaved ); return pContext->pBundledContext->BassStrengthSaved; } /* end BassGetStrength */ @@ -1075,7 +1075,7 @@ uint32_t BassGetStrength(EffectContext *pContext){ //---------------------------------------------------------------------------- void BassSetStrength(EffectContext *pContext, uint32_t strength){ - //LOGV("\tBassSetStrength(%d)", strength); + //ALOGV("\tBassSetStrength(%d)", strength); pContext->pBundledContext->BassStrengthSaved = (int)strength; @@ -1087,19 +1087,19 @@ void BassSetStrength(EffectContext *pContext, uint32_t strength){ &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "BassSetStrength") - //LOGV("\tBassSetStrength Succesfully returned from LVM_GetControlParameters\n"); + //ALOGV("\tBassSetStrength Succesfully returned from LVM_GetControlParameters\n"); /* Bass Enhancement parameters */ ActiveParams.BE_EffectLevel = (LVM_INT16)((15*strength)/1000); ActiveParams.BE_CentreFreq = LVM_BE_CENTRE_90Hz; - //LOGV("\tBassSetStrength() (0-15) -> %d\n", ActiveParams.BE_EffectLevel ); + //ALOGV("\tBassSetStrength() (0-15) -> %d\n", ActiveParams.BE_EffectLevel ); /* Activate the initial settings */ LvmStatus = LVM_SetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "BassSetStrength") - //LOGV("\tBassSetStrength Succesfully called LVM_SetControlParameters\n"); + //ALOGV("\tBassSetStrength Succesfully called LVM_SetControlParameters\n"); } /* end BassSetStrength */ //---------------------------------------------------------------------------- @@ -1117,7 +1117,7 @@ void BassSetStrength(EffectContext *pContext, uint32_t strength){ //---------------------------------------------------------------------------- uint32_t VirtualizerGetStrength(EffectContext *pContext){ - //LOGV("\tVirtualizerGetStrength (0-1000) -> %d\n",pContext->pBundledContext->VirtStrengthSaved); + //ALOGV("\tVirtualizerGetStrength (0-1000) -> %d\n",pContext->pBundledContext->VirtStrengthSaved); LVM_ControlParams_t ActiveParams; /* Current control Parameters */ LVM_ReturnStatus_en LvmStatus = LVM_SUCCESS; /* Function call status */ @@ -1127,8 +1127,8 @@ uint32_t VirtualizerGetStrength(EffectContext *pContext){ LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "VirtualizerGetStrength") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tVirtualizerGetStrength Succesfully returned from LVM_GetControlParameters\n"); - //LOGV("\tVirtualizerGetStrength() (0-100) -> %d\n", ActiveParams.VirtualizerReverbLevel*10); + //ALOGV("\tVirtualizerGetStrength Succesfully returned from LVM_GetControlParameters\n"); + //ALOGV("\tVirtualizerGetStrength() (0-100) -> %d\n", ActiveParams.VirtualizerReverbLevel*10); return pContext->pBundledContext->VirtStrengthSaved; } /* end getStrength */ @@ -1145,7 +1145,7 @@ uint32_t VirtualizerGetStrength(EffectContext *pContext){ //---------------------------------------------------------------------------- void VirtualizerSetStrength(EffectContext *pContext, uint32_t strength){ - //LOGV("\tVirtualizerSetStrength(%d)", strength); + //ALOGV("\tVirtualizerSetStrength(%d)", strength); LVM_ControlParams_t ActiveParams; /* Current control Parameters */ LVM_ReturnStatus_en LvmStatus=LVM_SUCCESS; /* Function call status */ @@ -1155,18 +1155,18 @@ void VirtualizerSetStrength(EffectContext *pContext, uint32_t strength){ LvmStatus = LVM_GetControlParameters(pContext->pBundledContext->hInstance,&ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "VirtualizerSetStrength") - //LOGV("\tVirtualizerSetStrength Succesfully returned from LVM_GetControlParameters\n"); + //ALOGV("\tVirtualizerSetStrength Succesfully returned from LVM_GetControlParameters\n"); /* Virtualizer parameters */ ActiveParams.CS_EffectLevel = (int)((strength*32767)/1000); - //LOGV("\tVirtualizerSetStrength() (0-1000) -> %d\n", strength ); - //LOGV("\tVirtualizerSetStrength() (0- 100) -> %d\n", ActiveParams.CS_EffectLevel ); + //ALOGV("\tVirtualizerSetStrength() (0-1000) -> %d\n", strength ); + //ALOGV("\tVirtualizerSetStrength() (0- 100) -> %d\n", ActiveParams.CS_EffectLevel ); /* Activate the initial settings */ LvmStatus = LVM_SetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "VirtualizerSetStrength") - //LOGV("\tVirtualizerSetStrength Succesfully called LVM_SetControlParameters\n\n"); + //ALOGV("\tVirtualizerSetStrength Succesfully called LVM_SetControlParameters\n\n"); } /* end setStrength */ //---------------------------------------------------------------------------- @@ -1196,8 +1196,8 @@ int32_t EqualizerGetBandLevel(EffectContext *pContext, int32_t band){ BandDef = ActiveParams.pEQNB_BandDefinition; Gain = (int32_t)BandDef[band].Gain*100; // Convert to millibels - //LOGV("\tEqualizerGetBandLevel -> %d\n", Gain ); - //LOGV("\tEqualizerGetBandLevel Succesfully returned from LVM_GetControlParameters\n"); + //ALOGV("\tEqualizerGetBandLevel -> %d\n", Gain ); + //ALOGV("\tEqualizerGetBandLevel Succesfully returned from LVM_GetControlParameters\n"); return Gain; } @@ -1222,7 +1222,7 @@ void EqualizerSetBandLevel(EffectContext *pContext, int band, short Gain){ }else{ gainRounded = (int)((Gain-50)/100); } - //LOGV("\tEqualizerSetBandLevel(%d)->(%d)", Gain, gainRounded); + //ALOGV("\tEqualizerSetBandLevel(%d)->(%d)", Gain, gainRounded); LVM_ControlParams_t ActiveParams; /* Current control Parameters */ @@ -1232,8 +1232,8 @@ void EqualizerSetBandLevel(EffectContext *pContext, int band, short Gain){ /* Get the current settings */ LvmStatus = LVM_GetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "EqualizerSetBandLevel") - //LOGV("\tEqualizerSetBandLevel Succesfully returned from LVM_GetControlParameters\n"); - //LOGV("\tEqualizerSetBandLevel just Got -> %d\n",ActiveParams.pEQNB_BandDefinition[band].Gain); + //ALOGV("\tEqualizerSetBandLevel Succesfully returned from LVM_GetControlParameters\n"); + //ALOGV("\tEqualizerSetBandLevel just Got -> %d\n",ActiveParams.pEQNB_BandDefinition[band].Gain); /* Set local EQ parameters */ BandDef = ActiveParams.pEQNB_BandDefinition; @@ -1242,7 +1242,7 @@ void EqualizerSetBandLevel(EffectContext *pContext, int band, short Gain){ /* Activate the initial settings */ LvmStatus = LVM_SetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "EqualizerSetBandLevel") - //LOGV("\tEqualizerSetBandLevel just Set -> %d\n",ActiveParams.pEQNB_BandDefinition[band].Gain); + //ALOGV("\tEqualizerSetBandLevel just Set -> %d\n",ActiveParams.pEQNB_BandDefinition[band].Gain); pContext->pBundledContext->CurPreset = PRESET_CUSTOM; return; @@ -1274,8 +1274,8 @@ int32_t EqualizerGetCentreFrequency(EffectContext *pContext, int32_t band){ BandDef = ActiveParams.pEQNB_BandDefinition; Frequency = (int32_t)BandDef[band].Frequency*1000; // Convert to millibels - //LOGV("\tEqualizerGetCentreFrequency -> %d\n", Frequency ); - //LOGV("\tEqualizerGetCentreFrequency Succesfully returned from LVM_GetControlParameters\n"); + //ALOGV("\tEqualizerGetCentreFrequency -> %d\n", Frequency ); + //ALOGV("\tEqualizerGetCentreFrequency Succesfully returned from LVM_GetControlParameters\n"); return Frequency; } @@ -1369,7 +1369,7 @@ int32_t EqualizerGetPreset(EffectContext *pContext){ //---------------------------------------------------------------------------- void EqualizerSetPreset(EffectContext *pContext, int preset){ - //LOGV("\tEqualizerSetPreset(%d)", preset); + //ALOGV("\tEqualizerSetPreset(%d)", preset); pContext->pBundledContext->CurPreset = preset; LVM_ControlParams_t ActiveParams; /* Current control Parameters */ @@ -1378,7 +1378,7 @@ void EqualizerSetPreset(EffectContext *pContext, int preset){ /* Get the current settings */ LvmStatus = LVM_GetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "EqualizerSetPreset") - //LOGV("\tEqualizerSetPreset Succesfully returned from LVM_GetControlParameters\n"); + //ALOGV("\tEqualizerSetPreset Succesfully returned from LVM_GetControlParameters\n"); //ActiveParams.pEQNB_BandDefinition = &BandDefs[0]; for (int i=0; ipBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "EqualizerSetPreset") - //LOGV("\tEqualizerSetPreset Succesfully called LVM_SetControlParameters\n"); + //ALOGV("\tEqualizerSetPreset Succesfully called LVM_SetControlParameters\n"); return; } @@ -1412,13 +1412,13 @@ int32_t EqualizerGetNumPresets(){ // //------------------------------------------------------------------------- const char * EqualizerGetPresetName(int32_t preset){ - //LOGV("\tEqualizerGetPresetName start(%d)", preset); + //ALOGV("\tEqualizerGetPresetName start(%d)", preset); if (preset == PRESET_CUSTOM) { return "Custom"; } else { return gEqualizerPresets[preset].name; } - //LOGV("\tEqualizerGetPresetName end(%d)", preset); + //ALOGV("\tEqualizerGetPresetName end(%d)", preset); return 0; } @@ -1438,35 +1438,35 @@ int VolumeSetVolumeLevel(EffectContext *pContext, int16_t level){ LVM_ControlParams_t ActiveParams; /* Current control Parameters */ LVM_ReturnStatus_en LvmStatus=LVM_SUCCESS; /* Function call status */ - //LOGV("\tVolumeSetVolumeLevel Level to be set is %d %d\n", level, (LVM_INT16)(level/100)); + //ALOGV("\tVolumeSetVolumeLevel Level to be set is %d %d\n", level, (LVM_INT16)(level/100)); /* Get the current settings */ LvmStatus = LVM_GetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "VolumeSetVolumeLevel") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tVolumeSetVolumeLevel Succesfully returned from LVM_GetControlParameters got: %d\n", + //ALOGV("\tVolumeSetVolumeLevel Succesfully returned from LVM_GetControlParameters got: %d\n", //ActiveParams.VC_EffectLevel); /* Volume parameters */ ActiveParams.VC_EffectLevel = (LVM_INT16)(level/100); - //LOGV("\tVolumeSetVolumeLevel() (-96dB -> 0dB) -> %d\n", ActiveParams.VC_EffectLevel ); + //ALOGV("\tVolumeSetVolumeLevel() (-96dB -> 0dB) -> %d\n", ActiveParams.VC_EffectLevel ); /* Activate the initial settings */ LvmStatus = LVM_SetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "VolumeSetVolumeLevel") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tVolumeSetVolumeLevel Succesfully called LVM_SetControlParameters\n"); + //ALOGV("\tVolumeSetVolumeLevel Succesfully called LVM_SetControlParameters\n"); /* Get the current settings */ LvmStatus = LVM_GetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "VolumeSetVolumeLevel") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tVolumeSetVolumeLevel just set (-96dB -> 0dB) -> %d\n",ActiveParams.VC_EffectLevel ); + //ALOGV("\tVolumeSetVolumeLevel just set (-96dB -> 0dB) -> %d\n",ActiveParams.VC_EffectLevel ); if(pContext->pBundledContext->firstVolume == LVM_TRUE){ LvmStatus = LVM_SetVolumeNoSmoothing(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_SetVolumeNoSmoothing", "LvmBundle_process") - LOGV("\tLVM_VOLUME: Disabling Smoothing for first volume change to remove spikes/clicks"); + ALOGV("\tLVM_VOLUME: Disabling Smoothing for first volume change to remove spikes/clicks"); pContext->pBundledContext->firstVolume = LVM_FALSE; } return 0; @@ -1484,7 +1484,7 @@ int VolumeSetVolumeLevel(EffectContext *pContext, int16_t level){ int VolumeGetVolumeLevel(EffectContext *pContext, int16_t *level){ - //LOGV("\tVolumeGetVolumeLevel start"); + //ALOGV("\tVolumeGetVolumeLevel start"); LVM_ControlParams_t ActiveParams; /* Current control Parameters */ LVM_ReturnStatus_en LvmStatus = LVM_SUCCESS; /* Function call status */ @@ -1493,11 +1493,11 @@ int VolumeGetVolumeLevel(EffectContext *pContext, int16_t *level){ LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "VolumeGetVolumeLevel") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tVolumeGetVolumeLevel() (-96dB -> 0dB) -> %d\n", ActiveParams.VC_EffectLevel ); - //LOGV("\tVolumeGetVolumeLevel Succesfully returned from LVM_GetControlParameters\n"); + //ALOGV("\tVolumeGetVolumeLevel() (-96dB -> 0dB) -> %d\n", ActiveParams.VC_EffectLevel ); + //ALOGV("\tVolumeGetVolumeLevel Succesfully returned from LVM_GetControlParameters\n"); *level = ActiveParams.VC_EffectLevel*100; // Convert dB to millibels - //LOGV("\tVolumeGetVolumeLevel end"); + //ALOGV("\tVolumeGetVolumeLevel end"); return 0; } /* end VolumeGetVolumeLevel */ @@ -1513,7 +1513,7 @@ int VolumeGetVolumeLevel(EffectContext *pContext, int16_t *level){ //---------------------------------------------------------------------------- int32_t VolumeSetMute(EffectContext *pContext, uint32_t mute){ - //LOGV("\tVolumeSetMute start(%d)", mute); + //ALOGV("\tVolumeSetMute start(%d)", mute); pContext->pBundledContext->bMuteEnabled = mute; @@ -1525,8 +1525,8 @@ int32_t VolumeSetMute(EffectContext *pContext, uint32_t mute){ LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "VolumeSetMute") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tVolumeSetMute Succesfully returned from LVM_GetControlParameters\n"); - //LOGV("\tVolumeSetMute to %d, level was %d\n", mute, ActiveParams.VC_EffectLevel ); + //ALOGV("\tVolumeSetMute Succesfully returned from LVM_GetControlParameters\n"); + //ALOGV("\tVolumeSetMute to %d, level was %d\n", mute, ActiveParams.VC_EffectLevel ); /* Set appropriate volume level */ if(pContext->pBundledContext->bMuteEnabled == LVM_TRUE){ @@ -1541,8 +1541,8 @@ int32_t VolumeSetMute(EffectContext *pContext, uint32_t mute){ LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "VolumeSetMute") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tVolumeSetMute Succesfully called LVM_SetControlParameters\n"); - //LOGV("\tVolumeSetMute end"); + //ALOGV("\tVolumeSetMute Succesfully called LVM_SetControlParameters\n"); + //ALOGV("\tVolumeSetMute end"); return 0; } /* end setMute */ @@ -1559,17 +1559,17 @@ int32_t VolumeSetMute(EffectContext *pContext, uint32_t mute){ //---------------------------------------------------------------------------- int32_t VolumeGetMute(EffectContext *pContext, uint32_t *mute){ - //LOGV("\tVolumeGetMute start"); + //ALOGV("\tVolumeGetMute start"); if((pContext->pBundledContext->bMuteEnabled == LVM_FALSE)|| (pContext->pBundledContext->bMuteEnabled == LVM_TRUE)){ *mute = pContext->pBundledContext->bMuteEnabled; return 0; }else{ - LOGV("\tLVM_ERROR : VolumeGetMute read an invalid value from context %d", + ALOGV("\tLVM_ERROR : VolumeGetMute read an invalid value from context %d", pContext->pBundledContext->bMuteEnabled); return -EINVAL; } - //LOGV("\tVolumeGetMute end"); + //ALOGV("\tVolumeGetMute end"); } /* end getMute */ int16_t VolumeConvertStereoPosition(int16_t position){ @@ -1603,43 +1603,43 @@ int VolumeSetStereoPosition(EffectContext *pContext, int16_t position){ pContext->pBundledContext->positionSaved = position; Balance = VolumeConvertStereoPosition(pContext->pBundledContext->positionSaved); - //LOGV("\tVolumeSetStereoPosition start pContext->pBundledContext->positionSaved = %d", + //ALOGV("\tVolumeSetStereoPosition start pContext->pBundledContext->positionSaved = %d", //pContext->pBundledContext->positionSaved); if(pContext->pBundledContext->bStereoPositionEnabled == LVM_TRUE){ - //LOGV("\tVolumeSetStereoPosition Position to be set is %d %d\n", position, Balance); + //ALOGV("\tVolumeSetStereoPosition Position to be set is %d %d\n", position, Balance); pContext->pBundledContext->positionSaved = position; /* Get the current settings */ LvmStatus = LVM_GetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "VolumeSetStereoPosition") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tVolumeSetStereoPosition Succesfully returned from LVM_GetControlParameters got:" + //ALOGV("\tVolumeSetStereoPosition Succesfully returned from LVM_GetControlParameters got:" // " %d\n", ActiveParams.VC_Balance); /* Volume parameters */ ActiveParams.VC_Balance = Balance; - //LOGV("\tVolumeSetStereoPosition() (-96dB -> +96dB) -> %d\n", ActiveParams.VC_Balance ); + //ALOGV("\tVolumeSetStereoPosition() (-96dB -> +96dB) -> %d\n", ActiveParams.VC_Balance ); /* Activate the initial settings */ LvmStatus = LVM_SetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "VolumeSetStereoPosition") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tVolumeSetStereoPosition Succesfully called LVM_SetControlParameters\n"); + //ALOGV("\tVolumeSetStereoPosition Succesfully called LVM_SetControlParameters\n"); /* Get the current settings */ LvmStatus = LVM_GetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "VolumeSetStereoPosition") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tVolumeSetStereoPosition Succesfully returned from LVM_GetControlParameters got: " + //ALOGV("\tVolumeSetStereoPosition Succesfully returned from LVM_GetControlParameters got: " // "%d\n", ActiveParams.VC_Balance); } else{ - //LOGV("\tVolumeSetStereoPosition Position attempting to set, but not enabled %d %d\n", + //ALOGV("\tVolumeSetStereoPosition Position attempting to set, but not enabled %d %d\n", //position, Balance); } - //LOGV("\tVolumeSetStereoPosition end pContext->pBundledContext->positionSaved = %d\n", + //ALOGV("\tVolumeSetStereoPosition end pContext->pBundledContext->positionSaved = %d\n", //pContext->pBundledContext->positionSaved); return 0; } /* end VolumeSetStereoPosition */ @@ -1658,21 +1658,21 @@ int VolumeSetStereoPosition(EffectContext *pContext, int16_t position){ //---------------------------------------------------------------------------- int32_t VolumeGetStereoPosition(EffectContext *pContext, int16_t *position){ - //LOGV("\tVolumeGetStereoPosition start"); + //ALOGV("\tVolumeGetStereoPosition start"); LVM_ControlParams_t ActiveParams; /* Current control Parameters */ LVM_ReturnStatus_en LvmStatus = LVM_SUCCESS; /* Function call status */ LVM_INT16 balance; - //LOGV("\tVolumeGetStereoPosition start pContext->pBundledContext->positionSaved = %d", + //ALOGV("\tVolumeGetStereoPosition start pContext->pBundledContext->positionSaved = %d", //pContext->pBundledContext->positionSaved); LvmStatus = LVM_GetControlParameters(pContext->pBundledContext->hInstance, &ActiveParams); LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "VolumeGetStereoPosition") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tVolumeGetStereoPosition -> %d\n", ActiveParams.VC_Balance); - //LOGV("\tVolumeGetStereoPosition Succesfully returned from LVM_GetControlParameters\n"); + //ALOGV("\tVolumeGetStereoPosition -> %d\n", ActiveParams.VC_Balance); + //ALOGV("\tVolumeGetStereoPosition Succesfully returned from LVM_GetControlParameters\n"); balance = VolumeConvertStereoPosition(pContext->pBundledContext->positionSaved); @@ -1682,7 +1682,7 @@ int32_t VolumeGetStereoPosition(EffectContext *pContext, int16_t *position){ } } *position = (LVM_INT16)pContext->pBundledContext->positionSaved; // Convert dB to millibels - //LOGV("\tVolumeGetStereoPosition end returning pContext->pBundledContext->positionSaved =%d\n", + //ALOGV("\tVolumeGetStereoPosition end returning pContext->pBundledContext->positionSaved =%d\n", //pContext->pBundledContext->positionSaved); return 0; } /* end VolumeGetStereoPosition */ @@ -1699,7 +1699,7 @@ int32_t VolumeGetStereoPosition(EffectContext *pContext, int16_t *position){ //---------------------------------------------------------------------------- int32_t VolumeEnableStereoPosition(EffectContext *pContext, uint32_t enabled){ - //LOGV("\tVolumeEnableStereoPosition start()"); + //ALOGV("\tVolumeEnableStereoPosition start()"); pContext->pBundledContext->bStereoPositionEnabled = enabled; @@ -1711,8 +1711,8 @@ int32_t VolumeEnableStereoPosition(EffectContext *pContext, uint32_t enabled){ LVM_ERROR_CHECK(LvmStatus, "LVM_GetControlParameters", "VolumeEnableStereoPosition") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tVolumeEnableStereoPosition Succesfully returned from LVM_GetControlParameters\n"); - //LOGV("\tVolumeEnableStereoPosition to %d, position was %d\n", + //ALOGV("\tVolumeEnableStereoPosition Succesfully returned from LVM_GetControlParameters\n"); + //ALOGV("\tVolumeEnableStereoPosition to %d, position was %d\n", // enabled, ActiveParams.VC_Balance ); /* Set appropriate stereo position */ @@ -1728,8 +1728,8 @@ int32_t VolumeEnableStereoPosition(EffectContext *pContext, uint32_t enabled){ LVM_ERROR_CHECK(LvmStatus, "LVM_SetControlParameters", "VolumeEnableStereoPosition") if(LvmStatus != LVM_SUCCESS) return -EINVAL; - //LOGV("\tVolumeEnableStereoPosition Succesfully called LVM_SetControlParameters\n"); - //LOGV("\tVolumeEnableStereoPosition end()\n"); + //ALOGV("\tVolumeEnableStereoPosition Succesfully called LVM_SetControlParameters\n"); + //ALOGV("\tVolumeEnableStereoPosition end()\n"); return 0; } /* end VolumeEnableStereoPosition */ @@ -1764,26 +1764,26 @@ int BassBoost_getParameter(EffectContext *pContext, int32_t param2; char *name; - //LOGV("\tBassBoost_getParameter start"); + //ALOGV("\tBassBoost_getParameter start"); switch (param){ case BASSBOOST_PARAM_STRENGTH_SUPPORTED: if (*pValueSize != sizeof(uint32_t)){ - LOGV("\tLVM_ERROR : BassBoost_getParameter() invalid pValueSize1 %d", *pValueSize); + ALOGV("\tLVM_ERROR : BassBoost_getParameter() invalid pValueSize1 %d", *pValueSize); return -EINVAL; } *pValueSize = sizeof(uint32_t); break; case BASSBOOST_PARAM_STRENGTH: if (*pValueSize != sizeof(int16_t)){ - LOGV("\tLVM_ERROR : BassBoost_getParameter() invalid pValueSize2 %d", *pValueSize); + ALOGV("\tLVM_ERROR : BassBoost_getParameter() invalid pValueSize2 %d", *pValueSize); return -EINVAL; } *pValueSize = sizeof(int16_t); break; default: - LOGV("\tLVM_ERROR : BassBoost_getParameter() invalid param %d", param); + ALOGV("\tLVM_ERROR : BassBoost_getParameter() invalid param %d", param); return -EINVAL; } @@ -1791,24 +1791,24 @@ int BassBoost_getParameter(EffectContext *pContext, case BASSBOOST_PARAM_STRENGTH_SUPPORTED: *(uint32_t *)pValue = 1; - //LOGV("\tBassBoost_getParameter() BASSBOOST_PARAM_STRENGTH_SUPPORTED Value is %d", + //ALOGV("\tBassBoost_getParameter() BASSBOOST_PARAM_STRENGTH_SUPPORTED Value is %d", // *(uint32_t *)pValue); break; case BASSBOOST_PARAM_STRENGTH: *(int16_t *)pValue = BassGetStrength(pContext); - //LOGV("\tBassBoost_getParameter() BASSBOOST_PARAM_STRENGTH Value is %d", + //ALOGV("\tBassBoost_getParameter() BASSBOOST_PARAM_STRENGTH Value is %d", // *(int16_t *)pValue); break; default: - LOGV("\tLVM_ERROR : BassBoost_getParameter() invalid param %d", param); + ALOGV("\tLVM_ERROR : BassBoost_getParameter() invalid param %d", param); status = -EINVAL; break; } - //LOGV("\tBassBoost_getParameter end"); + //ALOGV("\tBassBoost_getParameter end"); return status; } /* end BassBoost_getParameter */ @@ -1832,22 +1832,22 @@ int BassBoost_setParameter (EffectContext *pContext, void *pParam, void *pValue) int16_t strength; int32_t *pParamTemp = (int32_t *)pParam; - //LOGV("\tBassBoost_setParameter start"); + //ALOGV("\tBassBoost_setParameter start"); switch (*pParamTemp){ case BASSBOOST_PARAM_STRENGTH: strength = *(int16_t *)pValue; - //LOGV("\tBassBoost_setParameter() BASSBOOST_PARAM_STRENGTH value is %d", strength); - //LOGV("\tBassBoost_setParameter() Calling pBassBoost->BassSetStrength"); + //ALOGV("\tBassBoost_setParameter() BASSBOOST_PARAM_STRENGTH value is %d", strength); + //ALOGV("\tBassBoost_setParameter() Calling pBassBoost->BassSetStrength"); BassSetStrength(pContext, (int32_t)strength); - //LOGV("\tBassBoost_setParameter() Called pBassBoost->BassSetStrength"); + //ALOGV("\tBassBoost_setParameter() Called pBassBoost->BassSetStrength"); break; default: - LOGV("\tLVM_ERROR : BassBoost_setParameter() invalid param %d", *pParamTemp); + ALOGV("\tLVM_ERROR : BassBoost_setParameter() invalid param %d", *pParamTemp); break; } - //LOGV("\tBassBoost_setParameter end"); + //ALOGV("\tBassBoost_setParameter end"); return status; } /* end BassBoost_setParameter */ @@ -1882,26 +1882,26 @@ int Virtualizer_getParameter(EffectContext *pContext, int32_t param2; char *name; - //LOGV("\tVirtualizer_getParameter start"); + //ALOGV("\tVirtualizer_getParameter start"); switch (param){ case VIRTUALIZER_PARAM_STRENGTH_SUPPORTED: if (*pValueSize != sizeof(uint32_t)){ - LOGV("\tLVM_ERROR : Virtualizer_getParameter() invalid pValueSize %d",*pValueSize); + ALOGV("\tLVM_ERROR : Virtualizer_getParameter() invalid pValueSize %d",*pValueSize); return -EINVAL; } *pValueSize = sizeof(uint32_t); break; case VIRTUALIZER_PARAM_STRENGTH: if (*pValueSize != sizeof(int16_t)){ - LOGV("\tLVM_ERROR : Virtualizer_getParameter() invalid pValueSize2 %d",*pValueSize); + ALOGV("\tLVM_ERROR : Virtualizer_getParameter() invalid pValueSize2 %d",*pValueSize); return -EINVAL; } *pValueSize = sizeof(int16_t); break; default: - LOGV("\tLVM_ERROR : Virtualizer_getParameter() invalid param %d", param); + ALOGV("\tLVM_ERROR : Virtualizer_getParameter() invalid param %d", param); return -EINVAL; } @@ -1909,24 +1909,24 @@ int Virtualizer_getParameter(EffectContext *pContext, case VIRTUALIZER_PARAM_STRENGTH_SUPPORTED: *(uint32_t *)pValue = 1; - //LOGV("\tVirtualizer_getParameter() VIRTUALIZER_PARAM_STRENGTH_SUPPORTED Value is %d", + //ALOGV("\tVirtualizer_getParameter() VIRTUALIZER_PARAM_STRENGTH_SUPPORTED Value is %d", // *(uint32_t *)pValue); break; case VIRTUALIZER_PARAM_STRENGTH: *(int16_t *)pValue = VirtualizerGetStrength(pContext); - //LOGV("\tVirtualizer_getParameter() VIRTUALIZER_PARAM_STRENGTH Value is %d", + //ALOGV("\tVirtualizer_getParameter() VIRTUALIZER_PARAM_STRENGTH Value is %d", // *(int16_t *)pValue); break; default: - LOGV("\tLVM_ERROR : Virtualizer_getParameter() invalid param %d", param); + ALOGV("\tLVM_ERROR : Virtualizer_getParameter() invalid param %d", param); status = -EINVAL; break; } - //LOGV("\tVirtualizer_getParameter end"); + //ALOGV("\tVirtualizer_getParameter end"); return status; } /* end Virtualizer_getParameter */ @@ -1951,22 +1951,22 @@ int Virtualizer_setParameter (EffectContext *pContext, void *pParam, void *pValu int32_t *pParamTemp = (int32_t *)pParam; int32_t param = *pParamTemp++; - //LOGV("\tVirtualizer_setParameter start"); + //ALOGV("\tVirtualizer_setParameter start"); switch (param){ case VIRTUALIZER_PARAM_STRENGTH: strength = *(int16_t *)pValue; - //LOGV("\tVirtualizer_setParameter() VIRTUALIZER_PARAM_STRENGTH value is %d", strength); - //LOGV("\tVirtualizer_setParameter() Calling pVirtualizer->setStrength"); + //ALOGV("\tVirtualizer_setParameter() VIRTUALIZER_PARAM_STRENGTH value is %d", strength); + //ALOGV("\tVirtualizer_setParameter() Calling pVirtualizer->setStrength"); VirtualizerSetStrength(pContext, (int32_t)strength); - //LOGV("\tVirtualizer_setParameter() Called pVirtualizer->setStrength"); + //ALOGV("\tVirtualizer_setParameter() Called pVirtualizer->setStrength"); break; default: - LOGV("\tLVM_ERROR : Virtualizer_setParameter() invalid param %d", param); + ALOGV("\tLVM_ERROR : Virtualizer_setParameter() invalid param %d", param); break; } - //LOGV("\tVirtualizer_setParameter end"); + //ALOGV("\tVirtualizer_setParameter end"); return status; } /* end Virtualizer_setParameter */ @@ -2001,7 +2001,7 @@ int Equalizer_getParameter(EffectContext *pContext, int32_t param2; char *name; - //LOGV("\tEqualizer_getParameter start"); + //ALOGV("\tEqualizer_getParameter start"); switch (param) { case EQ_PARAM_NUM_BANDS: @@ -2010,7 +2010,7 @@ int Equalizer_getParameter(EffectContext *pContext, case EQ_PARAM_BAND_LEVEL: case EQ_PARAM_GET_BAND: if (*pValueSize < sizeof(int16_t)) { - LOGV("\tLVM_ERROR : Equalizer_getParameter() invalid pValueSize 1 %d", *pValueSize); + ALOGV("\tLVM_ERROR : Equalizer_getParameter() invalid pValueSize 1 %d", *pValueSize); return -EINVAL; } *pValueSize = sizeof(int16_t); @@ -2018,14 +2018,14 @@ int Equalizer_getParameter(EffectContext *pContext, case EQ_PARAM_LEVEL_RANGE: if (*pValueSize < 2 * sizeof(int16_t)) { - LOGV("\tLVM_ERROR : Equalizer_getParameter() invalid pValueSize 2 %d", *pValueSize); + ALOGV("\tLVM_ERROR : Equalizer_getParameter() invalid pValueSize 2 %d", *pValueSize); return -EINVAL; } *pValueSize = 2 * sizeof(int16_t); break; case EQ_PARAM_BAND_FREQ_RANGE: if (*pValueSize < 2 * sizeof(int32_t)) { - LOGV("\tLVM_ERROR : Equalizer_getParameter() invalid pValueSize 3 %d", *pValueSize); + ALOGV("\tLVM_ERROR : Equalizer_getParameter() invalid pValueSize 3 %d", *pValueSize); return -EINVAL; } *pValueSize = 2 * sizeof(int32_t); @@ -2033,7 +2033,7 @@ int Equalizer_getParameter(EffectContext *pContext, case EQ_PARAM_CENTER_FREQ: if (*pValueSize < sizeof(int32_t)) { - LOGV("\tLVM_ERROR : Equalizer_getParameter() invalid pValueSize 5 %d", *pValueSize); + ALOGV("\tLVM_ERROR : Equalizer_getParameter() invalid pValueSize 5 %d", *pValueSize); return -EINVAL; } *pValueSize = sizeof(int32_t); @@ -2044,27 +2044,27 @@ int Equalizer_getParameter(EffectContext *pContext, case EQ_PARAM_PROPERTIES: if (*pValueSize < (2 + FIVEBAND_NUMBANDS) * sizeof(uint16_t)) { - LOGV("\tLVM_ERROR : Equalizer_getParameter() invalid pValueSize 1 %d", *pValueSize); + ALOGV("\tLVM_ERROR : Equalizer_getParameter() invalid pValueSize 1 %d", *pValueSize); return -EINVAL; } *pValueSize = (2 + FIVEBAND_NUMBANDS) * sizeof(uint16_t); break; default: - LOGV("\tLVM_ERROR : Equalizer_getParameter unknown param %d", param); + ALOGV("\tLVM_ERROR : Equalizer_getParameter unknown param %d", param); return -EINVAL; } switch (param) { case EQ_PARAM_NUM_BANDS: *(uint16_t *)pValue = (uint16_t)FIVEBAND_NUMBANDS; - //LOGV("\tEqualizer_getParameter() EQ_PARAM_NUM_BANDS %d", *(int16_t *)pValue); + //ALOGV("\tEqualizer_getParameter() EQ_PARAM_NUM_BANDS %d", *(int16_t *)pValue); break; case EQ_PARAM_LEVEL_RANGE: *(int16_t *)pValue = -1500; *((int16_t *)pValue + 1) = 1500; - //LOGV("\tEqualizer_getParameter() EQ_PARAM_LEVEL_RANGE min %d, max %d", + //ALOGV("\tEqualizer_getParameter() EQ_PARAM_LEVEL_RANGE min %d, max %d", // *(int16_t *)pValue, *((int16_t *)pValue + 1)); break; @@ -2075,7 +2075,7 @@ int Equalizer_getParameter(EffectContext *pContext, break; } *(int16_t *)pValue = (int16_t)EqualizerGetBandLevel(pContext, param2); - //LOGV("\tEqualizer_getParameter() EQ_PARAM_BAND_LEVEL band %d, level %d", + //ALOGV("\tEqualizer_getParameter() EQ_PARAM_BAND_LEVEL band %d, level %d", // param2, *(int32_t *)pValue); break; @@ -2086,7 +2086,7 @@ int Equalizer_getParameter(EffectContext *pContext, break; } *(int32_t *)pValue = EqualizerGetCentreFrequency(pContext, param2); - //LOGV("\tEqualizer_getParameter() EQ_PARAM_CENTER_FREQ band %d, frequency %d", + //ALOGV("\tEqualizer_getParameter() EQ_PARAM_CENTER_FREQ band %d, frequency %d", // param2, *(int32_t *)pValue); break; @@ -2097,25 +2097,25 @@ int Equalizer_getParameter(EffectContext *pContext, break; } EqualizerGetBandFreqRange(pContext, param2, (uint32_t *)pValue, ((uint32_t *)pValue + 1)); - //LOGV("\tEqualizer_getParameter() EQ_PARAM_BAND_FREQ_RANGE band %d, min %d, max %d", + //ALOGV("\tEqualizer_getParameter() EQ_PARAM_BAND_FREQ_RANGE band %d, min %d, max %d", // param2, *(int32_t *)pValue, *((int32_t *)pValue + 1)); break; case EQ_PARAM_GET_BAND: param2 = *pParamTemp; *(uint16_t *)pValue = (uint16_t)EqualizerGetBand(pContext, param2); - //LOGV("\tEqualizer_getParameter() EQ_PARAM_GET_BAND frequency %d, band %d", + //ALOGV("\tEqualizer_getParameter() EQ_PARAM_GET_BAND frequency %d, band %d", // param2, *(uint16_t *)pValue); break; case EQ_PARAM_CUR_PRESET: *(uint16_t *)pValue = (uint16_t)EqualizerGetPreset(pContext); - //LOGV("\tEqualizer_getParameter() EQ_PARAM_CUR_PRESET %d", *(int32_t *)pValue); + //ALOGV("\tEqualizer_getParameter() EQ_PARAM_CUR_PRESET %d", *(int32_t *)pValue); break; case EQ_PARAM_GET_NUM_OF_PRESETS: *(uint16_t *)pValue = (uint16_t)EqualizerGetNumPresets(); - //LOGV("\tEqualizer_getParameter() EQ_PARAM_GET_NUM_OF_PRESETS %d", *(int16_t *)pValue); + //ALOGV("\tEqualizer_getParameter() EQ_PARAM_GET_NUM_OF_PRESETS %d", *(int16_t *)pValue); break; case EQ_PARAM_GET_PRESET_NAME: @@ -2129,13 +2129,13 @@ int Equalizer_getParameter(EffectContext *pContext, strncpy(name, EqualizerGetPresetName(param2), *pValueSize - 1); name[*pValueSize - 1] = 0; *pValueSize = strlen(name) + 1; - //LOGV("\tEqualizer_getParameter() EQ_PARAM_GET_PRESET_NAME preset %d, name %s len %d", + //ALOGV("\tEqualizer_getParameter() EQ_PARAM_GET_PRESET_NAME preset %d, name %s len %d", // param2, gEqualizerPresets[param2].name, *pValueSize); break; case EQ_PARAM_PROPERTIES: { int16_t *p = (int16_t *)pValue; - LOGV("\tEqualizer_getParameter() EQ_PARAM_PROPERTIES"); + ALOGV("\tEqualizer_getParameter() EQ_PARAM_PROPERTIES"); p[0] = (int16_t)EqualizerGetPreset(pContext); p[1] = (int16_t)FIVEBAND_NUMBANDS; for (int i = 0; i < FIVEBAND_NUMBANDS; i++) { @@ -2144,7 +2144,7 @@ int Equalizer_getParameter(EffectContext *pContext, } break; default: - LOGV("\tLVM_ERROR : Equalizer_getParameter() invalid param %d", param); + ALOGV("\tLVM_ERROR : Equalizer_getParameter() invalid param %d", param); status = -EINVAL; break; } @@ -2176,12 +2176,12 @@ int Equalizer_setParameter (EffectContext *pContext, void *pParam, void *pValue) int32_t param = *pParamTemp++; - //LOGV("\tEqualizer_setParameter start"); + //ALOGV("\tEqualizer_setParameter start"); switch (param) { case EQ_PARAM_CUR_PRESET: preset = (int32_t)(*(uint16_t *)pValue); - //LOGV("\tEqualizer_setParameter() EQ_PARAM_CUR_PRESET %d", preset); + //ALOGV("\tEqualizer_setParameter() EQ_PARAM_CUR_PRESET %d", preset); if ((preset >= EqualizerGetNumPresets())||(preset < 0)) { status = -EINVAL; break; @@ -2191,7 +2191,7 @@ int Equalizer_setParameter (EffectContext *pContext, void *pParam, void *pValue) case EQ_PARAM_BAND_LEVEL: band = *pParamTemp; level = (int32_t)(*(int16_t *)pValue); - //LOGV("\tEqualizer_setParameter() EQ_PARAM_BAND_LEVEL band %d, level %d", band, level); + //ALOGV("\tEqualizer_setParameter() EQ_PARAM_BAND_LEVEL band %d, level %d", band, level); if (band >= FIVEBAND_NUMBANDS) { status = -EINVAL; break; @@ -2199,7 +2199,7 @@ int Equalizer_setParameter (EffectContext *pContext, void *pParam, void *pValue) EqualizerSetBandLevel(pContext, band, level); break; case EQ_PARAM_PROPERTIES: { - //LOGV("\tEqualizer_setParameter() EQ_PARAM_PROPERTIES"); + //ALOGV("\tEqualizer_setParameter() EQ_PARAM_PROPERTIES"); int16_t *p = (int16_t *)pValue; if ((int)p[0] >= EqualizerGetNumPresets()) { status = -EINVAL; @@ -2218,12 +2218,12 @@ int Equalizer_setParameter (EffectContext *pContext, void *pParam, void *pValue) } } break; default: - LOGV("\tLVM_ERROR : Equalizer_setParameter() invalid param %d", param); + ALOGV("\tLVM_ERROR : Equalizer_setParameter() invalid param %d", param); status = -EINVAL; break; } - //LOGV("\tEqualizer_setParameter end"); + //ALOGV("\tEqualizer_setParameter end"); return status; } /* end Equalizer_setParameter */ @@ -2258,14 +2258,14 @@ int Volume_getParameter(EffectContext *pContext, int32_t param = *pParamTemp++;; char *name; - //LOGV("\tVolume_getParameter start"); + //ALOGV("\tVolume_getParameter start"); switch (param){ case VOLUME_PARAM_LEVEL: case VOLUME_PARAM_MAXLEVEL: case VOLUME_PARAM_STEREOPOSITION: if (*pValueSize != sizeof(int16_t)){ - LOGV("\tLVM_ERROR : Volume_getParameter() invalid pValueSize 1 %d", *pValueSize); + ALOGV("\tLVM_ERROR : Volume_getParameter() invalid pValueSize 1 %d", *pValueSize); return -EINVAL; } *pValueSize = sizeof(int16_t); @@ -2274,55 +2274,55 @@ int Volume_getParameter(EffectContext *pContext, case VOLUME_PARAM_MUTE: case VOLUME_PARAM_ENABLESTEREOPOSITION: if (*pValueSize < sizeof(int32_t)){ - LOGV("\tLVM_ERROR : Volume_getParameter() invalid pValueSize 2 %d", *pValueSize); + ALOGV("\tLVM_ERROR : Volume_getParameter() invalid pValueSize 2 %d", *pValueSize); return -EINVAL; } *pValueSize = sizeof(int32_t); break; default: - LOGV("\tLVM_ERROR : Volume_getParameter unknown param %d", param); + ALOGV("\tLVM_ERROR : Volume_getParameter unknown param %d", param); return -EINVAL; } switch (param){ case VOLUME_PARAM_LEVEL: status = VolumeGetVolumeLevel(pContext, (int16_t *)(pValue)); - //LOGV("\tVolume_getParameter() VOLUME_PARAM_LEVEL Value is %d", + //ALOGV("\tVolume_getParameter() VOLUME_PARAM_LEVEL Value is %d", // *(int16_t *)pValue); break; case VOLUME_PARAM_MAXLEVEL: *(int16_t *)pValue = 0; - //LOGV("\tVolume_getParameter() VOLUME_PARAM_MAXLEVEL Value is %d", + //ALOGV("\tVolume_getParameter() VOLUME_PARAM_MAXLEVEL Value is %d", // *(int16_t *)pValue); break; case VOLUME_PARAM_STEREOPOSITION: VolumeGetStereoPosition(pContext, (int16_t *)pValue); - //LOGV("\tVolume_getParameter() VOLUME_PARAM_STEREOPOSITION Value is %d", + //ALOGV("\tVolume_getParameter() VOLUME_PARAM_STEREOPOSITION Value is %d", // *(int16_t *)pValue); break; case VOLUME_PARAM_MUTE: status = VolumeGetMute(pContext, (uint32_t *)pValue); - LOGV("\tVolume_getParameter() VOLUME_PARAM_MUTE Value is %d", + ALOGV("\tVolume_getParameter() VOLUME_PARAM_MUTE Value is %d", *(uint32_t *)pValue); break; case VOLUME_PARAM_ENABLESTEREOPOSITION: *(int32_t *)pValue = pContext->pBundledContext->bStereoPositionEnabled; - //LOGV("\tVolume_getParameter() VOLUME_PARAM_ENABLESTEREOPOSITION Value is %d", + //ALOGV("\tVolume_getParameter() VOLUME_PARAM_ENABLESTEREOPOSITION Value is %d", // *(uint32_t *)pValue); break; default: - LOGV("\tLVM_ERROR : Volume_getParameter() invalid param %d", param); + ALOGV("\tLVM_ERROR : Volume_getParameter() invalid param %d", param); status = -EINVAL; break; } - //LOGV("\tVolume_getParameter end"); + //ALOGV("\tVolume_getParameter end"); return status; } /* end Volume_getParameter */ @@ -2351,46 +2351,46 @@ int Volume_setParameter (EffectContext *pContext, void *pParam, void *pValue){ int32_t *pParamTemp = (int32_t *)pParam; int32_t param = *pParamTemp++; - //LOGV("\tVolume_setParameter start"); + //ALOGV("\tVolume_setParameter start"); switch (param){ case VOLUME_PARAM_LEVEL: level = *(int16_t *)pValue; - //LOGV("\tVolume_setParameter() VOLUME_PARAM_LEVEL value is %d", level); - //LOGV("\tVolume_setParameter() Calling pVolume->setVolumeLevel"); + //ALOGV("\tVolume_setParameter() VOLUME_PARAM_LEVEL value is %d", level); + //ALOGV("\tVolume_setParameter() Calling pVolume->setVolumeLevel"); status = VolumeSetVolumeLevel(pContext, (int16_t)level); - //LOGV("\tVolume_setParameter() Called pVolume->setVolumeLevel"); + //ALOGV("\tVolume_setParameter() Called pVolume->setVolumeLevel"); break; case VOLUME_PARAM_MUTE: mute = *(uint32_t *)pValue; - //LOGV("\tVolume_setParameter() Calling pVolume->setMute, mute is %d", mute); - //LOGV("\tVolume_setParameter() Calling pVolume->setMute"); + //ALOGV("\tVolume_setParameter() Calling pVolume->setMute, mute is %d", mute); + //ALOGV("\tVolume_setParameter() Calling pVolume->setMute"); status = VolumeSetMute(pContext, mute); - //LOGV("\tVolume_setParameter() Called pVolume->setMute"); + //ALOGV("\tVolume_setParameter() Called pVolume->setMute"); break; case VOLUME_PARAM_ENABLESTEREOPOSITION: positionEnabled = *(uint32_t *)pValue; status = VolumeEnableStereoPosition(pContext, positionEnabled); status = VolumeSetStereoPosition(pContext, pContext->pBundledContext->positionSaved); - //LOGV("\tVolume_setParameter() VOLUME_PARAM_ENABLESTEREOPOSITION called"); + //ALOGV("\tVolume_setParameter() VOLUME_PARAM_ENABLESTEREOPOSITION called"); break; case VOLUME_PARAM_STEREOPOSITION: position = *(int16_t *)pValue; - //LOGV("\tVolume_setParameter() VOLUME_PARAM_STEREOPOSITION value is %d", position); - //LOGV("\tVolume_setParameter() Calling pVolume->VolumeSetStereoPosition"); + //ALOGV("\tVolume_setParameter() VOLUME_PARAM_STEREOPOSITION value is %d", position); + //ALOGV("\tVolume_setParameter() Calling pVolume->VolumeSetStereoPosition"); status = VolumeSetStereoPosition(pContext, (int16_t)position); - //LOGV("\tVolume_setParameter() Called pVolume->VolumeSetStereoPosition"); + //ALOGV("\tVolume_setParameter() Called pVolume->VolumeSetStereoPosition"); break; default: - LOGV("\tLVM_ERROR : Volume_setParameter() invalid param %d", param); + ALOGV("\tLVM_ERROR : Volume_setParameter() invalid param %d", param); break; } - //LOGV("\tVolume_setParameter end"); + //ALOGV("\tVolume_setParameter end"); return status; } /* end Volume_setParameter */ @@ -2456,13 +2456,13 @@ LVM_INT16 LVC_ToDB_s32Tos16(LVM_INT32 Lin_fix) int Effect_setEnabled(EffectContext *pContext, bool enabled) { - LOGV("\tEffect_setEnabled() type %d, enabled %d", pContext->EffectType, enabled); + ALOGV("\tEffect_setEnabled() type %d, enabled %d", pContext->EffectType, enabled); if (enabled) { switch (pContext->EffectType) { case LVM_BASS_BOOST: if (pContext->pBundledContext->bBassEnabled == LVM_TRUE) { - LOGV("\tEffect_setEnabled() LVM_BASS_BOOST is already enabled"); + ALOGV("\tEffect_setEnabled() LVM_BASS_BOOST is already enabled"); return -EINVAL; } if(pContext->pBundledContext->SamplesToExitCountBb <= 0){ @@ -2474,7 +2474,7 @@ int Effect_setEnabled(EffectContext *pContext, bool enabled) break; case LVM_EQUALIZER: if (pContext->pBundledContext->bEqualizerEnabled == LVM_TRUE) { - LOGV("\tEffect_setEnabled() LVM_EQUALIZER is already enabled"); + ALOGV("\tEffect_setEnabled() LVM_EQUALIZER is already enabled"); return -EINVAL; } if(pContext->pBundledContext->SamplesToExitCountEq <= 0){ @@ -2486,7 +2486,7 @@ int Effect_setEnabled(EffectContext *pContext, bool enabled) break; case LVM_VIRTUALIZER: if (pContext->pBundledContext->bVirtualizerEnabled == LVM_TRUE) { - LOGV("\tEffect_setEnabled() LVM_VIRTUALIZER is already enabled"); + ALOGV("\tEffect_setEnabled() LVM_VIRTUALIZER is already enabled"); return -EINVAL; } if(pContext->pBundledContext->SamplesToExitCountVirt <= 0){ @@ -2498,14 +2498,14 @@ int Effect_setEnabled(EffectContext *pContext, bool enabled) break; case LVM_VOLUME: if (pContext->pBundledContext->bVolumeEnabled == LVM_TRUE) { - LOGV("\tEffect_setEnabled() LVM_VOLUME is already enabled"); + ALOGV("\tEffect_setEnabled() LVM_VOLUME is already enabled"); return -EINVAL; } pContext->pBundledContext->NumberEffectsEnabled++; pContext->pBundledContext->bVolumeEnabled = LVM_TRUE; break; default: - LOGV("\tEffect_setEnabled() invalid effect type"); + ALOGV("\tEffect_setEnabled() invalid effect type"); return -EINVAL; } LvmEffect_enable(pContext); @@ -2513,34 +2513,34 @@ int Effect_setEnabled(EffectContext *pContext, bool enabled) switch (pContext->EffectType) { case LVM_BASS_BOOST: if (pContext->pBundledContext->bBassEnabled == LVM_FALSE) { - LOGV("\tEffect_setEnabled() LVM_BASS_BOOST is already disabled"); + ALOGV("\tEffect_setEnabled() LVM_BASS_BOOST is already disabled"); return -EINVAL; } pContext->pBundledContext->bBassEnabled = LVM_FALSE; break; case LVM_EQUALIZER: if (pContext->pBundledContext->bEqualizerEnabled == LVM_FALSE) { - LOGV("\tEffect_setEnabled() LVM_EQUALIZER is already disabled"); + ALOGV("\tEffect_setEnabled() LVM_EQUALIZER is already disabled"); return -EINVAL; } pContext->pBundledContext->bEqualizerEnabled = LVM_FALSE; break; case LVM_VIRTUALIZER: if (pContext->pBundledContext->bVirtualizerEnabled == LVM_FALSE) { - LOGV("\tEffect_setEnabled() LVM_VIRTUALIZER is already disabled"); + ALOGV("\tEffect_setEnabled() LVM_VIRTUALIZER is already disabled"); return -EINVAL; } pContext->pBundledContext->bVirtualizerEnabled = LVM_FALSE; break; case LVM_VOLUME: if (pContext->pBundledContext->bVolumeEnabled == LVM_FALSE) { - LOGV("\tEffect_setEnabled() LVM_VOLUME is already disabled"); + ALOGV("\tEffect_setEnabled() LVM_VOLUME is already disabled"); return -EINVAL; } pContext->pBundledContext->bVolumeEnabled = LVM_FALSE; break; default: - LOGV("\tEffect_setEnabled() invalid effect type"); + ALOGV("\tEffect_setEnabled() invalid effect type"); return -EINVAL; } LvmEffect_disable(pContext); @@ -2585,77 +2585,77 @@ int Effect_process(effect_handle_t self, LVM_INT16 *in = (LVM_INT16 *)inBuffer->raw; LVM_INT16 *out = (LVM_INT16 *)outBuffer->raw; -//LOGV("\tEffect_process Start : Enabled = %d Called = %d (%8d %8d %8d)", +//ALOGV("\tEffect_process Start : Enabled = %d Called = %d (%8d %8d %8d)", //pContext->pBundledContext->NumberEffectsEnabled,pContext->pBundledContext->NumberEffectsCalled, // pContext->pBundledContext->SamplesToExitCountBb, // pContext->pBundledContext->SamplesToExitCountVirt, // pContext->pBundledContext->SamplesToExitCountEq); if (pContext == NULL){ - LOGV("\tLVM_ERROR : Effect_process() ERROR pContext == NULL"); + ALOGV("\tLVM_ERROR : Effect_process() ERROR pContext == NULL"); return -EINVAL; } //if(pContext->EffectType == LVM_BASS_BOOST){ - // LOGV("\tEffect_process: Effect type is BASS_BOOST"); + // ALOGV("\tEffect_process: Effect type is BASS_BOOST"); //}else if(pContext->EffectType == LVM_EQUALIZER){ - // LOGV("\tEffect_process: Effect type is LVM_EQUALIZER"); + // ALOGV("\tEffect_process: Effect type is LVM_EQUALIZER"); //}else if(pContext->EffectType == LVM_VIRTUALIZER){ - // LOGV("\tEffect_process: Effect type is LVM_VIRTUALIZER"); + // ALOGV("\tEffect_process: Effect type is LVM_VIRTUALIZER"); //} if (inBuffer == NULL || inBuffer->raw == NULL || outBuffer == NULL || outBuffer->raw == NULL || inBuffer->frameCount != outBuffer->frameCount){ - LOGV("\tLVM_ERROR : Effect_process() ERROR NULL INPUT POINTER OR FRAME COUNT IS WRONG"); + ALOGV("\tLVM_ERROR : Effect_process() ERROR NULL INPUT POINTER OR FRAME COUNT IS WRONG"); return -EINVAL; } if ((pContext->pBundledContext->bBassEnabled == LVM_FALSE)&& (pContext->EffectType == LVM_BASS_BOOST)){ - //LOGV("\tEffect_process() LVM_BASS_BOOST Effect is not enabled"); + //ALOGV("\tEffect_process() LVM_BASS_BOOST Effect is not enabled"); if(pContext->pBundledContext->SamplesToExitCountBb > 0){ pContext->pBundledContext->SamplesToExitCountBb -= outBuffer->frameCount * 2; // STEREO - //LOGV("\tEffect_process: Waiting to turn off BASS_BOOST, %d samples left", + //ALOGV("\tEffect_process: Waiting to turn off BASS_BOOST, %d samples left", // pContext->pBundledContext->SamplesToExitCountBb); } if(pContext->pBundledContext->SamplesToExitCountBb <= 0) { status = -ENODATA; pContext->pBundledContext->NumberEffectsEnabled--; - LOGV("\tEffect_process() this is the last frame for LVM_BASS_BOOST"); + ALOGV("\tEffect_process() this is the last frame for LVM_BASS_BOOST"); } } if ((pContext->pBundledContext->bVolumeEnabled == LVM_FALSE)&& (pContext->EffectType == LVM_VOLUME)){ - //LOGV("\tEffect_process() LVM_VOLUME Effect is not enabled"); + //ALOGV("\tEffect_process() LVM_VOLUME Effect is not enabled"); status = -ENODATA; pContext->pBundledContext->NumberEffectsEnabled--; } if ((pContext->pBundledContext->bEqualizerEnabled == LVM_FALSE)&& (pContext->EffectType == LVM_EQUALIZER)){ - //LOGV("\tEffect_process() LVM_EQUALIZER Effect is not enabled"); + //ALOGV("\tEffect_process() LVM_EQUALIZER Effect is not enabled"); if(pContext->pBundledContext->SamplesToExitCountEq > 0){ pContext->pBundledContext->SamplesToExitCountEq -= outBuffer->frameCount * 2; // STEREO - //LOGV("\tEffect_process: Waiting to turn off EQUALIZER, %d samples left", + //ALOGV("\tEffect_process: Waiting to turn off EQUALIZER, %d samples left", // pContext->pBundledContext->SamplesToExitCountEq); } if(pContext->pBundledContext->SamplesToExitCountEq <= 0) { status = -ENODATA; pContext->pBundledContext->NumberEffectsEnabled--; - LOGV("\tEffect_process() this is the last frame for LVM_EQUALIZER"); + ALOGV("\tEffect_process() this is the last frame for LVM_EQUALIZER"); } } if ((pContext->pBundledContext->bVirtualizerEnabled == LVM_FALSE)&& (pContext->EffectType == LVM_VIRTUALIZER)){ - //LOGV("\tEffect_process() LVM_VIRTUALIZER Effect is not enabled"); + //ALOGV("\tEffect_process() LVM_VIRTUALIZER Effect is not enabled"); if(pContext->pBundledContext->SamplesToExitCountVirt > 0){ pContext->pBundledContext->SamplesToExitCountVirt -= outBuffer->frameCount * 2;// STEREO - //LOGV("\tEffect_process: Waiting for to turn off VIRTUALIZER, %d samples left", + //ALOGV("\tEffect_process: Waiting for to turn off VIRTUALIZER, %d samples left", // pContext->pBundledContext->SamplesToExitCountVirt); } if(pContext->pBundledContext->SamplesToExitCountVirt <= 0) { status = -ENODATA; pContext->pBundledContext->NumberEffectsEnabled--; - LOGV("\tEffect_process() this is the last frame for LVM_VIRTUALIZER"); + ALOGV("\tEffect_process() this is the last frame for LVM_VIRTUALIZER"); } } @@ -2665,12 +2665,12 @@ int Effect_process(effect_handle_t self, if(pContext->pBundledContext->NumberEffectsCalled == pContext->pBundledContext->NumberEffectsEnabled){ - //LOGV("\tEffect_process Calling process with %d effects enabled, %d called: Effect %d", + //ALOGV("\tEffect_process Calling process with %d effects enabled, %d called: Effect %d", //pContext->pBundledContext->NumberEffectsEnabled, //pContext->pBundledContext->NumberEffectsCalled, pContext->EffectType); if(status == -ENODATA){ - LOGV("\tEffect_process() processing last frame"); + ALOGV("\tEffect_process() processing last frame"); } pContext->pBundledContext->NumberEffectsCalled = 0; /* Process all the available frames, block processing is @@ -2680,11 +2680,11 @@ int Effect_process(effect_handle_t self, outBuffer->frameCount, pContext); if(lvmStatus != LVM_SUCCESS){ - LOGV("\tLVM_ERROR : LvmBundle_process returned error %d", lvmStatus); + ALOGV("\tLVM_ERROR : LvmBundle_process returned error %d", lvmStatus); return lvmStatus; } }else{ - //LOGV("\tEffect_process Not Calling process with %d effects enabled, %d called: Effect %d", + //ALOGV("\tEffect_process Not Calling process with %d effects enabled, %d called: Effect %d", //pContext->pBundledContext->NumberEffectsEnabled, //pContext->pBundledContext->NumberEffectsCalled, pContext->EffectType); // 2 is for stereo input @@ -2704,92 +2704,92 @@ int Effect_command(effect_handle_t self, EffectContext * pContext = (EffectContext *) self; int retsize; - //LOGV("\t\nEffect_command start"); + //ALOGV("\t\nEffect_command start"); if(pContext->EffectType == LVM_BASS_BOOST){ - //LOGV("\tEffect_command setting command for LVM_BASS_BOOST"); + //ALOGV("\tEffect_command setting command for LVM_BASS_BOOST"); } if(pContext->EffectType == LVM_VIRTUALIZER){ - //LOGV("\tEffect_command setting command for LVM_VIRTUALIZER"); + //ALOGV("\tEffect_command setting command for LVM_VIRTUALIZER"); } if(pContext->EffectType == LVM_EQUALIZER){ - //LOGV("\tEffect_command setting command for LVM_EQUALIZER"); + //ALOGV("\tEffect_command setting command for LVM_EQUALIZER"); } if(pContext->EffectType == LVM_VOLUME){ - //LOGV("\tEffect_command setting command for LVM_VOLUME"); + //ALOGV("\tEffect_command setting command for LVM_VOLUME"); } if (pContext == NULL){ - LOGV("\tLVM_ERROR : Effect_command ERROR pContext == NULL"); + ALOGV("\tLVM_ERROR : Effect_command ERROR pContext == NULL"); return -EINVAL; } - //LOGV("\tEffect_command INPUTS are: command %d cmdSize %d",cmdCode, cmdSize); + //ALOGV("\tEffect_command INPUTS are: command %d cmdSize %d",cmdCode, cmdSize); // Incase we disable an effect, next time process is // called the number of effect called could be greater // pContext->pBundledContext->NumberEffectsCalled = 0; - //LOGV("\tEffect_command NumberEffectsCalled = %d, NumberEffectsEnabled = %d", + //ALOGV("\tEffect_command NumberEffectsCalled = %d, NumberEffectsEnabled = %d", // pContext->pBundledContext->NumberEffectsCalled, // pContext->pBundledContext->NumberEffectsEnabled); switch (cmdCode){ case EFFECT_CMD_INIT: if (pReplyData == NULL || *replySize != sizeof(int)){ - LOGV("\tLVM_ERROR, EFFECT_CMD_INIT: ERROR for effect type %d", + ALOGV("\tLVM_ERROR, EFFECT_CMD_INIT: ERROR for effect type %d", pContext->EffectType); return -EINVAL; } *(int *) pReplyData = 0; - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT start"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT start"); if(pContext->EffectType == LVM_BASS_BOOST){ - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for LVM_BASS_BOOST"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for LVM_BASS_BOOST"); android::BassSetStrength(pContext, 0); } if(pContext->EffectType == LVM_VIRTUALIZER){ - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for LVM_VIRTUALIZER"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for LVM_VIRTUALIZER"); android::VirtualizerSetStrength(pContext, 0); } if(pContext->EffectType == LVM_EQUALIZER){ - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for LVM_EQUALIZER"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for LVM_EQUALIZER"); android::EqualizerSetPreset(pContext, 0); } if(pContext->EffectType == LVM_VOLUME){ - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for LVM_VOLUME"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_INIT for LVM_VOLUME"); *(int *) pReplyData = android::VolumeSetVolumeLevel(pContext, 0); } break; case EFFECT_CMD_CONFIGURE: - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_CONFIGURE start"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_CONFIGURE start"); if (pCmdData == NULL|| cmdSize != sizeof(effect_config_t)|| pReplyData == NULL|| *replySize != sizeof(int)){ - LOGV("\tLVM_ERROR : Effect_command cmdCode Case: " + ALOGV("\tLVM_ERROR : Effect_command cmdCode Case: " "EFFECT_CMD_CONFIGURE: ERROR"); return -EINVAL; } *(int *) pReplyData = android::Effect_configure(pContext, (effect_config_t *) pCmdData); - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_CONFIGURE end"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_CONFIGURE end"); break; case EFFECT_CMD_RESET: - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_RESET start"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_RESET start"); android::Effect_configure(pContext, &pContext->config); - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_RESET end"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_RESET end"); break; case EFFECT_CMD_GET_PARAM:{ - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_GET_PARAM start"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_GET_PARAM start"); if(pContext->EffectType == LVM_BASS_BOOST){ if (pCmdData == NULL || cmdSize < (int)(sizeof(effect_param_t) + sizeof(int32_t)) || pReplyData == NULL || *replySize < (int) (sizeof(effect_param_t) + sizeof(int32_t))){ - LOGV("\tLVM_ERROR : BassBoost_command cmdCode Case: " + ALOGV("\tLVM_ERROR : BassBoost_command cmdCode Case: " "EFFECT_CMD_GET_PARAM: ERROR"); return -EINVAL; } @@ -2808,7 +2808,7 @@ int Effect_command(effect_handle_t self, *replySize = sizeof(effect_param_t) + voffset + p->vsize; - //LOGV("\tBassBoost_command EFFECT_CMD_GET_PARAM " + //ALOGV("\tBassBoost_command EFFECT_CMD_GET_PARAM " // "*pCmdData %d, *replySize %d, *pReplyData %d ", // *(int32_t *)((char *)pCmdData + sizeof(effect_param_t)), // *replySize, @@ -2820,7 +2820,7 @@ int Effect_command(effect_handle_t self, cmdSize < (int)(sizeof(effect_param_t) + sizeof(int32_t)) || pReplyData == NULL || *replySize < (int) (sizeof(effect_param_t) + sizeof(int32_t))){ - LOGV("\tLVM_ERROR : Virtualizer_command cmdCode Case: " + ALOGV("\tLVM_ERROR : Virtualizer_command cmdCode Case: " "EFFECT_CMD_GET_PARAM: ERROR"); return -EINVAL; } @@ -2839,20 +2839,20 @@ int Effect_command(effect_handle_t self, *replySize = sizeof(effect_param_t) + voffset + p->vsize; - //LOGV("\tVirtualizer_command EFFECT_CMD_GET_PARAM " + //ALOGV("\tVirtualizer_command EFFECT_CMD_GET_PARAM " // "*pCmdData %d, *replySize %d, *pReplyData %d ", // *(int32_t *)((char *)pCmdData + sizeof(effect_param_t)), // *replySize, // *(int16_t *)((char *)pReplyData + sizeof(effect_param_t) + voffset)); } if(pContext->EffectType == LVM_EQUALIZER){ - //LOGV("\tEqualizer_command cmdCode Case: " + //ALOGV("\tEqualizer_command cmdCode Case: " // "EFFECT_CMD_GET_PARAM start"); if (pCmdData == NULL || cmdSize < (int)(sizeof(effect_param_t) + sizeof(int32_t)) || pReplyData == NULL || *replySize < (int) (sizeof(effect_param_t) + sizeof(int32_t))) { - LOGV("\tLVM_ERROR : Equalizer_command cmdCode Case: " + ALOGV("\tLVM_ERROR : Equalizer_command cmdCode Case: " "EFFECT_CMD_GET_PARAM"); return -EINVAL; } @@ -2871,7 +2871,7 @@ int Effect_command(effect_handle_t self, *replySize = sizeof(effect_param_t) + voffset + p->vsize; - //LOGV("\tEqualizer_command EFFECT_CMD_GET_PARAM *pCmdData %d, *replySize %d, " + //ALOGV("\tEqualizer_command EFFECT_CMD_GET_PARAM *pCmdData %d, *replySize %d, " // "*pReplyData %08x %08x", // *(int32_t *)((char *)pCmdData + sizeof(effect_param_t)), *replySize, // *(int32_t *)((char *)pReplyData + sizeof(effect_param_t) + voffset), @@ -2879,12 +2879,12 @@ int Effect_command(effect_handle_t self, // sizeof(int32_t))); } if(pContext->EffectType == LVM_VOLUME){ - //LOGV("\tVolume_command cmdCode Case: EFFECT_CMD_GET_PARAM start"); + //ALOGV("\tVolume_command cmdCode Case: EFFECT_CMD_GET_PARAM start"); if (pCmdData == NULL || cmdSize < (int)(sizeof(effect_param_t) + sizeof(int32_t)) || pReplyData == NULL || *replySize < (int) (sizeof(effect_param_t) + sizeof(int32_t))){ - LOGV("\tLVM_ERROR : Volume_command cmdCode Case: " + ALOGV("\tLVM_ERROR : Volume_command cmdCode Case: " "EFFECT_CMD_GET_PARAM: ERROR"); return -EINVAL; } @@ -2903,18 +2903,18 @@ int Effect_command(effect_handle_t self, *replySize = sizeof(effect_param_t) + voffset + p->vsize; - //LOGV("\tVolume_command EFFECT_CMD_GET_PARAM " + //ALOGV("\tVolume_command EFFECT_CMD_GET_PARAM " // "*pCmdData %d, *replySize %d, *pReplyData %d ", // *(int32_t *)((char *)pCmdData + sizeof(effect_param_t)), // *replySize, // *(int16_t *)((char *)pReplyData + sizeof(effect_param_t) + voffset)); } - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_GET_PARAM end"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_GET_PARAM end"); } break; case EFFECT_CMD_SET_PARAM:{ - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_SET_PARAM start"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_SET_PARAM start"); if(pContext->EffectType == LVM_BASS_BOOST){ - //LOGV("\tBassBoost_command EFFECT_CMD_SET_PARAM param %d, *replySize %d, value %d", + //ALOGV("\tBassBoost_command EFFECT_CMD_SET_PARAM param %d, *replySize %d, value %d", // *(int32_t *)((char *)pCmdData + sizeof(effect_param_t)), // *replySize, // *(int16_t *)((char *)pCmdData + sizeof(effect_param_t) + sizeof(int32_t))); @@ -2923,19 +2923,19 @@ int Effect_command(effect_handle_t self, cmdSize != (int)(sizeof(effect_param_t) + sizeof(int32_t) +sizeof(int16_t))|| pReplyData == NULL|| *replySize != sizeof(int32_t)){ - LOGV("\tLVM_ERROR : BassBoost_command cmdCode Case: " + ALOGV("\tLVM_ERROR : BassBoost_command cmdCode Case: " "EFFECT_CMD_SET_PARAM: ERROR"); return -EINVAL; } effect_param_t *p = (effect_param_t *) pCmdData; if (p->psize != sizeof(int32_t)){ - LOGV("\tLVM_ERROR : BassBoost_command cmdCode Case: " + ALOGV("\tLVM_ERROR : BassBoost_command cmdCode Case: " "EFFECT_CMD_SET_PARAM: ERROR, psize is not sizeof(int32_t)"); return -EINVAL; } - //LOGV("\tnBassBoost_command cmdSize is %d\n" + //ALOGV("\tnBassBoost_command cmdSize is %d\n" // "\tsizeof(effect_param_t) is %d\n" // "\tp->psize is %d\n" // "\tp->vsize is %d" @@ -2947,7 +2947,7 @@ int Effect_command(effect_handle_t self, p->data + p->psize); } if(pContext->EffectType == LVM_VIRTUALIZER){ - //LOGV("\tVirtualizer_command EFFECT_CMD_SET_PARAM param %d, *replySize %d, value %d", + //ALOGV("\tVirtualizer_command EFFECT_CMD_SET_PARAM param %d, *replySize %d, value %d", // *(int32_t *)((char *)pCmdData + sizeof(effect_param_t)), // *replySize, // *(int16_t *)((char *)pCmdData + sizeof(effect_param_t) + sizeof(int32_t))); @@ -2956,19 +2956,19 @@ int Effect_command(effect_handle_t self, cmdSize != (int)(sizeof(effect_param_t) + sizeof(int32_t) +sizeof(int16_t))|| pReplyData == NULL|| *replySize != sizeof(int32_t)){ - LOGV("\tLVM_ERROR : Virtualizer_command cmdCode Case: " + ALOGV("\tLVM_ERROR : Virtualizer_command cmdCode Case: " "EFFECT_CMD_SET_PARAM: ERROR"); return -EINVAL; } effect_param_t *p = (effect_param_t *) pCmdData; if (p->psize != sizeof(int32_t)){ - LOGV("\tLVM_ERROR : Virtualizer_command cmdCode Case: " + ALOGV("\tLVM_ERROR : Virtualizer_command cmdCode Case: " "EFFECT_CMD_SET_PARAM: ERROR, psize is not sizeof(int32_t)"); return -EINVAL; } - //LOGV("\tnVirtualizer_command cmdSize is %d\n" + //ALOGV("\tnVirtualizer_command cmdSize is %d\n" // "\tsizeof(effect_param_t) is %d\n" // "\tp->psize is %d\n" // "\tp->vsize is %d" @@ -2980,16 +2980,16 @@ int Effect_command(effect_handle_t self, p->data + p->psize); } if(pContext->EffectType == LVM_EQUALIZER){ - //LOGV("\tEqualizer_command cmdCode Case: " + //ALOGV("\tEqualizer_command cmdCode Case: " // "EFFECT_CMD_SET_PARAM start"); - //LOGV("\tEqualizer_command EFFECT_CMD_SET_PARAM param %d, *replySize %d, value %d ", + //ALOGV("\tEqualizer_command EFFECT_CMD_SET_PARAM param %d, *replySize %d, value %d ", // *(int32_t *)((char *)pCmdData + sizeof(effect_param_t)), // *replySize, // *(int16_t *)((char *)pCmdData + sizeof(effect_param_t) + sizeof(int32_t))); if (pCmdData == NULL || cmdSize < (int)(sizeof(effect_param_t) + sizeof(int32_t)) || pReplyData == NULL || *replySize != sizeof(int32_t)) { - LOGV("\tLVM_ERROR : Equalizer_command cmdCode Case: " + ALOGV("\tLVM_ERROR : Equalizer_command cmdCode Case: " "EFFECT_CMD_SET_PARAM: ERROR"); return -EINVAL; } @@ -3000,8 +3000,8 @@ int Effect_command(effect_handle_t self, p->data + p->psize); } if(pContext->EffectType == LVM_VOLUME){ - //LOGV("\tVolume_command cmdCode Case: EFFECT_CMD_SET_PARAM start"); - //LOGV("\tVolume_command EFFECT_CMD_SET_PARAM param %d, *replySize %d, value %d ", + //ALOGV("\tVolume_command cmdCode Case: EFFECT_CMD_SET_PARAM start"); + //ALOGV("\tVolume_command EFFECT_CMD_SET_PARAM param %d, *replySize %d, value %d ", // *(int32_t *)((char *)pCmdData + sizeof(effect_param_t)), // *replySize, // *(int16_t *)((char *)pCmdData + sizeof(effect_param_t) +sizeof(int32_t))); @@ -3010,7 +3010,7 @@ int Effect_command(effect_handle_t self, cmdSize < (int)(sizeof(effect_param_t) + sizeof(int32_t))|| pReplyData == NULL|| *replySize != sizeof(int32_t)){ - LOGV("\tLVM_ERROR : Volume_command cmdCode Case: " + ALOGV("\tLVM_ERROR : Volume_command cmdCode Case: " "EFFECT_CMD_SET_PARAM: ERROR"); return -EINVAL; } @@ -3020,13 +3020,13 @@ int Effect_command(effect_handle_t self, (void *)p->data, p->data + p->psize); } - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_SET_PARAM end"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_SET_PARAM end"); } break; case EFFECT_CMD_ENABLE: - LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_ENABLE start"); + ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_ENABLE start"); if (pReplyData == NULL || *replySize != sizeof(int)){ - LOGV("\tLVM_ERROR : Effect_command cmdCode Case: EFFECT_CMD_ENABLE: ERROR"); + ALOGV("\tLVM_ERROR : Effect_command cmdCode Case: EFFECT_CMD_ENABLE: ERROR"); return -EINVAL; } @@ -3034,9 +3034,9 @@ int Effect_command(effect_handle_t self, break; case EFFECT_CMD_DISABLE: - //LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_DISABLE start"); + //ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_DISABLE start"); if (pReplyData == NULL || *replySize != sizeof(int)){ - LOGV("\tLVM_ERROR : Effect_command cmdCode Case: EFFECT_CMD_DISABLE: ERROR"); + ALOGV("\tLVM_ERROR : Effect_command cmdCode Case: EFFECT_CMD_DISABLE: ERROR"); return -EINVAL; } *(int *)pReplyData = android::Effect_setEnabled(pContext, LVM_FALSE); @@ -3044,35 +3044,35 @@ int Effect_command(effect_handle_t self, case EFFECT_CMD_SET_DEVICE: { - LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_SET_DEVICE start"); + ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_SET_DEVICE start"); uint32_t device = *(uint32_t *)pCmdData; if(pContext->EffectType == LVM_BASS_BOOST){ if((device == AUDIO_DEVICE_OUT_SPEAKER)||(device == AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT)|| (device == AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER)){ - LOGV("\tEFFECT_CMD_SET_DEVICE device is invalid for LVM_BASS_BOOST %d", + ALOGV("\tEFFECT_CMD_SET_DEVICE device is invalid for LVM_BASS_BOOST %d", *(int32_t *)pCmdData); - LOGV("\tEFFECT_CMD_SET_DEVICE temporary disable LVM_BAS_BOOST"); + ALOGV("\tEFFECT_CMD_SET_DEVICE temporary disable LVM_BAS_BOOST"); // If a device doesnt support bassboost the effect must be temporarily disabled // the effect must still report its original state as this can only be changed // by the ENABLE/DISABLE command if(pContext->pBundledContext->bBassEnabled == LVM_TRUE){ - LOGV("\tEFFECT_CMD_SET_DEVICE disable LVM_BASS_BOOST %d", + ALOGV("\tEFFECT_CMD_SET_DEVICE disable LVM_BASS_BOOST %d", *(int32_t *)pCmdData); android::LvmEffect_disable(pContext); pContext->pBundledContext->bBassTempDisabled = LVM_TRUE; } }else{ - LOGV("\tEFFECT_CMD_SET_DEVICE device is valid for LVM_BASS_BOOST %d", + ALOGV("\tEFFECT_CMD_SET_DEVICE device is valid for LVM_BASS_BOOST %d", *(int32_t *)pCmdData); // If a device supports bassboost and the effect has been temporarily disabled // previously then re-enable it if(pContext->pBundledContext->bBassTempDisabled == LVM_TRUE){ - LOGV("\tEFFECT_CMD_SET_DEVICE re-enable LVM_BASS_BOOST %d", + ALOGV("\tEFFECT_CMD_SET_DEVICE re-enable LVM_BASS_BOOST %d", *(int32_t *)pCmdData); android::LvmEffect_enable(pContext); pContext->pBundledContext->bBassTempDisabled = LVM_FALSE; @@ -3082,36 +3082,36 @@ int Effect_command(effect_handle_t self, if(pContext->EffectType == LVM_VIRTUALIZER){ if((device == AUDIO_DEVICE_OUT_SPEAKER)||(device == AUDIO_DEVICE_OUT_BLUETOOTH_SCO_CARKIT)|| (device == AUDIO_DEVICE_OUT_BLUETOOTH_A2DP_SPEAKER)){ - LOGV("\tEFFECT_CMD_SET_DEVICE device is invalid for LVM_VIRTUALIZER %d", + ALOGV("\tEFFECT_CMD_SET_DEVICE device is invalid for LVM_VIRTUALIZER %d", *(int32_t *)pCmdData); - LOGV("\tEFFECT_CMD_SET_DEVICE temporary disable LVM_VIRTUALIZER"); + ALOGV("\tEFFECT_CMD_SET_DEVICE temporary disable LVM_VIRTUALIZER"); //If a device doesnt support virtualizer the effect must be temporarily disabled // the effect must still report its original state as this can only be changed // by the ENABLE/DISABLE command if(pContext->pBundledContext->bVirtualizerEnabled == LVM_TRUE){ - LOGV("\tEFFECT_CMD_SET_DEVICE disable LVM_VIRTUALIZER %d", + ALOGV("\tEFFECT_CMD_SET_DEVICE disable LVM_VIRTUALIZER %d", *(int32_t *)pCmdData); android::LvmEffect_disable(pContext); pContext->pBundledContext->bVirtualizerTempDisabled = LVM_TRUE; } }else{ - LOGV("\tEFFECT_CMD_SET_DEVICE device is valid for LVM_VIRTUALIZER %d", + ALOGV("\tEFFECT_CMD_SET_DEVICE device is valid for LVM_VIRTUALIZER %d", *(int32_t *)pCmdData); // If a device supports virtualizer and the effect has been temporarily disabled // previously then re-enable it if(pContext->pBundledContext->bVirtualizerTempDisabled == LVM_TRUE){ - LOGV("\tEFFECT_CMD_SET_DEVICE re-enable LVM_VIRTUALIZER %d", + ALOGV("\tEFFECT_CMD_SET_DEVICE re-enable LVM_VIRTUALIZER %d", *(int32_t *)pCmdData); android::LvmEffect_enable(pContext); pContext->pBundledContext->bVirtualizerTempDisabled = LVM_FALSE; } } } - LOGV("\tEffect_command cmdCode Case: EFFECT_CMD_SET_DEVICE end"); + ALOGV("\tEffect_command cmdCode Case: EFFECT_CMD_SET_DEVICE end"); break; } case EFFECT_CMD_SET_VOLUME: @@ -3131,7 +3131,7 @@ int Effect_command(effect_handle_t self, if (pCmdData == NULL || cmdSize != 2 * sizeof(uint32_t)) { - LOGV("\tLVM_ERROR : Effect_command cmdCode Case: " + ALOGV("\tLVM_ERROR : Effect_command cmdCode Case: " "EFFECT_CMD_SET_VOLUME: ERROR"); return -EINVAL; } @@ -3157,12 +3157,12 @@ int Effect_command(effect_handle_t self, if(rightdB > maxdB){ maxdB = rightdB; } - //LOGV("\tEFFECT_CMD_SET_VOLUME Session: %d, SessionID: %d VOLUME is %d dB (%d), " + //ALOGV("\tEFFECT_CMD_SET_VOLUME Session: %d, SessionID: %d VOLUME is %d dB (%d), " // "effect is %d", //pContext->pBundledContext->SessionNo, pContext->pBundledContext->SessionId, //(int32_t)maxdB, maxVol<<7, pContext->EffectType); - //LOGV("\tEFFECT_CMD_SET_VOLUME: Left is %d, Right is %d", leftVolume, rightVolume); - //LOGV("\tEFFECT_CMD_SET_VOLUME: Left %ddB, Right %ddB, Position %ddB", + //ALOGV("\tEFFECT_CMD_SET_VOLUME: Left is %d, Right is %d", leftVolume, rightVolume); + //ALOGV("\tEFFECT_CMD_SET_VOLUME: Left %ddB, Right %ddB, Position %ddB", // leftdB, rightdB, pandB); memcpy(pReplyData, vol_ret, sizeof(int32_t)*2); @@ -3175,7 +3175,7 @@ int Effect_command(effect_handle_t self, /* Volume parameters */ ActiveParams.VC_Balance = pandB; - LOGV("\t\tVolumeSetStereoPosition() (-96dB -> +96dB)-> %d\n", ActiveParams.VC_Balance ); + ALOGV("\t\tVolumeSetStereoPosition() (-96dB -> +96dB)-> %d\n", ActiveParams.VC_Balance ); /* Activate the initial settings */ LvmStatus =LVM_SetControlParameters(pContext->pBundledContext->hInstance,&ActiveParams); @@ -3189,7 +3189,7 @@ int Effect_command(effect_handle_t self, return -EINVAL; } - //LOGV("\tEffect_command end...\n\n"); + //ALOGV("\tEffect_command end...\n\n"); return 0; } /* end Effect_command */ @@ -3201,7 +3201,7 @@ int Effect_getDescriptor(effect_handle_t self, const effect_descriptor_t *desc; if (pContext == NULL || pDescriptor == NULL) { - LOGV("Effect_getDescriptor() invalid param"); + ALOGV("Effect_getDescriptor() invalid param"); return -EINVAL; } -- cgit v1.1