Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4da48ec8: Merge "Notify the playback status to DRM agents before the playback starts"

Browse Source 
* commit '4da48ec88338af2df6f9abba850fb4c65918bb82':
  Notify the playback status to DRM agents before the playback starts
This commit is contained in:
Gloria Wang
2010-11-22 21:26:13 -08:00
committed by Android Git Automerger
parent 24a90c2674 4da48ec883
commit 3e18dfab34
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
media/libstagefright/AwesomePlayer.cpp
View File

@@ -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;
}