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

Commit d4e747a5 authored by Robert Shih's avatar Robert Shih Committed by Gerrit Code Review
Browse files

Merge "New return type for setMediaDrmSession in Icrypto"

parents 10b32a70 5a48d1e5

drm/libmediadrm/CryptoHal.cpp

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ void CryptoHal::notifyResolution(uint32_t width, uint32_t height) { 
    mCryptoHalHidl->notifyResolution(width, height);

}



status_t CryptoHal::setMediaDrmSession(const Vector<uint8_t>& sessionId) {

DrmStatus CryptoHal::setMediaDrmSession(const Vector<uint8_t>& sessionId) {

    // This requires plugin to be created.

    if (mCryptoHalAidl->initCheck() == OK) return mCryptoHalAidl->setMediaDrmSession(sessionId);

    return mCryptoHalHidl->setMediaDrmSession(sessionId);

drm/libmediadrm/CryptoHalAidl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -260,7 +260,7 @@ void CryptoHalAidl::notifyResolution(uint32_t width, uint32_t height) { 
    }

}



status_t CryptoHalAidl::setMediaDrmSession(const Vector<uint8_t>& sessionId) {

DrmStatus CryptoHalAidl::setMediaDrmSession(const Vector<uint8_t>& sessionId) {

    Mutex::Autolock autoLock(mLock);



    if (mInitCheck != OK) {

drm/libmediadrm/CryptoHalHidl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -386,7 +386,7 @@ void CryptoHalHidl::notifyResolution(uint32_t width, uint32_t height) { 
    ALOGE_IF(!hResult.isOk(), "notifyResolution txn failed %s", hResult.description().c_str());

}



status_t CryptoHalHidl::setMediaDrmSession(const Vector<uint8_t>& sessionId) {

DrmStatus CryptoHalHidl::setMediaDrmSession(const Vector<uint8_t>& sessionId) {

    Mutex::Autolock autoLock(mLock);



    if (mInitCheck != OK) {

drm/libmediadrm/include/mediadrm/CryptoHal.h

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ struct CryptoHal : public ICrypto { 
    virtual bool requiresSecureDecoderComponent(

            const char *mime) const;

    virtual void notifyResolution(uint32_t width, uint32_t height);

    virtual status_t setMediaDrmSession(const Vector<uint8_t> &sessionId);

    virtual DrmStatus setMediaDrmSession(const Vector<uint8_t> &sessionId);

    virtual ssize_t decrypt(const uint8_t key[16], const uint8_t iv[16],

            CryptoPlugin::Mode mode, const CryptoPlugin::Pattern &pattern,

            const drm::V1_0::SharedBuffer &source, size_t offset,

drm/libmediadrm/include/mediadrm/CryptoHalAidl.h

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ struct CryptoHalAidl : public ICrypto { 
    virtual status_t destroyPlugin();

    virtual bool requiresSecureDecoderComponent(const char* mime) const;

    virtual void notifyResolution(uint32_t width, uint32_t height);

    virtual status_t setMediaDrmSession(const Vector<uint8_t>& sessionId);

    virtual DrmStatus setMediaDrmSession(const Vector<uint8_t>& sessionId);

    virtual ssize_t decrypt(const uint8_t key[16], const uint8_t iv[16], CryptoPlugin::Mode mode,

                            const CryptoPlugin::Pattern& pattern, const ::SharedBuffer& source,

                            size_t offset, const CryptoPlugin::SubSample* subSamples,