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

Commit b5a9b979 authored by Kyle Zhang's avatar Kyle Zhang
Browse files

Implementation of AMediaDrm_getKeyRequestWithDefaultUrlandType 

Add new NDK API AMediaDrm_getKeyRequestWithDefaultUrlandType to set keyRequestType and defaultUrl in addition to the functionality provided by AMediaDrm_getKeyRequest.

Related changes:
1. Add new API AMediaDrm_getKeyRequestWithDefaultUrlandType
2. Add new enum AMediaDrmKeyRequestType
3. Implementation of AMediaDrm_getKeyRequestWithDefaultUrlandType
4. CTS test

This CL includes:
3. Implementation of AMediaDrm_getKeyRequestWithDefaultUrlandType

Bug: 202186875
Test: CtsMediaDrmTestCases:NativeMediaDrmClearkeyTest
Change-Id: Ie32f7635d4be888d64b2040f95ebeaa5de59c63e
parent 074fbbdd

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

+1 −1
Original line number Diff line number Diff line
@@ -187,7 +187,7 @@ Status_V1_2 DrmPlugin::getKeyRequestCommon(const hidl_vec<uint8_t>& scope, 
        return Status_V1_2::ERROR_DRM_CANNOT_HANDLE;

    }



    *defaultUrl = "";

    *defaultUrl = "https://default.url";

    *keyRequestType = KeyRequestType_V1_1::UNKNOWN;

    *request = std::vector<uint8_t>();

media/ndk/NdkMediaDrm.cpp

+46 −4
Original line number Diff line number Diff line
@@ -97,6 +97,8 @@ struct AMediaDrm { 
    List<idvec_t> mIds;

    KeyedVector<String8, String8> mQueryResults;

    Vector<uint8_t> mKeyRequest;

    String8 mDefaultUrl;

    AMediaDrmKeyRequestType mkeyRequestType;

    Vector<uint8_t> mProvisionRequest;

    String8 mProvisionUrl;

    String8 mPropertyString;
@@ -416,6 +418,21 @@ media_status_t AMediaDrm_getKeyRequest(AMediaDrm *mObj, const AMediaDrmScope *sc 
        const AMediaDrmKeyValue *optionalParameters, size_t numOptionalParameters,

        const uint8_t **keyRequest, size_t *keyRequestSize) {



    return AMediaDrm_getKeyRequestWithDefaultUrlAndType(mObj,

        scope, init, initSize, mimeType, keyType, optionalParameters,

        numOptionalParameters, keyRequest,

        keyRequestSize, NULL, NULL);

}



EXPORT

media_status_t AMediaDrm_getKeyRequestWithDefaultUrlAndType(AMediaDrm *mObj,

        const AMediaDrmScope *scope, const uint8_t *init, size_t initSize,

        const char *mimeType, AMediaDrmKeyType keyType,

        const AMediaDrmKeyValue *optionalParameters,

        size_t numOptionalParameters, const uint8_t **keyRequest,

        size_t *keyRequestSize, const char **defaultUrl,

        AMediaDrmKeyRequestType *keyRequestType) {



    if (!mObj || mObj->mDrm == NULL) {

        return AMEDIA_ERROR_INVALID_OBJECT;

    }
@@ -449,18 +466,43 @@ media_status_t AMediaDrm_getKeyRequest(AMediaDrm *mObj, const AMediaDrmScope *sc 
        mdOptionalParameters.add(String8(optionalParameters[i].mKey),

                String8(optionalParameters[i].mValue));

    }

    String8 defaultUrl;

    DrmPlugin::KeyRequestType keyRequestType;



    DrmPlugin::KeyRequestType requestType;

    mObj->mKeyRequest.clear();

    status_t status = mObj->mDrm->getKeyRequest(*iter, mdInit, String8(mimeType),

            mdKeyType, mdOptionalParameters, mObj->mKeyRequest, defaultUrl,

            &keyRequestType);

            mdKeyType, mdOptionalParameters, mObj->mKeyRequest, mObj->mDefaultUrl,

            &requestType);

    if (status != OK) {

        return translateStatus(status);

    } else {

        *keyRequest = mObj->mKeyRequest.array();

        *keyRequestSize = mObj->mKeyRequest.size();

        if (defaultUrl != NULL)

            *defaultUrl = mObj->mDefaultUrl.string();

        switch(requestType) {

            case DrmPlugin::kKeyRequestType_Initial:

                mObj->mkeyRequestType = KEY_REQUEST_TYPE_INITIAL;

                break;

            case DrmPlugin::kKeyRequestType_Renewal:

                mObj->mkeyRequestType = KEY_REQUEST_TYPE_RENEWAL;

                break;

            case DrmPlugin::kKeyRequestType_Release:

                mObj->mkeyRequestType = KEY_REQUEST_TYPE_RELEASE;

                break;

            case DrmPlugin::kKeyRequestType_None:

                mObj->mkeyRequestType = KEY_REQUEST_TYPE_NONE;

                break;

            case DrmPlugin::kKeyRequestType_Update:

                mObj->mkeyRequestType = KEY_REQUEST_TYPE_UPDATE;

                break;

            default:

                return AMEDIA_ERROR_UNKNOWN;

        }



        if (keyRequestType != NULL)

            *keyRequestType = mObj->mkeyRequestType;

    }



    return AMEDIA_OK;

}