diff options
| author | Chong Zhang <chz@google.com> | 2015-01-08 18:03:45 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-08 18:03:45 +0000 |
| commit | 32479c9f7a004d2c1daeac015684529b0158f8a4 (patch) | |
| tree | d0f6cb7cb08b29506090a4cf44e4c723f903fb16 /media/libmediaplayerservice | |
| parent | 2326ed104477a80c850eb3cef6a7039f1585a69d (diff) | |
| parent | 7993d6b343f2723872dac085756743630371454d (diff) | |
| download | frameworks_av-32479c9f7a004d2c1daeac015684529b0158f8a4.zip frameworks_av-32479c9f7a004d2c1daeac015684529b0158f8a4.tar.gz frameworks_av-32479c9f7a004d2c1daeac015684529b0158f8a4.tar.bz2 | |
am 7993d6b3: am e0344754: am 468977f0: Merge "mark any copyrighted content as protected to disable capture" into lmp-mr1-dev
* commit '7993d6b343f2723872dac085756743630371454d':
mark any copyrighted content as protected to disable capture
Diffstat (limited to 'media/libmediaplayerservice')
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/GenericSource.cpp | 1 | ||||
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayer.cpp | 4 | ||||
| -rw-r--r-- | media/libmediaplayerservice/nuplayer/NuPlayerSource.h | 1 |
3 files changed, 6 insertions, 0 deletions
diff --git a/media/libmediaplayerservice/nuplayer/GenericSource.cpp b/media/libmediaplayerservice/nuplayer/GenericSource.cpp index dd79b50..76b80bb 100644 --- a/media/libmediaplayerservice/nuplayer/GenericSource.cpp +++ b/media/libmediaplayerservice/nuplayer/GenericSource.cpp @@ -391,6 +391,7 @@ void NuPlayer::GenericSource::onPrepareAsync() { notifyFlagsChanged( (mIsSecure ? FLAG_SECURE : 0) + | (mDecryptHandle != NULL ? FLAG_PROTECTED : 0) | FLAG_CAN_PAUSE | FLAG_CAN_SEEK_BACKWARD | FLAG_CAN_SEEK_FORWARD diff --git a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp index a28591e..e02a2d5 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayer.cpp +++ b/media/libmediaplayerservice/nuplayer/NuPlayer.cpp @@ -1190,6 +1190,10 @@ status_t NuPlayer::instantiateDecoder(bool audio, sp<DecoderBase> *decoder) { if (mSourceFlags & Source::FLAG_SECURE) { format->setInt32("secure", true); } + + if (mSourceFlags & Source::FLAG_PROTECTED) { + format->setInt32("protected", true); + } } if (audio) { diff --git a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h index e92cd36..c81d3b9 100644 --- a/media/libmediaplayerservice/nuplayer/NuPlayerSource.h +++ b/media/libmediaplayerservice/nuplayer/NuPlayerSource.h @@ -38,6 +38,7 @@ struct NuPlayer::Source : public AHandler { FLAG_CAN_SEEK = 8, // the "seek bar" FLAG_DYNAMIC_DURATION = 16, FLAG_SECURE = 32, + FLAG_PROTECTED = 64, }; enum { |