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

Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF) DO NOT MERGE"

Browse Source
This commit is contained in:
Steve Block
2012-01-05 14:08:24 -08:00
committed by Android (Google) Code Review
parent ddf87803c7 8d8df85113
commit b443024341
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
proprietary/wvm/WVMExtractorImpl.cpp
View File

@@ -428,7 +428,7 @@ int64_t WVMExtractorImpl::getCachedDurationUs(status_t *finalStatus) {
static time_t lastLogTime = now; static time_t lastLogTime = now;
if (now > lastLogTime + 5) { if (now > lastLogTime + 5) {
lastLogTime = now; lastLogTime = now;
LOGI("using adaptive track #%d, rate=%ld\n", ALOGI("using adaptive track #%d, rate=%ld\n",
currentTrack, encodedRates[currentTrack]); currentTrack, encodedRates[currentTrack]);
} }
} }

2
proprietary/wvm/WVMMediaSource.cpp
View File

@@ -88,7 +88,7 @@ void WVMMediaSource::allocBufferGroup()
status_t WVMMediaSource::setBuffers(const Vector<MediaBuffer *> &buffers) { status_t WVMMediaSource::setBuffers(const Vector<MediaBuffer *> &buffers) {
#ifdef REQUIRE_SECURE_BUFFERS #ifdef REQUIRE_SECURE_BUFFERS
if (!mIsLiveStream) { if (!mIsLiveStream) {
LOGI("Using codec-supplied buffers"); ALOGI("Using codec-supplied buffers");
delete mGroup; delete mGroup;
mGroup = new MediaBufferGroup; mGroup = new MediaBufferGroup;