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

Merge "Fix for b/4380963 Log spam from widevine drm on I/O error WVMFileSource: mDataSource-readAt returned error -1004" into honeycomb-mr2

Browse Source
This commit is contained in:
Jeffrey Tinker
2011-05-19 16:30:18 -07:00
committed by Android (Google) Code Review
parent 907dd75e31 c89fe73868
commit 3d18aaa207
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
proprietary/wvm/WVMFileSource.cpp
View File

@@ -27,7 +27,7 @@ namespace android {
WVMFileSource::WVMFileSource(sp<DataSource> &dataSource) WVMFileSource::WVMFileSource(sp<DataSource> &dataSource)
: mDataSource(dataSource), : mDataSource(dataSource),
mOffset(0) mOffset(0), mLogOnce(true)
{ {
} }
@@ -53,10 +53,14 @@ size_t WVMFileSource::Read(size_t amount, unsigned char *buffer)
ssize_t result = mDataSource->readAt(mOffset, buffer, amount); ssize_t result = mDataSource->readAt(mOffset, buffer, amount);
if (result < 0) { if (result < 0) {
LOGE("mDataSource-readAt returned error %d\n", (int)result ); if (mLogOnce) {
LOGE("mDataSource-readAt returned error %d\n", (int)result );
mLogOnce = false;
}
result = 0; result = 0;
} else { } else {
mOffset += result; mOffset += result;
mLogOnce = true;
} }
return result; return result;

1
proprietary/wvm/include/WVMFileSource.h
View File

@@ -43,6 +43,7 @@ public:
private: private:
sp<DataSource> mDataSource; sp<DataSource> mDataSource;
unsigned long long mOffset; unsigned long long mOffset;
bool mLogOnce;
}; };
}; };