diff options
| author | Gloria Wang <gwang@google.com> | 2010-11-22 21:26:13 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-11-22 21:26:13 -0800 |
| commit | 3e18dfab3417e139c7ec3896cea9e303fdc8fa63 (patch) | |
| tree | cf2f254d4ab0bd83d2eaee3a4a0076fbe9b8b5d8 /media | |
| parent | 24a90c2674270fee0783bafa54fd5d845bdf0c18 (diff) | |
| parent | 4da48ec88338af2df6f9abba850fb4c65918bb82 (diff) | |
| download | frameworks_base-3e18dfab3417e139c7ec3896cea9e303fdc8fa63.zip frameworks_base-3e18dfab3417e139c7ec3896cea9e303fdc8fa63.tar.gz frameworks_base-3e18dfab3417e139c7ec3896cea9e303fdc8fa63.tar.bz2 | |
am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"
* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
Notify the playback status to DRM agents before the playback starts
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/AwesomePlayer.cpp | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp index e65c943..0bc4062 100644 --- a/media/libstagefright/AwesomePlayer.cpp +++ b/media/libstagefright/AwesomePlayer.cpp @@ -762,6 +762,13 @@ status_t AwesomePlayer::play_l() { bool deferredAudioSeek = false; + if (mDecryptHandle != NULL) { + int64_t position; + getPosition(&position); + mDrmManagerClient->setPlaybackStatus(mDecryptHandle, + Playback::START, position / 1000); + } + if (mAudioSource != NULL) { if (mAudioPlayer == NULL) { if (mAudioSink != NULL) { @@ -779,6 +786,11 @@ status_t AwesomePlayer::play_l() { mFlags &= ~(PLAYING | FIRST_FRAME); + if (mDecryptHandle != NULL) { + mDrmManagerClient->setPlaybackStatus(mDecryptHandle, + Playback::STOP, 0); + } + return err; } @@ -815,13 +827,6 @@ status_t AwesomePlayer::play_l() { seekTo_l(0); } - if (mDecryptHandle != NULL) { - int64_t position; - getPosition(&position); - mDrmManagerClient->setPlaybackStatus(mDecryptHandle, - Playback::START, position / 1000); - } - return OK; } |