commit 3694d7cf40d1645bf05246cf38595eed606bb650
author Jaesung Chung <jaesung@google.com> Wed Oct 21 11:41:38 2015 +0900
committer Jaesung Chung <jaesung@google.com> Mon Dec 07 18:00:19 2015 +0900
tree 4e0acd93f201adf54119271b3bd539f74deea84c
parent cc8bbc3ffed9fdd3f3d92973474c498e51035ccd

Support for CEA-708 closed caption

Bug: 24314667, Bug: 24889604
Change-Id: Ica8a8405b143921de82ca6075a1f7b1f6f9ff345

media/libmediaplayerservice/nuplayer/GenericSource.cpp

diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
index 0c774bd..7c3b409 100644
--- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp
+++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp
@@ -1482,6 +1482,14 @@
         meta->setBuffer("sei", sei);
     }
 
+    const void *mpegUserDataPointer;
+    size_t mpegUserDataLength;
+    if (mb->meta_data()->findData(
+            kKeyMpegUserData, &dataType, &mpegUserDataPointer, &mpegUserDataLength)) {
+        sp<ABuffer> mpegUserData = ABuffer::CreateAsCopy(mpegUserDataPointer, mpegUserDataLength);
+        meta->setBuffer("mpegUserData", mpegUserData);
+    }
+
     if (actualTimeUs) {
         *actualTimeUs = timeUs;
     }