Widevine HLS live stream support for L1 secure playback.
Check in for Jeff Tinker. BUG 5081725 Change-Id: If1d828e97319788ab52c6f15a7782a1da63d8f20
This commit is contained in:
@@ -82,14 +82,18 @@ void WVMMediaSource::allocBufferGroup()
|
||||
|
||||
status_t WVMMediaSource::setBuffers(const Vector<MediaBuffer *> &buffers) {
|
||||
#ifdef REQUIRE_SECURE_BUFFERS
|
||||
LOGI("Using codec-supplied buffers");
|
||||
if (!mIsLiveStream) {
|
||||
LOGI("Using codec-supplied buffers");
|
||||
|
||||
delete mGroup;
|
||||
mGroup = new MediaBufferGroup;
|
||||
for (size_t i = 0; i < buffers.size(); ++i) {
|
||||
mGroup->add_buffer(buffers.itemAt(i));
|
||||
delete mGroup;
|
||||
mGroup = new MediaBufferGroup;
|
||||
for (size_t i = 0; i < buffers.size(); ++i) {
|
||||
mGroup->add_buffer(buffers.itemAt(i));
|
||||
}
|
||||
return OK;
|
||||
} else {
|
||||
return ERROR_UNSUPPORTED;
|
||||
}
|
||||
return OK;
|
||||
#else
|
||||
return ERROR_UNSUPPORTED;
|
||||
#endif
|
||||
@@ -118,11 +122,11 @@ status_t WVMMediaSource::start(MetaData *)
|
||||
}
|
||||
|
||||
#ifndef REQUIRE_SECURE_BUFFERS
|
||||
allocBufferGroup();
|
||||
allocBufferGroup();
|
||||
#endif
|
||||
} else {
|
||||
// audio
|
||||
allocBufferGroup();
|
||||
// audio
|
||||
allocBufferGroup();
|
||||
}
|
||||
|
||||
return OK;
|
||||
@@ -160,7 +164,7 @@ sp<MetaData> WVMMediaSource::getFormat()
|
||||
Mutex::Autolock autoLock(mLock);
|
||||
|
||||
#ifdef REQUIRE_SECURE_BUFFERS
|
||||
if (mESSelector == WV_EsSelector_Video) {
|
||||
if (!mIsLiveStream && (mESSelector == WV_EsSelector_Video)) {
|
||||
mTrackMetaData->setInt32(kKeyRequiresSecureBuffers, true);
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user