summaryrefslogtreecommitdiffstats
path: root/media/libstagefright/mpeg2ts
diff options
context:
space:
mode:
authorAndreas Huber <andih@google.com>2012-03-26 11:13:27 -0700
committerAndreas Huber <andih@google.com>2012-03-26 11:24:04 -0700
commited3e3e046840d5bf1ca84a8c0cc097425e89d6d6 (patch)
tree99d5bb3a2f48f9a3ba3eaaf17e630b589e97bef1 /media/libstagefright/mpeg2ts
parentcc1110dc92e53e9cc0afbb043e6ef8295bd9c5d5 (diff)
downloadframeworks_av-ed3e3e046840d5bf1ca84a8c0cc097425e89d6d6.zip
frameworks_av-ed3e3e046840d5bf1ca84a8c0cc097425e89d6d6.tar.gz
frameworks_av-ed3e3e046840d5bf1ca84a8c0cc097425e89d6d6.tar.bz2
Provisional support for secure decryption of media streams.
Change-Id: Ib3982a9c960bfdb0cb7e1b174440b141b194cfbe
Diffstat (limited to 'media/libstagefright/mpeg2ts')
-rw-r--r--media/libstagefright/mpeg2ts/AnotherPacketSource.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
index d708ba6..e1ac53c 100644
--- a/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
+++ b/media/libstagefright/mpeg2ts/AnotherPacketSource.cpp
@@ -117,6 +117,12 @@ status_t AnotherPacketSource::read(
mediaBuffer->meta_data()->setInt64(kKeyTime, timeUs);
+ int32_t scrambling;
+ if (buffer->meta()->findInt32("scrambling", &scrambling)
+ && scrambling != 0) {
+ mediaBuffer->meta_data()->setInt32(kKeyScrambling, scrambling);
+ }
+
*out = mediaBuffer;
return OK;
}