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

Commit b8a80526 authored by Steve Block's avatar Steve Block
Browse files

Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF) DO NOT MERGE 

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

Bug: 5449033
Change-Id: I4c4e33bb9df3e39e11cd985e193e6fbab4635298
parent 94023fa6

camera/Camera.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -178,7 +178,7 @@ status_t Camera::setPreviewDisplay(const sp<Surface>& surface) 
    if (surface != 0) {

    if (surface != 0) {

        return c->setPreviewDisplay(surface);

        return c->setPreviewDisplay(surface);

    } else {

    } else {

        LOGD("app passed NULL surface");

        ALOGD("app passed NULL surface");

        return c->setPreviewDisplay(0);

        return c->setPreviewDisplay(0);

    }

    }

}

}
@@ -192,7 +192,7 @@ status_t Camera::setPreviewTexture(const sp<ISurfaceTexture>& surfaceTexture) 
    if (surfaceTexture != 0) {

    if (surfaceTexture != 0) {

        return c->setPreviewTexture(surfaceTexture);

        return c->setPreviewTexture(surfaceTexture);

    } else {

    } else {

        LOGD("app passed NULL surface");

        ALOGD("app passed NULL surface");

        return c->setPreviewTexture(0);

        return c->setPreviewTexture(0);

    }

    }

}

}

camera/CameraParameters.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -449,12 +449,12 @@ const char *CameraParameters::getPictureFormat() const 




void CameraParameters::dump() const

void CameraParameters::dump() const

{

{

    LOGD("dump: mMap.size = %d", mMap.size());

    ALOGD("dump: mMap.size = %d", mMap.size());

    for (size_t i = 0; i < mMap.size(); i++) {

    for (size_t i = 0; i < mMap.size(); i++) {

        String8 k, v;

        String8 k, v;

        k = mMap.keyAt(i);

        k = mMap.keyAt(i);

        v = mMap.valueAt(i);

        v = mMap.valueAt(i);

        LOGD("%s: %s\n", k.string(), v.string());

        ALOGD("%s: %s\n", k.string(), v.string());

    }

    }

}

}

drm/libdrmframework/plugins/common/util/src/MimeTypeUtil.cpp

