diff options
| author | Andreas Huber <andih@google.com> | 2012-03-26 11:13:27 -0700 |
|---|---|---|
| committer | Andreas Huber <andih@google.com> | 2012-03-26 11:24:04 -0700 |
| commit | ed3e3e046840d5bf1ca84a8c0cc097425e89d6d6 (patch) | |
| tree | 99d5bb3a2f48f9a3ba3eaaf17e630b589e97bef1 /media/libmediaplayerservice/MediaPlayerService.h | |
| parent | cc1110dc92e53e9cc0afbb043e6ef8295bd9c5d5 (diff) | |
| download | frameworks_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/libmediaplayerservice/MediaPlayerService.h')
| -rw-r--r-- | media/libmediaplayerservice/MediaPlayerService.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/MediaPlayerService.h b/media/libmediaplayerservice/MediaPlayerService.h index d4e0eb1..b08dd6c 100644 --- a/media/libmediaplayerservice/MediaPlayerService.h +++ b/media/libmediaplayerservice/MediaPlayerService.h @@ -240,6 +240,7 @@ public: virtual sp<IMemory> decode(const char* url, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat); virtual sp<IMemory> decode(int fd, int64_t offset, int64_t length, uint32_t *pSampleRate, int* pNumChannels, audio_format_t* pFormat); virtual sp<IOMX> getOMX(); + virtual sp<ICrypto> makeCrypto(); virtual status_t dump(int fd, const Vector<String16>& args); @@ -419,6 +420,7 @@ private: SortedVector< wp<MediaRecorderClient> > mMediaRecorderClients; int32_t mNextConnId; sp<IOMX> mOMX; + sp<ICrypto> mCrypto; }; // ---------------------------------------------------------------------------- |