widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

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

Bug: 5449033
Change-Id: I2d28198c2fc4622a090f4d830cbb311fe522749c
This commit is contained in:
Steve Block
2011-12-20 16:24:34 +00:00
parent 4b10b77fa1
commit efe632956d
7 changed files with 49 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
proprietary/wvm/WVMMediaSource.cpp
View File

@@ -107,7 +107,7 @@ status_t WVMMediaSource::setBuffers(const Vector<MediaBuffer *> &buffers) {
status_t WVMMediaSource::start(MetaData *)
{
//LOGD("WVMMediaSource::start()");
//ALOGD("WVMMediaSource::start()");
Mutex::Autolock autoLock(mLock);
CHECK(!mStarted);
@@ -144,7 +144,7 @@ status_t WVMMediaSource::start(MetaData *)
status_t WVMMediaSource::stop()
{
//LOGD("WVMMediaSource::stop()");
//ALOGD("WVMMediaSource::stop()");
Mutex::Autolock autoLock(mLock);
CHECK(mStarted);
@@ -221,7 +221,7 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
// When doing a seek, use a longer timeout since we need to set up a new connection
retryLimit = 1500;
//LOGD("%s seek mode=%d, seek time=%lld lateby=%lld",
//ALOGD("%s seek mode=%d, seek time=%lld lateby=%lld",
// (mESSelector == WV_EsSelector_Video) ? "video" : "audio",
// mode, seekTimeUs, options->getLateBy());
if (mode == ReadOptions::SEEK_NEXT_SYNC) {
@@ -351,12 +351,12 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
break;
#ifdef REQUIRE_SECURE_BUFFERS
LOGD("buffer overflow");
ALOGD("buffer overflow");
mediaBuf->release();
return ERROR_IO;
#endif
//LOGD("Resizing...");
//ALOGD("Resizing...");
// This buffer is too small, allocate a larger buffer twice the size
// and copy the data from the current buffer into the first part of
@@ -395,11 +395,11 @@ status_t WVMMediaSource::read(MediaBuffer **buffer, const ReadOptions *options)
fwrite(mediaBuf->data(), bytesRead + offset, 1, f);
fclose(f);
}
LOGD("WVMMediaSource::read writing (%d bytes to %s)", bytesRead + offset, filename);
ALOGD("WVMMediaSource::read writing (%d bytes to %s)", bytesRead + offset, filename);
#endif
#if 0
LOGD("[%p] %s packet length=%d kKeyTime=%lld %s\n", mediaBuf,
ALOGD("[%p] %s packet length=%d kKeyTime=%lld %s\n", mediaBuf,
(mESSelector == WV_EsSelector_Video ? "video" : "audio"),
bytesRead + offset, keyTime, syncFrame ? "sync" : "");
#endif
@@ -416,7 +416,7 @@ WVMMediaSource::DecryptContext WVMMediaSource::sDecryptContext[2] = {};
void WVMMediaSource::DecryptCallback(WVEsSelector esType, void* input, void* output,
size_t length, int key)
{
//LOGD("DecryptCallback(type=%d, in=%p, out=%p, len=%d, key=%d\n",
//ALOGD("DecryptCallback(type=%d, in=%p, out=%p, len=%d, key=%d\n",
// (int)esType, input, output, length, key);
DecryptContext &context = sDecryptContext[esType];
OEMCrypto_UINT32 copied = length;
@@ -437,7 +437,7 @@ void WVMMediaSource::DecryptCallback(WVEsSelector esType, void* input, void* out
}
if (result != OEMCrypto_SUCCESS) {
LOGD("OEMCrypto decrypt failure: %d", result);
ALOGD("OEMCrypto decrypt failure: %d", result);
}
context.mOffset += copied;
@@ -447,7 +447,7 @@ void WVMMediaSource::DecryptCallback(WVEsSelector esType, void* input, void* out
WVMMediaSource::~WVMMediaSource()
{
//LOGD("WVMMediaSource::~WVMMediaSource()");
//ALOGD("WVMMediaSource::~WVMMediaSource()");
if (mStarted) {
stop();