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

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

Snap for 8515382 from d477f2a8 to tm-release 

Change-Id: I174107bc507ce6bbd8377c3ffcd8564f22210ffe
parents e5361198 d477f2a8

drm/mediadrm/plugins/clearkey/service-lazy.mk

0 → 100644
+16 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2022 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#

PRODUCT_PACKAGES += android.hardware.drm-service-lazy.clearkey

drm/mediadrm/plugins/clearkey/service.mk

0 → 100644
+16 −0
Original line number Diff line number Diff line 
#

# Copyright (C) 2022 The Android Open Source Project

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

#

PRODUCT_PACKAGES += android.hardware.drm-service.clearkey

media/ndk/NdkMediaExtractor.cpp

+4 −2
Original line number Diff line number Diff line
@@ -388,9 +388,11 @@ AMediaCodecCryptoInfo *AMediaExtractor_getSampleCryptoInfo(AMediaExtractor *ex) 
        mode = CryptoPlugin::kMode_AES_CTR;

    }



    sp<ABuffer> clearbuf;

    sp<ABuffer> cryptedbuf;

    if (sizeof(uint32_t) != sizeof(size_t)) {

        sp<ABuffer> clearbuf   = U32ArrayToSizeBuf(numSubSamples, (uint32_t *)cleardata);

        sp<ABuffer> cryptedbuf = U32ArrayToSizeBuf(numSubSamples, (uint32_t *)crypteddata);

        clearbuf   = U32ArrayToSizeBuf(numSubSamples, (uint32_t *)cleardata);

        cryptedbuf = U32ArrayToSizeBuf(numSubSamples, (uint32_t *)crypteddata);

        cleardata   = clearbuf    == NULL ? NULL : clearbuf->data();

        crypteddata = crypteddata == NULL ? NULL : cryptedbuf->data();

        if(crypteddata == NULL || cleardata == NULL) {