diff options
| author | Andreas Huber <andih@google.com> | 2012-04-18 12:22:58 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-04-18 12:22:58 -0700 |
| commit | f69e53033f23f9f70fcdb28a3c2e650de0147459 (patch) | |
| tree | 3654454a30b35e3060d6aef8bec5e56bb8696af6 /include/media/stagefright/MetaData.h | |
| parent | 97b5d0d5b5ef766eb5dd680d05a5d199662d4ae0 (diff) | |
| download | frameworks_av-f69e53033f23f9f70fcdb28a3c2e650de0147459.zip frameworks_av-f69e53033f23f9f70fcdb28a3c2e650de0147459.tar.gz frameworks_av-f69e53033f23f9f70fcdb28a3c2e650de0147459.tar.bz2 | |
Some refactoring and cleanup of now obsolete crypto fields.
codec commandline tool no longer supports decryption.
Change-Id: I7b10be6524631b20ac5d361d47949b00addf4a93
Diffstat (limited to 'include/media/stagefright/MetaData.h')
| -rw-r--r-- | include/media/stagefright/MetaData.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/include/media/stagefright/MetaData.h b/include/media/stagefright/MetaData.h index d0db98e..8a87d83 100644 --- a/include/media/stagefright/MetaData.h +++ b/include/media/stagefright/MetaData.h @@ -129,10 +129,6 @@ enum { kKeyRequiresSecureBuffers = 'secu', // bool (int32_t) - kKeyScrambling = 'scrm', // int32_t - kKeyEMM = 'emm ', // raw data - kKeyECM = 'ecm ', // raw data - kKeyIsADTS = 'adts', // bool (int32_t) // If a MediaBuffer's data represents (at least partially) encrypted @@ -156,6 +152,7 @@ enum { kKeyPlainSizes = 'plai', // size_t[] kKeyCryptoKey = 'cryK', // uint8_t[16] kKeyCryptoIV = 'cryI', // uint8_t[16] + kKeyCryptoMode = 'cryM', // int32_t }; enum { |