+1 −1
Original line number Original line Diff line number Diff line
@@ -24,7 +24,7 @@ namespace android { 




#ifdef DRM_OMA_FL_ENGINE_DEBUG

#ifdef DRM_OMA_FL_ENGINE_DEBUG

#define LOG_NDEBUG 0

#define LOG_NDEBUG 0

#define LOG_DEBUG(...) LOGD(__VA_ARGS__)

#define LOG_DEBUG(...) ALOGD(__VA_ARGS__)

#else

#else

#define LOG_DEBUG(...)

#define LOG_DEBUG(...)

#endif

#endif

drm/libdrmframework/plugins/passthru/src/DrmPassthruPlugIn.cpp

+27 −27
Original line number Original line Diff line number Diff line
@@ -58,7 +58,7 @@ DrmMetadata* DrmPassthruPlugIn::onGetMetadata(int uniqueId, const String8* path) 




DrmConstraints* DrmPassthruPlugIn::onGetConstraints(

DrmConstraints* DrmPassthruPlugIn::onGetConstraints(

        int uniqueId, const String8* path, int action) {

        int uniqueId, const String8* path, int action) {

    LOGD("DrmPassthruPlugIn::onGetConstraints From Path: %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onGetConstraints From Path: %d", uniqueId);

    DrmConstraints* drmConstraints = new DrmConstraints();

    DrmConstraints* drmConstraints = new DrmConstraints();





    String8 value("dummy_available_time");

    String8 value("dummy_available_time");
@@ -73,7 +73,7 @@ DrmConstraints* DrmPassthruPlugIn::onGetConstraints( 
}

}





DrmInfoStatus* DrmPassthruPlugIn::onProcessDrmInfo(int uniqueId, const DrmInfo* drmInfo) {

DrmInfoStatus* DrmPassthruPlugIn::onProcessDrmInfo(int uniqueId, const DrmInfo* drmInfo) {

    LOGD("DrmPassthruPlugIn::onProcessDrmInfo - Enter : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onProcessDrmInfo - Enter : %d", uniqueId);

    DrmInfoStatus* drmInfoStatus = NULL;

    DrmInfoStatus* drmInfoStatus = NULL;

    if (NULL != drmInfo) {

    if (NULL != drmInfo) {

        switch (drmInfo->getInfoType()) {

        switch (drmInfo->getInfoType()) {
@@ -102,28 +102,28 @@ DrmInfoStatus* DrmPassthruPlugIn::onProcessDrmInfo(int uniqueId, const DrmInfo* 
        }

        }

        }

        }

    }

    }

    LOGD("DrmPassthruPlugIn::onProcessDrmInfo - Exit");

    ALOGD("DrmPassthruPlugIn::onProcessDrmInfo - Exit");

    return drmInfoStatus;

    return drmInfoStatus;

}

}





status_t DrmPassthruPlugIn::onSetOnInfoListener(

status_t DrmPassthruPlugIn::onSetOnInfoListener(

            int uniqueId, const IDrmEngine::OnInfoListener* infoListener) {

            int uniqueId, const IDrmEngine::OnInfoListener* infoListener) {

    LOGD("DrmPassthruPlugIn::onSetOnInfoListener : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onSetOnInfoListener : %d", uniqueId);

    return DRM_NO_ERROR;

    return DRM_NO_ERROR;

}

}





status_t DrmPassthruPlugIn::onInitialize(int uniqueId) {

status_t DrmPassthruPlugIn::onInitialize(int uniqueId) {

    LOGD("DrmPassthruPlugIn::onInitialize : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onInitialize : %d", uniqueId);

    return DRM_NO_ERROR;

    return DRM_NO_ERROR;

}

}





status_t DrmPassthruPlugIn::onTerminate(int uniqueId) {

status_t DrmPassthruPlugIn::onTerminate(int uniqueId) {

    LOGD("DrmPassthruPlugIn::onTerminate : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onTerminate : %d", uniqueId);

    return DRM_NO_ERROR;

    return DRM_NO_ERROR;

}

}





DrmSupportInfo* DrmPassthruPlugIn::onGetSupportInfo(int uniqueId) {

DrmSupportInfo* DrmPassthruPlugIn::onGetSupportInfo(int uniqueId) {

    LOGD("DrmPassthruPlugIn::onGetSupportInfo : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onGetSupportInfo : %d", uniqueId);

    DrmSupportInfo* drmSupportInfo = new DrmSupportInfo();

    DrmSupportInfo* drmSupportInfo = new DrmSupportInfo();

    // Add mimetype's

    // Add mimetype's

    drmSupportInfo->addMimeType(String8("application/vnd.passthru.drm"));

    drmSupportInfo->addMimeType(String8("application/vnd.passthru.drm"));
@@ -136,12 +136,12 @@ DrmSupportInfo* DrmPassthruPlugIn::onGetSupportInfo(int uniqueId) { 




status_t DrmPassthruPlugIn::onSaveRights(int uniqueId, const DrmRights& drmRights,

status_t DrmPassthruPlugIn::onSaveRights(int uniqueId, const DrmRights& drmRights,

            const String8& rightsPath, const String8& contentPath) {

            const String8& rightsPath, const String8& contentPath) {

    LOGD("DrmPassthruPlugIn::onSaveRights : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onSaveRights : %d", uniqueId);

    return DRM_NO_ERROR;

    return DRM_NO_ERROR;

}

}





DrmInfo* DrmPassthruPlugIn::onAcquireDrmInfo(int uniqueId, const DrmInfoRequest* drmInfoRequest) {

DrmInfo* DrmPassthruPlugIn::onAcquireDrmInfo(int uniqueId, const DrmInfoRequest* drmInfoRequest) {

    LOGD("DrmPassthruPlugIn::onAcquireDrmInfo : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onAcquireDrmInfo : %d", uniqueId);

    DrmInfo* drmInfo = NULL;

    DrmInfo* drmInfo = NULL;





    if (NULL != drmInfoRequest) {

    if (NULL != drmInfoRequest) {
@@ -157,65 +157,65 @@ DrmInfo* DrmPassthruPlugIn::onAcquireDrmInfo(int uniqueId, const DrmInfoRequest* 
}

}





bool DrmPassthruPlugIn::onCanHandle(int uniqueId, const String8& path) {

bool DrmPassthruPlugIn::onCanHandle(int uniqueId, const String8& path) {

    LOGD("DrmPassthruPlugIn::canHandle: %s ", path.string());

    ALOGD("DrmPassthruPlugIn::canHandle: %s ", path.string());

    String8 extension = path.getPathExtension();

    String8 extension = path.getPathExtension();

    extension.toLower();

    extension.toLower();

    return (String8(".passthru") == extension);

    return (String8(".passthru") == extension);

}

}





String8 DrmPassthruPlugIn::onGetOriginalMimeType(int uniqueId, const String8& path) {

String8 DrmPassthruPlugIn::onGetOriginalMimeType(int uniqueId, const String8& path) {

    LOGD("DrmPassthruPlugIn::onGetOriginalMimeType() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onGetOriginalMimeType() : %d", uniqueId);

    return String8("video/passthru");

    return String8("video/passthru");

}

}





int DrmPassthruPlugIn::onGetDrmObjectType(

int DrmPassthruPlugIn::onGetDrmObjectType(

            int uniqueId, const String8& path, const String8& mimeType) {

            int uniqueId, const String8& path, const String8& mimeType) {

    LOGD("DrmPassthruPlugIn::onGetDrmObjectType() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onGetDrmObjectType() : %d", uniqueId);

    return DrmObjectType::UNKNOWN;

    return DrmObjectType::UNKNOWN;

}

}





int DrmPassthruPlugIn::onCheckRightsStatus(int uniqueId, const String8& path, int action) {

int DrmPassthruPlugIn::onCheckRightsStatus(int uniqueId, const String8& path, int action) {

    LOGD("DrmPassthruPlugIn::onCheckRightsStatus() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onCheckRightsStatus() : %d", uniqueId);

    int rightsStatus = RightsStatus::RIGHTS_VALID;

    int rightsStatus = RightsStatus::RIGHTS_VALID;

    return rightsStatus;

    return rightsStatus;

}

}





status_t DrmPassthruPlugIn::onConsumeRights(int uniqueId, DecryptHandle* decryptHandle,

status_t DrmPassthruPlugIn::onConsumeRights(int uniqueId, DecryptHandle* decryptHandle,

            int action, bool reserve) {

            int action, bool reserve) {

    LOGD("DrmPassthruPlugIn::onConsumeRights() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onConsumeRights() : %d", uniqueId);

    return DRM_NO_ERROR;

    return DRM_NO_ERROR;

}

}





status_t DrmPassthruPlugIn::onSetPlaybackStatus(int uniqueId, DecryptHandle* decryptHandle,

status_t DrmPassthruPlugIn::onSetPlaybackStatus(int uniqueId, DecryptHandle* decryptHandle,

            int playbackStatus, int64_t position) {

            int playbackStatus, int64_t position) {

    LOGD("DrmPassthruPlugIn::onSetPlaybackStatus() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onSetPlaybackStatus() : %d", uniqueId);

    return DRM_NO_ERROR;

    return DRM_NO_ERROR;

}

}





bool DrmPassthruPlugIn::onValidateAction(int uniqueId, const String8& path,

bool DrmPassthruPlugIn::onValidateAction(int uniqueId, const String8& path,

            int action, const ActionDescription& description) {

            int action, const ActionDescription& description) {

    LOGD("DrmPassthruPlugIn::onValidateAction() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onValidateAction() : %d", uniqueId);

    return true;

    return true;

}

}





status_t DrmPassthruPlugIn::onRemoveRights(int uniqueId, const String8& path) {

status_t DrmPassthruPlugIn::onRemoveRights(int uniqueId, const String8& path) {

    LOGD("DrmPassthruPlugIn::onRemoveRights() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onRemoveRights() : %d", uniqueId);

    return DRM_NO_ERROR;

    return DRM_NO_ERROR;

}

}





status_t DrmPassthruPlugIn::onRemoveAllRights(int uniqueId) {

status_t DrmPassthruPlugIn::onRemoveAllRights(int uniqueId) {

    LOGD("DrmPassthruPlugIn::onRemoveAllRights() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onRemoveAllRights() : %d", uniqueId);

    return DRM_NO_ERROR;

    return DRM_NO_ERROR;

}

}





status_t DrmPassthruPlugIn::onOpenConvertSession(int uniqueId, int convertId) {

status_t DrmPassthruPlugIn::onOpenConvertSession(int uniqueId, int convertId) {

    LOGD("DrmPassthruPlugIn::onOpenConvertSession() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onOpenConvertSession() : %d", uniqueId);

    return DRM_NO_ERROR;

    return DRM_NO_ERROR;

}

}





DrmConvertedStatus* DrmPassthruPlugIn::onConvertData(

DrmConvertedStatus* DrmPassthruPlugIn::onConvertData(

            int uniqueId, int convertId, const DrmBuffer* inputData) {

            int uniqueId, int convertId, const DrmBuffer* inputData) {

    LOGD("DrmPassthruPlugIn::onConvertData() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onConvertData() : %d", uniqueId);

    DrmBuffer* convertedData = NULL;

    DrmBuffer* convertedData = NULL;





    if (NULL != inputData && 0 < inputData->length) {

    if (NULL != inputData && 0 < inputData->length) {
@@ -229,13 +229,13 @@ DrmConvertedStatus* DrmPassthruPlugIn::onConvertData( 
}

}





DrmConvertedStatus* DrmPassthruPlugIn::onCloseConvertSession(int uniqueId, int convertId) {

DrmConvertedStatus* DrmPassthruPlugIn::onCloseConvertSession(int uniqueId, int convertId) {

    LOGD("DrmPassthruPlugIn::onCloseConvertSession() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onCloseConvertSession() : %d", uniqueId);

    return new DrmConvertedStatus(DrmConvertedStatus::STATUS_OK, NULL, 0 /*offset*/);

    return new DrmConvertedStatus(DrmConvertedStatus::STATUS_OK, NULL, 0 /*offset*/);

}

}





status_t DrmPassthruPlugIn::onOpenDecryptSession(

status_t DrmPassthruPlugIn::onOpenDecryptSession(

            int uniqueId, DecryptHandle* decryptHandle, int fd, off64_t offset, off64_t length) {

            int uniqueId, DecryptHandle* decryptHandle, int fd, off64_t offset, off64_t length) {

    LOGD("DrmPassthruPlugIn::onOpenDecryptSession() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onOpenDecryptSession() : %d", uniqueId);





#ifdef ENABLE_PASSTHRU_DECRYPTION

#ifdef ENABLE_PASSTHRU_DECRYPTION

    decryptHandle->mimeType = String8("video/passthru");

    decryptHandle->mimeType = String8("video/passthru");
@@ -254,7 +254,7 @@ status_t DrmPassthruPlugIn::onOpenDecryptSession( 
}

}





status_t DrmPassthruPlugIn::onCloseDecryptSession(int uniqueId, DecryptHandle* decryptHandle) {

status_t DrmPassthruPlugIn::onCloseDecryptSession(int uniqueId, DecryptHandle* decryptHandle) {

    LOGD("DrmPassthruPlugIn::onCloseDecryptSession() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onCloseDecryptSession() : %d", uniqueId);

    if (NULL != decryptHandle) {

    if (NULL != decryptHandle) {

        if (NULL != decryptHandle->decryptInfo) {

        if (NULL != decryptHandle->decryptInfo) {

            delete decryptHandle->decryptInfo; decryptHandle->decryptInfo = NULL;

            delete decryptHandle->decryptInfo; decryptHandle->decryptInfo = NULL;
@@ -266,13 +266,13 @@ status_t DrmPassthruPlugIn::onCloseDecryptSession(int uniqueId, DecryptHandle* d 




status_t DrmPassthruPlugIn::onInitializeDecryptUnit(int uniqueId, DecryptHandle* decryptHandle,

status_t DrmPassthruPlugIn::onInitializeDecryptUnit(int uniqueId, DecryptHandle* decryptHandle,

            int decryptUnitId, const DrmBuffer* headerInfo) {

            int decryptUnitId, const DrmBuffer* headerInfo) {

    LOGD("DrmPassthruPlugIn::onInitializeDecryptUnit() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onInitializeDecryptUnit() : %d", uniqueId);

    return DRM_NO_ERROR;

    return DRM_NO_ERROR;

}

}





status_t DrmPassthruPlugIn::onDecrypt(int uniqueId, DecryptHandle* decryptHandle,

status_t DrmPassthruPlugIn::onDecrypt(int uniqueId, DecryptHandle* decryptHandle,

            int decryptUnitId, const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV) {

            int decryptUnitId, const DrmBuffer* encBuffer, DrmBuffer** decBuffer, DrmBuffer* IV) {

    LOGD("DrmPassthruPlugIn::onDecrypt() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onDecrypt() : %d", uniqueId);

    /**

    /**

     * As a workaround implementation passthru would copy the given

     * As a workaround implementation passthru would copy the given

     * encrypted buffer as it is to decrypted buffer. Note, decBuffer

     * encrypted buffer as it is to decrypted buffer. Note, decBuffer
@@ -287,13 +287,13 @@ status_t DrmPassthruPlugIn::onDecrypt(int uniqueId, DecryptHandle* decryptHandle 




status_t DrmPassthruPlugIn::onFinalizeDecryptUnit(

status_t DrmPassthruPlugIn::onFinalizeDecryptUnit(

            int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId) {

            int uniqueId, DecryptHandle* decryptHandle, int decryptUnitId) {

    LOGD("DrmPassthruPlugIn::onFinalizeDecryptUnit() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onFinalizeDecryptUnit() : %d", uniqueId);

    return DRM_NO_ERROR;

    return DRM_NO_ERROR;

}

}





ssize_t DrmPassthruPlugIn::onPread(int uniqueId, DecryptHandle* decryptHandle,

ssize_t DrmPassthruPlugIn::onPread(int uniqueId, DecryptHandle* decryptHandle,

            void* buffer, ssize_t numBytes, off64_t offset) {

            void* buffer, ssize_t numBytes, off64_t offset) {

    LOGD("DrmPassthruPlugIn::onPread() : %d", uniqueId);

    ALOGD("DrmPassthruPlugIn::onPread() : %d", uniqueId);

    return 0;

    return 0;

}

}

media/libmedia/AudioSystem.cpp

+2 −2
Original line number Original line Diff line number Diff line
@@ -190,7 +190,7 @@ static const float dBConvertInverse = 1.0f / dBConvert; 
float AudioSystem::linearToLog(int volume)

float AudioSystem::linearToLog(int volume)

{

{

    // float v = volume ? exp(float(100 - volume) * dBConvert) : 0;

    // float v = volume ? exp(float(100 - volume) * dBConvert) : 0;

    // LOGD("linearToLog(%d)=%f", volume, v);

    // ALOGD("linearToLog(%d)=%f", volume, v);

    // return v;

    // return v;

    return volume ? exp(float(100 - volume) * dBConvert) : 0;

    return volume ? exp(float(100 - volume) * dBConvert) : 0;

}

}
@@ -198,7 +198,7 @@ float AudioSystem::linearToLog(int volume) 
int AudioSystem::logToLinear(float volume)

int AudioSystem::logToLinear(float volume)

{

{

    // int v = volume ? 100 - int(dBConvertInverse * log(volume) + 0.5) : 0;

    // int v = volume ? 100 - int(dBConvertInverse * log(volume) + 0.5) : 0;

    // LOGD("logTolinear(%d)=%f", v, volume);

    // ALOGD("logTolinear(%d)=%f", v, volume);

    // return v;

    // return v;

    return volume ? 100 - int(dBConvertInverse * log(volume) + 0.5) : 0;

    return volume ? 100 - int(dBConvertInverse * log(volume) + 0.5) : 0;

}

}