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

Fix offline license requests and error events

Browse Source 
Corrected a regression in error event reporting and a
mismatch in asset paths during rights acquisition.

Also requires https://android-git.corp.google.com/g/#/c/185898/

Contains Widevine libraries version 6.0.0-6957

Change-Id: I4a7603a86feaf437673fc73f0cccb6065dbcce67
related-to-bug: 6414503
This commit is contained in:
Jeff Tinker
2012-05-01 13:32:56 -07:00
parent ec2d703970
commit 3397e72468
5 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
proprietary/drmwvmplugin/lib/arm/libwvdrm_L1.so
View File

Binary file not shown.

2
proprietary/streamcontrol/include/WVStreamControlAPI.h
View File

@@ -430,7 +430,7 @@ public:
CLIENT_API WVStatus CLIENT_API WVStatus
WV_Setup(WVSession *&session, WVFileSource *source, const std::string &transport, WV_Setup(WVSession *&session, WVFileSource *source, const std::string &transport,
WVCredentials &credentials, WVOutputFormat outputFormat = WV_OutputFormat_PS, WVCredentials &credentials, WVOutputFormat outputFormat = WV_OutputFormat_PS,
unsigned long bufferSize = 10 * 1024 * 1024); unsigned long bufferSize = 10 * 1024 * 1024, void *context = NULL);
// //
// METHOD: WV_IsWidevineMedia // METHOD: WV_IsWidevineMedia

BIN
proprietary/streamcontrol/lib/arm/libWVStreamControlAPI_L1.so
View File

Binary file not shown.

2
proprietary/wvm/WVMExtractorImpl.cpp
View File

@@ -167,7 +167,7 @@ void WVMExtractorImpl::Initialize()
mFileSource = new WVMFileSource(mDataSource); mFileSource = new WVMFileSource(mDataSource);
result = WV_Setup(mSession, mFileSource.get(), result = WV_Setup(mSession, mFileSource.get(),
"RAW/RAW/RAW;destination=getdata", credentials, "RAW/RAW/RAW;destination=getdata", credentials,
WV_OutputFormat_ES, kStreamCacheSize); WV_OutputFormat_ES, kStreamCacheSize, this);
} }
if (result != WV_Status_OK) { if (result != WV_Status_OK) {

2
proprietary/wvm/WVMMediaSource.cpp
View File

@@ -167,7 +167,7 @@ sp<MetaData> WVMMediaSource::getFormat()
mTrackMetaData->setInt32(kKeyRequiresSecureBuffers, true); mTrackMetaData->setInt32(kKeyRequiresSecureBuffers, true);
} }
// Only support AAC on android for now, so assume the audio // Only support AAC on android for now, so assume the audio
// track is AAC and notify the audio codec it has ADTS framing // track is AAC and notify the audio codec it has ADTS framing
if (mESSelector == WV_EsSelector_Audio) { if (mESSelector == WV_EsSelector_Audio) {
mTrackMetaData->setInt32(kKeyIsADTS, 1); mTrackMetaData->setInt32(kKeyIsADTS, 1);