Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e81e8153 authored by Gloria Wang's avatar Gloria Wang Committed by Android Git Automerger
Browse files

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
parents f798e438 c533edc9

media/libstagefright/AwesomePlayer.cpp

+12 −7
Original line number Diff line number Diff line
@@ -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;

}