Fix offline license requests and error events

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

View File

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

View File

@@ -167,7 +167,7 @@ sp<MetaData> WVMMediaSource::getFormat()
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
if (mESSelector == WV_EsSelector_Audio) {
mTrackMetaData->setInt32(kKeyIsADTS, 1);