From c89fe73868396d6c9cc268ad0d73170de38e04bf Mon Sep 17 00:00:00 2001 From: Jeffrey Tinker Date: Tue, 17 May 2011 21:27:45 -0700 Subject: [PATCH] Fix for b/4380963 Log spam from widevine drm on I/O error WVMFileSource: mDataSource-readAt returned error -1004 Change-Id: I001d496bc59aa6465c20f85dfade364f4cca33de --- proprietary/wvm/WVMFileSource.cpp | 8 ++++++-- proprietary/wvm/include/WVMFileSource.h | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/proprietary/wvm/WVMFileSource.cpp b/proprietary/wvm/WVMFileSource.cpp index 22c93196..2b5b20f0 100644 --- a/proprietary/wvm/WVMFileSource.cpp +++ b/proprietary/wvm/WVMFileSource.cpp @@ -27,7 +27,7 @@ namespace android { WVMFileSource::WVMFileSource(sp &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); 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; } else { mOffset += result; + mLogOnce = true; } return result; diff --git a/proprietary/wvm/include/WVMFileSource.h b/proprietary/wvm/include/WVMFileSource.h index da51da2a..9ea2d7f2 100644 --- a/proprietary/wvm/include/WVMFileSource.h +++ b/proprietary/wvm/include/WVMFileSource.h @@ -43,6 +43,7 @@ public: private: sp mDataSource; unsigned long long mOffset; + bool mLogOnce; }; };