commit f60cbe5665dea5b0b244f57815ab49db5a652eea
author Robert Shih <robertshih@google.com> Fri Dec 21 13:32:36 2018 -0800
committer Robert Shih <robertshih@google.com> Fri Dec 21 13:32:36 2018 -0800
tree c3cccffd83d22a9fbacaad30e6da4f38e0d3de82
parent 73142871e81c42374cb85390efc1fb7adca230f3

nuplayer2: pass crypto info from extractor to decoder

Bug: 121387877
Test: MediaPlayer2DrmTest
Change-Id: Iabe59aaffe2b0fae2f5a8420566b41ff324d0758

media/libmediaplayer2/nuplayer2/GenericSource2.cpp

diff --git a/media/libmediaplayer2/nuplayer2/GenericSource2.cpp b/media/libmediaplayer2/nuplayer2/GenericSource2.cpp
index f01361b..9552580 100644
--- a/media/libmediaplayer2/nuplayer2/GenericSource2.cpp
+++ b/media/libmediaplayer2/nuplayer2/GenericSource2.cpp
@@ -1286,6 +1286,11 @@
             mVideoTimeUs = timeUs;
         }
 
+        sp<AMediaCodecCryptoInfoWrapper> cryptInfo = extractor->getSampleCryptoInfo();
+        if (cryptInfo != NULL) {
+            meta->setObject("cryptInfo", cryptInfo);
+        }
+
         queueDiscontinuityIfNeeded(seeking, formatChange, trackType, track);
 
         if (numBuffers == 0 && actualTimeUs != nullptr) {