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

Commit fa52ba0b authored by Robert Shih's avatar Robert Shih Committed by Android (Google) Code Review
Browse files

Merge "libmediadrm: API to set playback id"

parents ee1d5e19 726afea1

drm/libmediadrm/DrmHal.cpp

+11 −0
Original line number Diff line number Diff line
@@ -1585,4 +1585,15 @@ bool DrmHal::requiresSecureDecoder(const char *mime, 
    return mPluginV1_4->requiresSecureDecoder(hidl_string(mime), hLevel);

}



status_t DrmHal::setPlaybackId(Vector<uint8_t> const &sessionId, const char *playbackId) {

    Mutex::Autolock autoLock(mLock);

    if (mPluginV1_4 == NULL) {

        return ERROR_UNSUPPORTED;

    }

    drm::V1_0::Status err = mPluginV1_4->setPlaybackId(

            toHidlVec(sessionId),

            hidl_string(playbackId));

    return toStatusT(err);

}



}  // namespace android

drm/libmediadrm/include/mediadrm/DrmHal.h

+4 −0
Original line number Diff line number Diff line
@@ -184,6 +184,10 @@ struct DrmHal : public IDrm, 
            const char *mime,

            DrmPlugin::SecurityLevel securityLevel) const;



    virtual status_t setPlaybackId(

            Vector<uint8_t> const &sessionId,

            const char *playbackId);



    // Methods of IDrmPluginListener

    Return<void> sendEvent(EventType eventType,

            const hidl_vec<uint8_t>& sessionId, const hidl_vec<uint8_t>& data);

drm/libmediadrm/include/mediadrm/IDrm.h

+4 −0
Original line number Diff line number Diff line
@@ -152,6 +152,10 @@ struct IDrm : public virtual RefBase { 
            const char *mime,

            DrmPlugin::SecurityLevel securityLevel) const = 0;



    virtual status_t setPlaybackId(

            Vector<uint8_t> const &sessionId,

            const char *playbackId) = 0;



protected:

    IDrm() {}