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

Commit bc8ac069 authored by Android Build Coastguard Worker's avatar Android Build Coastguard Worker
Browse files

Merge cherrypicks of [19008482, 20001918] into tm-d1-release. 

Change-Id: Id62833a7dfb661b6a7892490eb59f4a435600c30
parents 8051a196 5db434f8

drm/mediadrm/plugins/clearkey/hidl/DrmPlugin.cpp

+2 −0
Original line number Diff line number Diff line
@@ -619,6 +619,7 @@ Return<void> DrmPlugin::getSecurityLevel(const hidl_vec<uint8_t>& sessionId, 
        return Void();

    }



    Mutex::Autolock lock(mSecurityLevelLock);

    std::map<std::vector<uint8_t>, SecurityLevel>::iterator itr =

            mSecurityLevel.find(sid);

    if (itr == mSecurityLevel.end()) {
@@ -691,6 +692,7 @@ Return<Status> DrmPlugin::setSecurityLevel(const hidl_vec<uint8_t>& sessionId, 
        return Status::ERROR_DRM_SESSION_NOT_OPENED;

    }



    Mutex::Autolock lock(mSecurityLevelLock);

    std::map<std::vector<uint8_t>, SecurityLevel>::iterator itr =

            mSecurityLevel.find(sid);

    if (itr != mSecurityLevel.end()) {

drm/mediadrm/plugins/clearkey/hidl/include/DrmPlugin.h

+3 −1
Original line number Diff line number Diff line
@@ -414,7 +414,8 @@ private: 
    std::map<std::string, std::vector<uint8_t> > mByteArrayProperties;

    std::map<std::string, std::vector<uint8_t> > mReleaseKeysMap;

    std::map<std::vector<uint8_t>, std::string> mPlaybackId;

    std::map<std::vector<uint8_t>, SecurityLevel> mSecurityLevel;

    std::map<std::vector<uint8_t>, SecurityLevel> mSecurityLevel

        GUARDED_BY(mSecurityLevelLock);

    sp<IDrmPluginListener> mListener;

    sp<IDrmPluginListener_V1_2> mListenerV1_2;

    SessionLibrary *mSessionLibrary;
@@ -434,6 +435,7 @@ private: 


    DeviceFiles mFileHandle;

    Mutex mSecureStopLock;

    Mutex mSecurityLevelLock;



    CLEARKEY_DISALLOW_COPY_AND_ASSIGN_AND_NEW(DrmPlugin);

};

media/libstagefright/FrameDecoder.cpp

+8 −5
Original line number Diff line number Diff line
@@ -86,11 +86,14 @@ sp<IMemory> allocVideoFrame(const sp<MetaData>& trackMeta, 
        displayHeight = height;

    }



    if (allocRotated && (rotationAngle == 90 || rotationAngle == 270)) {

        int32_t tmp;

        tmp = width; width = height; height = tmp;

        tmp = displayWidth; displayWidth = displayHeight; displayHeight = tmp;

        tmp = tileWidth; tileWidth = tileHeight; tileHeight = tmp;

    if (allocRotated) {

        if (rotationAngle == 90 || rotationAngle == 270) {

            // swap width and height for 90 & 270 degrees rotation

            std::swap(width, height);

            std::swap(displayWidth, displayHeight);

            std::swap(tileWidth, tileHeight);

        }

        // Rotation is already applied.

        rotationAngle = 0;

    }