Merge "Fix HLS Live Playback with Widevine DRM." into jb-dev

proprietary/wvm/WVMExtractorImpl.cpp

@@ -131,23 +131,17 @@ void WVMExtractorImpl::Initialize()
         mIsLiveStream = (mDataSource->getUri().getPathExtension().find(".m3u8") == 0);
     }
 
+    WVCallbacks callbacks;
+    // The following memset is needed for 4.5.0 only, because WVCallbacks is a struct.
+    memset( &callbacks, 0, sizeof(callbacks));
+    callbacks.socketInfo = SocketInfoCallback;
 #ifdef REQUIRE_SECURE_BUFFERS
     if (!mIsLiveStream) {
         //ALOGD("WVMExtractorImpl::Initialize setting DecryptCallback\n");
-        WVCallbacks callbacks;
         callbacks.decrypt = WVMMediaSource::DecryptCallback;
-        callbacks.socketInfo = SocketInfoCallback;
-        result = WV_Initialize(&callbacks);
-    } else {
-        WVCallbacks callbacks;
-        callbacks.socketInfo = SocketInfoCallback;
-        result = WV_Initialize(&callbacks);
     }
-#else
-    WVCallbacks callbacks;
-    callbacks.socketInfo = SocketInfoCallback;
-    result = WV_Initialize(&callbacks);
 #endif
+    result = WV_Initialize(&callbacks);
 
     if (result != WV_Status_OK) {
         ALOGE("WV_Initialize returned status %d\n", result);
@@ -549,4 +543,3 @@ void WVMExtractorImpl::setUID(uid_t uid)
 }
 
 } // namespace android
-

proprietary/wvm/WVMMediaSource.cpp

@@ -169,7 +169,8 @@ sp<MetaData> WVMMediaSource::getFormat()
     Mutex::Autolock autoLock(mLock);
 
 #ifdef REQUIRE_SECURE_BUFFERS
-    if (!mIsLiveStream && (mESSelector == WV_EsSelector_Video)) {
+    if (!mIsLiveStream) {
+        if (mESSelector == WV_EsSelector_Video) {
             mTrackMetaData->setInt32(kKeyRequiresSecureBuffers, true);
         }
 
@@ -178,6 +179,7 @@ sp<MetaData> WVMMediaSource::getFormat()
         if (mESSelector == WV_EsSelector_Audio) {
             mTrackMetaData->setInt32(kKeyIsADTS, 1);
         }
+    }
 #endif
 
     return mTrackMetaData;