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

am 382a5286: Merge "Fix HLS Live Playback with Widevine DRM." into jb-dev

Browse Source 
* commit '382a5286b5c8ccfd6fe501ed5bd53cc8630b9de4':
  Fix HLS Live Playback with Widevine DRM.
This commit is contained in:
Fred Gylys-Colwell
2012-05-21 11:51:38 -07:00
committed by Android Git Automerger
parent 5658b8dc13 382a5286b5
commit 9cb8f2b91b
2 changed files with 14 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
proprietary/wvm/WVMMediaSource.cpp
View File

@@ -169,14 +169,16 @@ sp<MetaData> WVMMediaSource::getFormat()
Mutex::Autolock autoLock(mLock);
#ifdef REQUIRE_SECURE_BUFFERS
if (!mIsLiveStream && (mESSelector == WV_EsSelector_Video)) {
mTrackMetaData->setInt32(kKeyRequiresSecureBuffers, true);
}
if (!mIsLiveStream) {
if (mESSelector == WV_EsSelector_Video) {
mTrackMetaData->setInt32(kKeyRequiresSecureBuffers, true);
}
// 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);
// 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);
}
}
#endif