diff --git a/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp b/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp index a0226d26..09c146e6 100644 --- a/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp +++ b/proprietary/drmwvmplugin/src/WVMDrmPlugin.cpp @@ -249,7 +249,7 @@ DrmInfo* WVMDrmPlugin::onAcquireDrmInfo(int uniqueId, const DrmInfoRequest* drmI // creates a data store object per each portal credentials.portal = drmInfoRequest->get(String8("WVPortalKey")).string(); if ( (assetPath.size() == 0) || (credentials.portal.size() == 0) ) { - LOGE("onAcquireDrmInfo: Empty asset path or portal string, must specify both"); + ALOGE("onAcquireDrmInfo: Empty asset path or portal string, must specify both"); return NULL; } @@ -309,18 +309,18 @@ DrmInfo* WVMDrmPlugin::onAcquireDrmInfo(int uniqueId, const DrmInfoRequest* drmI std::string portal = drmInfoRequest->get(String8("WVPortalKey")).string(); if (portal.size() == 0) { - LOGE("onAcquireDrmInfo: Must specify portal string for registration operations"); + ALOGE("onAcquireDrmInfo: Must specify portal string for registration operations"); return NULL; } if (drmInfoRequest->getInfoType()==DrmInfoRequest::TYPE_REGISTRATION_INFO) { if (!mDrmPluginImpl->RegisterDrmInfo(portal, assetDbPath)) { - LOGE("onAcquireDrmInfo: RegisterDrmInfo failed"); + ALOGE("onAcquireDrmInfo: RegisterDrmInfo failed"); return NULL; } } else { if (!mDrmPluginImpl->UnregisterDrmInfo(portal, assetDbPath)) { - LOGE("onAcquireDrmInfo: UnregisterDrmInfo failed"); + ALOGE("onAcquireDrmInfo: UnregisterDrmInfo failed"); return NULL; } } @@ -335,12 +335,12 @@ DrmInfo* WVMDrmPlugin::onAcquireDrmInfo(int uniqueId, const DrmInfoRequest* drmI break; } case DrmInfoRequest::TYPE_RIGHTS_ACQUISITION_PROGRESS_INFO: { - LOGE("onAcquireDrmInfo: Unsupported DrmInfoRequest type %d", + ALOGE("onAcquireDrmInfo: Unsupported DrmInfoRequest type %d", drmInfoRequest->getInfoType()); break; } default: { - LOGE("onAcquireDrmInfo: Unknown info type %d", drmInfoRequest->getInfoType()); + ALOGE("onAcquireDrmInfo: Unknown info type %d", drmInfoRequest->getInfoType()); break; } } @@ -372,10 +372,10 @@ DrmInfoStatus* WVMDrmPlugin::onProcessDrmInfo(int uniqueId, const DrmInfo* drmIn (drmInfo->getInfoType() == DrmInfoRequest::TYPE_UNREGISTRATION_INFO)) { status = DrmInfoStatus::STATUS_OK; } else { - LOGE("onProcessDrmInfo : drmInfo type %d not supported", drmInfo->getInfoType()); + ALOGE("onProcessDrmInfo : drmInfo type %d not supported", drmInfo->getInfoType()); } } else { - LOGE("onProcessDrmInfo : drmInfo cannot be NULL"); + ALOGE("onProcessDrmInfo : drmInfo cannot be NULL"); } String8 licenseString("dummy_license_string"); @@ -407,7 +407,7 @@ DrmConstraints* WVMDrmPlugin::onGetConstraints(int uniqueId, const String8* path //ALOGD("WVMDrmPlugin::onGetConstraints : %d", uniqueId); if ( (Action::DEFAULT != action) && (Action::PLAY != action) ) { - LOGE("onGetConstraints : action %d not supported", action); + ALOGE("onGetConstraints : action %d not supported", action); return NULL; } @@ -566,7 +566,7 @@ int WVMDrmPlugin::onCheckRightsStatus(int uniqueId, const String8& path, int act //ALOGD("WVMDrmPlugin::onCheckRightsStatus() : %d", uniqueId); if ( (Action::DEFAULT != action) && (Action::PLAY != action) ) { - LOGE("onCheckRightsStatus : action %d not supported", action); + ALOGE("onCheckRightsStatus : action %d not supported", action); return RightsStatus::RIGHTS_INVALID; } diff --git a/proprietary/wvm/WVMExtractorImpl.cpp b/proprietary/wvm/WVMExtractorImpl.cpp index 8de9a8e0..1af10fa9 100644 --- a/proprietary/wvm/WVMExtractorImpl.cpp +++ b/proprietary/wvm/WVMExtractorImpl.cpp @@ -132,7 +132,7 @@ void WVMExtractorImpl::Initialize() #endif if (result != WV_Status_OK) { - LOGE("WV_Initialize returned status %d\n", result); + ALOGE("WV_Initialize returned status %d\n", result); mSetupStatus = ERROR_IO; } else { // Enable for debugging HTTP messages @@ -152,7 +152,7 @@ void WVMExtractorImpl::Initialize() } if (result != WV_Status_OK) { - LOGE("WV_Setup returned status %d in WVMMediaSource::start\n", result); + ALOGE("WV_Setup returned status %d in WVMMediaSource::start\n", result); mSetupStatus = ERROR_IO; WV_Teardown(mSession); mSession = NULL; @@ -242,7 +242,7 @@ status_t WVMExtractorImpl::readMetaData() videoMetaData->setCString(kKeyMIMEType, MEDIA_MIMETYPE_VIDEO_AVC); break; default: - LOGE("Invalid WV video type %d, expected H264C\n", audioType); + ALOGE("Invalid WV video type %d, expected H264C\n", audioType); break; } @@ -251,7 +251,7 @@ status_t WVMExtractorImpl::readMetaData() audioMetaData->setCString(kKeyMIMEType, MEDIA_MIMETYPE_AUDIO_AAC); break; default: - LOGE("Invalid WV audio type %d, expected AAC\n", audioType); + ALOGE("Invalid WV audio type %d, expected AAC\n", audioType); break; } @@ -268,7 +268,7 @@ status_t WVMExtractorImpl::readMetaData() float scaleUsed; result = WV_Play(mSession, 1.0, &scaleUsed, "npt=now-"); if (result != WV_Status_OK) { - LOGE("WV_Play for live stream setup failed: %d", result); + ALOGE("WV_Play for live stream setup failed: %d", result); return ERROR_IO; } } @@ -282,7 +282,7 @@ status_t WVMExtractorImpl::readMetaData() if (mIsLiveStream) { result = WV_Pause(mSession, ""); if (result != WV_Status_OK) { - LOGE("WV_Pause for live stream setup failed: %d", result); + ALOGE("WV_Pause for live stream setup failed: %d", result); } } @@ -332,7 +332,7 @@ status_t WVMExtractorImpl::readESDSMetaData(sp audioMetaData) } while (result == WV_Status_Warning_Not_Available && limit-- > 0); if (result != WV_Status_OK) { - LOGE("WV_Info_GetCodecConfig ESDS returned error %d\n", result); + ALOGE("WV_Info_GetCodecConfig ESDS returned error %d\n", result); return ERROR_IO; } diff --git a/proprietary/wvm/WVMFileSource.cpp b/proprietary/wvm/WVMFileSource.cpp index 2b5b20f0..8f956390 100644 --- a/proprietary/wvm/WVMFileSource.cpp +++ b/proprietary/wvm/WVMFileSource.cpp @@ -54,7 +54,7 @@ size_t WVMFileSource::Read(size_t amount, unsigned char *buffer) if (result < 0) { if (mLogOnce) { - LOGE("mDataSource-readAt returned error %d\n", (int)result ); + ALOGE("mDataSource-readAt returned error %d\n", (int)result ); mLogOnce = false; } result = 0; diff --git a/proprietary/wvm/WVMMediaSource.cpp b/proprietary/wvm/WVMMediaSource.cpp index b2406796..ec7ca59f 100644 --- a/proprietary/wvm/WVMMediaSource.cpp +++ b/proprietary/wvm/WVMMediaSource.cpp @@ -122,7 +122,7 @@ status_t WVMMediaSource::start(MetaData *) float speed; WVStatus result = WV_Play(mSession, 1.0, &speed, "now-"); if (result != WV_Status_OK) { - LOGE("WV_Play returned status %d in WVMMediaSource::start\n", result); + ALOGE("WV_Play returned status %d in WVMMediaSource::start\n", result); return ERROR_IO; } @@ -155,7 +155,7 @@ status_t WVMMediaSource::stop() if (mESSelector == WV_EsSelector_Video) { WVStatus result = WV_Pause(mSession, "now"); if (result != WV_Status_OK) { - LOGE("WV_Pause returned status %d in WVMMediaSource::stop\n", result); + ALOGE("WV_Pause returned status %d in WVMMediaSource::stop\n", result); status = ERROR_IO; } } @@ -235,7 +235,7 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options) std::string when = usecToNPT(seekTimeUs) + std::string("-"); WVStatus result = WV_Play(mSession, 1.0, &scaleUsed, when ); if (result != WV_Status_OK) { - LOGE("WV_Play returned status %d in WVMMediaSource::read\n", result); + ALOGE("WV_Play returned status %d in WVMMediaSource::read\n", result); return ERROR_IO; } } @@ -304,7 +304,7 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options) break; default: if (mLogOnce) { - LOGE("WV_GetEsData returned ERROR %d in WVMMediaSource::read\n", result); + ALOGE("WV_GetEsData returned ERROR %d in WVMMediaSource::read\n", result); mLogOnce = false; } status = ERROR_IO; @@ -396,7 +396,7 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options) FILE *f = fopen(filename, "w"); if (!f) - LOGE("WVMFileSource: can't open %s", filename); + ALOGE("WVMFileSource: can't open %s", filename); else { fwrite(mediaBuf->data(), bytesRead + offset, 1, f); fclose(f); diff --git a/proprietary/wvm/test/Testlibwvm.cpp b/proprietary/wvm/test/Testlibwvm.cpp index 5fa8564f..a31de8fa 100644 --- a/proprietary/wvm/test/Testlibwvm.cpp +++ b/proprietary/wvm/test/Testlibwvm.cpp @@ -66,7 +66,7 @@ void TestLibWVM::Load() if (getInstanceFunc) { ALOGD("Found GetInstanceFunc"); } else { - LOGE("Failed to locate GetInstance in libwvm.so"); + ALOGE("Failed to locate GetInstance in libwvm.so"); } dlclose(handle);