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

Commit 5ff1dd57 authored by Steve Block's avatar Steve Block
Browse files

Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF) DO NOT MERGE 

See https://android-git.corp.google.com/g/157065

Bug: 5449033
Change-Id: I00a4b904f9449e6f93b7fd35eac28640d7929e69
parent 8a08dcc0

camera/Camera.cpp

+4 −4
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ const sp<ICameraService>& Camera::getCameraService() 
            binder = sm->getService(String16("media.camera"));

            if (binder != 0)

                break;

            LOGW("CameraService not published, waiting...");

            ALOGW("CameraService not published, waiting...");

            usleep(500000); // 0.5 s

        } while(true);

        if (mDeathNotifier == NULL) {
@@ -397,13 +397,13 @@ void Camera::dataCallbackTimestamp(nsecs_t timestamp, int32_t msgType, const sp< 
    if (listener != NULL) {

        listener->postDataTimestamp(timestamp, msgType, dataPtr);

    } else {

        LOGW("No listener was set. Drop a recording frame.");

        ALOGW("No listener was set. Drop a recording frame.");

        releaseRecordingFrame(dataPtr);

    }

}



void Camera::binderDied(const wp<IBinder>& who) {

    LOGW("ICamera died");

    ALOGW("ICamera died");

    notifyCallback(CAMERA_MSG_ERROR, CAMERA_ERROR_SERVER_DIED, 0);

}
@@ -411,7 +411,7 @@ void Camera::DeathNotifier::binderDied(const wp<IBinder>& who) { 
    ALOGV("binderDied");

    Mutex::Autolock _l(Camera::mLock);

    Camera::mCameraService.clear();

    LOGW("Camera server died!");

    ALOGW("Camera server died!");

}



sp<ICameraRecordingProxy> Camera::getRecordingProxy() {

drm/libdrmframework/DrmManagerClientImpl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -54,7 +54,7 @@ const sp<IDrmManagerService>& DrmManagerClientImpl::getDrmManagerService() { 
            if (binder != 0) {

                break;

            }

            LOGW("DrmManagerService not published, waiting...");

            ALOGW("DrmManagerService not published, waiting...");

            struct timespec reqt;

            reqt.tv_sec  = 0;

            reqt.tv_nsec = 500000000; //0.5 sec
@@ -342,6 +342,6 @@ DrmManagerClientImpl::DeathNotifier::~DeathNotifier() { 
void DrmManagerClientImpl::DeathNotifier::binderDied(const wp<IBinder>& who) {

    Mutex::Autolock lock(sMutex);

    DrmManagerClientImpl::sDrmManagerService.clear();

    LOGW("DrmManager server died!");

    ALOGW("DrmManager server died!");

}

media/libeffects/factory/EffectsFactory.c

+11 −11
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ int EffectCreate(effect_uuid_t *uuid, int32_t sessionId, int32_t ioId, effect_ha 
    ret = init();



    if (ret < 0) {

        LOGW("EffectCreate() init error: %d", ret);

        ALOGW("EffectCreate() init error: %d", ret);

        return ret;

    }
@@ -293,7 +293,7 @@ int EffectCreate(effect_uuid_t *uuid, int32_t sessionId, int32_t ioId, effect_ha 
    // create effect in library

    ret = l->desc->create_effect(uuid, sessionId, ioId, &itfe);

    if (ret != 0) {

        LOGW("EffectCreate() library %s: could not create fx %s, error %d", l->name, d->name, ret);

        ALOGW("EffectCreate() library %s: could not create fx %s, error %d", l->name, d->name, ret);

        goto exit;

    }
@@ -359,7 +359,7 @@ int EffectRelease(effect_handle_t handle) 


    // release effect in library

    if (fx->lib == NULL) {

        LOGW("EffectRelease() fx %p library already unloaded", handle);

        ALOGW("EffectRelease() fx %p library already unloaded", handle);

    } else {

        pthread_mutex_lock(&fx->lib->lock);

        fx->lib->desc->release_effect(fx->subItfe);
@@ -456,24 +456,24 @@ int loadLibrary(cnode *root, const char *name) 


    hdl = dlopen(node->value, RTLD_NOW);

    if (hdl == NULL) {

        LOGW("loadLibrary() failed to open %s", node->value);

        ALOGW("loadLibrary() failed to open %s", node->value);

        goto error;

    }



    desc = (audio_effect_library_t *)dlsym(hdl, AUDIO_EFFECT_LIBRARY_INFO_SYM_AS_STR);

    if (desc == NULL) {

        LOGW("loadLibrary() could not find symbol %s", AUDIO_EFFECT_LIBRARY_INFO_SYM_AS_STR);

        ALOGW("loadLibrary() could not find symbol %s", AUDIO_EFFECT_LIBRARY_INFO_SYM_AS_STR);

        goto error;

    }



    if (AUDIO_EFFECT_LIBRARY_TAG != desc->tag) {

        LOGW("getLibrary() bad tag %08x in lib info struct", desc->tag);

        ALOGW("getLibrary() bad tag %08x in lib info struct", desc->tag);

        goto error;

    }



    if (EFFECT_API_VERSION_MAJOR(desc->version) !=

            EFFECT_API_VERSION_MAJOR(EFFECT_LIBRARY_API_VERSION)) {

        LOGW("loadLibrary() bad lib version %08x", desc->version);

        ALOGW("loadLibrary() bad lib version %08x", desc->version);

        goto error;

    }
@@ -534,7 +534,7 @@ int loadEffect(cnode *root) 


    l = getLibrary(node->value);

    if (l == NULL) {

        LOGW("loadEffect() could not get library %s", node->value);

        ALOGW("loadEffect() could not get library %s", node->value);

        return -EINVAL;

    }
@@ -543,7 +543,7 @@ int loadEffect(cnode *root) 
        return -EINVAL;

    }

    if (stringToUuid(node->value, &uuid) != 0) {

        LOGW("loadEffect() invalid uuid %s", node->value);

        ALOGW("loadEffect() invalid uuid %s", node->value);

        return -EINVAL;

    }
@@ -551,7 +551,7 @@ int loadEffect(cnode *root) 
    if (l->desc->get_descriptor(&uuid, d) != 0) {

        char s[40];

        uuidToString(&uuid, s, 40);

        LOGW("Error querying effect %s on lib %s", s, l->name);

        ALOGW("Error querying effect %s on lib %s", s, l->name);

        free(d);

        return -EINVAL;

    }
@@ -562,7 +562,7 @@ int loadEffect(cnode *root) 
#endif

    if (EFFECT_API_VERSION_MAJOR(d->apiVersion) !=

            EFFECT_API_VERSION_MAJOR(EFFECT_CONTROL_API_VERSION)) {

        LOGW("Bad API version %08x on lib %s", d->apiVersion, l->name);

        ALOGW("Bad API version %08x on lib %s", d->apiVersion, l->name);

        free(d);

        return -EINVAL;

    }

media/libeffects/preprocessing/PreProcessing.cpp

+20 −20
Original line number Diff line number Diff line
@@ -240,7 +240,7 @@ int AgcCreate(preproc_effect_t *effect) 
    webrtc::GainControl *agc = effect->session->apm->gain_control();

    ALOGV("AgcCreate got agc %p", agc);

    if (agc == NULL) {

        LOGW("AgcCreate Error");

        ALOGW("AgcCreate Error");

        return -ENOMEM;

    }

    effect->engine = static_cast<preproc_fx_handle_t>(agc);
@@ -280,7 +280,7 @@ int AgcGetParameter(preproc_effect_t *effect, 
        break;



    default:

        LOGW("AgcGetParameter() unknown param %08x", param);

        ALOGW("AgcGetParameter() unknown param %08x", param);

        status = -EINVAL;

        break;

    }
@@ -305,7 +305,7 @@ int AgcGetParameter(preproc_effect_t *effect, 
        pProperties->limiterEnabled = (bool)agc->is_limiter_enabled();

        break;

    default:

        LOGW("AgcGetParameter() unknown param %d", param);

        ALOGW("AgcGetParameter() unknown param %d", param);

        status = -EINVAL;

        break;

    }
@@ -344,7 +344,7 @@ int AgcSetParameter (preproc_effect_t *effect, void *pParam, void *pValue) 
        status = agc->enable_limiter(pProperties->limiterEnabled);

        break;

    default:

        LOGW("AgcSetParameter() unknown param %08x value %08x", param, *(uint32_t *)pValue);

        ALOGW("AgcSetParameter() unknown param %08x value %08x", param, *(uint32_t *)pValue);

        status = -EINVAL;

        break;

    }
@@ -403,7 +403,7 @@ int AecCreate(preproc_effect_t *effect) 
    webrtc::EchoControlMobile *aec = effect->session->apm->echo_control_mobile();

    ALOGV("AecCreate got aec %p", aec);

    if (aec == NULL) {

        LOGW("AgcCreate Error");

        ALOGW("AgcCreate Error");

        return -ENOMEM;

    }

    effect->engine = static_cast<preproc_fx_handle_t>(aec);
@@ -429,7 +429,7 @@ int AecGetParameter(preproc_effect_t *effect, 
        ALOGV("AecGetParameter() echo delay %d us", *(uint32_t *)pValue);

        break;

    default:

        LOGW("AecGetParameter() unknown param %08x value %08x", param, *(uint32_t *)pValue);

        ALOGW("AecGetParameter() unknown param %08x value %08x", param, *(uint32_t *)pValue);

        status = -EINVAL;

        break;

    }
@@ -449,7 +449,7 @@ int AecSetParameter (preproc_effect_t *effect, void *pParam, void *pValue) 
        ALOGV("AecSetParameter() echo delay %d us, status %d", value, status);

        break;

    default:

        LOGW("AecSetParameter() unknown param %08x value %08x", param, *(uint32_t *)pValue);

        ALOGW("AecSetParameter() unknown param %08x value %08x", param, *(uint32_t *)pValue);

        status = -EINVAL;

        break;

    }
@@ -522,7 +522,7 @@ int NsCreate(preproc_effect_t *effect) 
    webrtc::NoiseSuppression *ns = effect->session->apm->noise_suppression();

    ALOGV("NsCreate got ns %p", ns);

    if (ns == NULL) {

        LOGW("AgcCreate Error");

        ALOGW("AgcCreate Error");

        return -ENOMEM;

    }

    effect->engine = static_cast<preproc_fx_handle_t>(ns);
@@ -730,7 +730,7 @@ extern "C" int Session_CreateEffect(preproc_session_t *session, 
    if (session->createdMsk == 0) {

        session->apm = webrtc::AudioProcessing::Create(session->io);

        if (session->apm == NULL) {

            LOGW("Session_CreateEffect could not get apm engine");

            ALOGW("Session_CreateEffect could not get apm engine");

            goto error;

        }

        session->apm->set_sample_rate_hz(kPreprocDefaultSr);
@@ -738,12 +738,12 @@ extern "C" int Session_CreateEffect(preproc_session_t *session, 
        session->apm->set_num_reverse_channels(kPreProcDefaultCnl);

        session->procFrame = new webrtc::AudioFrame();

        if (session->procFrame == NULL) {

            LOGW("Session_CreateEffect could not allocate audio frame");

            ALOGW("Session_CreateEffect could not allocate audio frame");

            goto error;

        }

        session->revFrame = new webrtc::AudioFrame();

        if (session->revFrame == NULL) {

            LOGW("Session_CreateEffect could not allocate reverse audio frame");

            ALOGW("Session_CreateEffect could not allocate reverse audio frame");

            goto error;

        }

        session->apmSamplingRate = kPreprocDefaultSr;
@@ -794,7 +794,7 @@ error: 
int Session_ReleaseEffect(preproc_session_t *session,

                          preproc_effect_t *fx)

{

    LOGW_IF(Effect_Release(fx) != 0, " Effect_Release() failed for proc ID %d", fx->procId);

    ALOGW_IF(Effect_Release(fx) != 0, " Effect_Release() failed for proc ID %d", fx->procId);

    session->createdMsk &= ~(1<<fx->procId);

    if (session->createdMsk == 0) {

        webrtc::AudioProcessing::Destroy(session->apm);
@@ -904,7 +904,7 @@ int Session_SetConfig(preproc_session_t *session, effect_config_t *config) 
                                                    RESAMPLER_QUALITY,

                                                    &error);

        if (session->inResampler == NULL) {

            LOGW("Session_SetConfig Cannot create speex resampler: %s",

            ALOGW("Session_SetConfig Cannot create speex resampler: %s",

                 speex_resampler_strerror(error));

            return -EINVAL;

        }
@@ -914,7 +914,7 @@ int Session_SetConfig(preproc_session_t *session, effect_config_t *config) 
                                                    RESAMPLER_QUALITY,

                                                    &error);

        if (session->outResampler == NULL) {

            LOGW("Session_SetConfig Cannot create speex resampler: %s",

            ALOGW("Session_SetConfig Cannot create speex resampler: %s",

                 speex_resampler_strerror(error));

            speex_resampler_destroy(session->inResampler);

            session->inResampler = NULL;
@@ -926,7 +926,7 @@ int Session_SetConfig(preproc_session_t *session, effect_config_t *config) 
                                                    RESAMPLER_QUALITY,

                                                    &error);

        if (session->revResampler == NULL) {

            LOGW("Session_SetConfig Cannot create speex resampler: %s",

            ALOGW("Session_SetConfig Cannot create speex resampler: %s",

                 speex_resampler_strerror(error));

            speex_resampler_destroy(session->inResampler);

            session->inResampler = NULL;
@@ -1105,7 +1105,7 @@ int PreProcessingFx_Process(effect_handle_t self, 


    if (inBuffer == NULL  || inBuffer->raw == NULL  ||

            outBuffer == NULL || outBuffer->raw == NULL){

        LOGW("PreProcessingFx_Process() ERROR bad pointer");

        ALOGW("PreProcessingFx_Process() ERROR bad pointer");

        return -EINVAL;

    }
@@ -1443,13 +1443,13 @@ int PreProcessingFx_ProcessReverse(effect_handle_t self, 
    int    status = 0;



    if (effect == NULL){

        LOGW("PreProcessingFx_ProcessReverse() ERROR effect == NULL");

        ALOGW("PreProcessingFx_ProcessReverse() ERROR effect == NULL");

        return -EINVAL;

    }

    preproc_session_t * session = (preproc_session_t *)effect->session;



    if (inBuffer == NULL  || inBuffer->raw == NULL){

        LOGW("PreProcessingFx_ProcessReverse() ERROR bad pointer");

        ALOGW("PreProcessingFx_ProcessReverse() ERROR bad pointer");

        return -EINVAL;

    }
@@ -1585,14 +1585,14 @@ int PreProcessingLib_Create(effect_uuid_t *uuid, 
    }

    desc =  PreProc_GetDescriptor(uuid);

    if (desc == NULL) {

        LOGW("EffectCreate: fx not found uuid: %08x", uuid->timeLow);

        ALOGW("EffectCreate: fx not found uuid: %08x", uuid->timeLow);

        return -EINVAL;

    }

    procId = UuidToProcId(&desc->type);



    session = PreProc_GetSession(procId, sessionId, ioId);

    if (session == NULL) {

        LOGW("EffectCreate: no more session available");

        ALOGW("EffectCreate: no more session available");

        return -EINVAL;

    }

media/libeffects/testlibs/EffectEqualizer.cpp

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ extern "C" int EffectCreate(effect_uuid_t *uuid, 


    ret = Equalizer_init(pContext);

    if (ret < 0) {

        LOGW("EffectLibCreateEffect() init failed");

        ALOGW("EffectLibCreateEffect() init failed");

        delete pContext;

        return ret;

    }
@@ -735,7 +735,7 @@ extern "C" int Equalizer_command(effect_handle_t self, uint32_t cmdCode, uint32_ 
    case EFFECT_CMD_SET_AUDIO_MODE:

        break;

    default:

        LOGW("Equalizer_command invalid command %d",cmdCode);

        ALOGW("Equalizer_command invalid command %d",cmdCode);

        return -EINVAL;

    }