commit c533edc9c70dd9434e2e496dc0d52f534472c7e0
author Gloria Wang <gwang@google.com> Mon Nov 22 21:15:07 2010 -0800
committer Android Code Review <code-review@android.com> Mon Nov 22 21:15:07 2010 -0800
tree 5ab623fd214e20ac188f0b2979983ad990e68257
parent 14db41b80c75fd4edfa6c5ed4c776d3537eefb41
parent c130b5bf563d049bd391ccd96985ac278ef8ff8d

Merge "Notify the playback status to DRM agents before the playback starts"

media/libstagefright/AwesomePlayer.cpp

diff --git a/media/libstagefright/AwesomePlayer.cpp b/media/libstagefright/AwesomePlayer.cpp
index 9789e36..781e3fc 100644
--- a/media/libstagefright/AwesomePlayer.cpp
+++ b/media/libstagefright/AwesomePlayer.cpp
@@ -526,6 +526,13 @@
 
     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) {
@@ -543,6 +550,11 @@
 
                     mFlags &= ~(PLAYING | FIRST_FRAME);
 
+                    if (mDecryptHandle != NULL) {
+                        mDrmManagerClient->setPlaybackStatus(mDecryptHandle,
+                                 Playback::STOP, 0);
+                    }
+
                     return err;
                 }
 
@@ -582,13 +594,6 @@
         seekTo_l(0);
     }
 
-    if (mDecryptHandle != NULL) {
-        int64_t position;
-        getPosition(&position);
-        mDrmManagerClient->setPlaybackStatus(mDecryptHandle,
-                Playback::START, position / 1000);
-    }
-
     return OK;
 }