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

Commit 892a6a34 authored by Jeff Tinker's avatar Jeff Tinker Committed by Android (Google) Code Review
Browse files

Merge "Remove MediaDrm stack from mediaserver" into nyc-dev

parents 6373dc72 d12b7c06

media/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ LOCAL_SHARED_LIBRARIES := \ 
    libutils \

    libbinder \

    libmedia \

    libmediadrm \

    libskia \

    libui \

    liblog \

media/jni/android_media_MediaCrypto.cpp

+6 −23
Original line number Diff line number Diff line
@@ -28,7 +28,6 @@ 
#include <cutils/properties.h>

#include <media/ICrypto.h>

#include <media/IMediaDrmService.h>

#include <media/IMediaPlayerService.h>

#include <media/stagefright/foundation/ADebug.h>



namespace android {
@@ -63,30 +62,14 @@ JCrypto::~JCrypto() { 
// static

sp<ICrypto> JCrypto::MakeCrypto() {

    sp<IServiceManager> sm = defaultServiceManager();

    sp<ICrypto> crypto;



    char value[PROPERTY_VALUE_MAX];

    if (property_get("media.mediadrmservice.enable", value, NULL)

        && (!strcmp("1", value) || !strcasecmp("true", value))) {

        sp<IBinder> binder =

            sm->getService(String16("media.drm"));

        sp<IMediaDrmService> service =

            interface_cast<IMediaDrmService>(binder);

        if (service == NULL) {

            return NULL;

        }

        crypto = service->makeCrypto();

    } else {

        sp<IBinder> binder =

            sm->getService(String16("media.player"));

        sp<IMediaPlayerService> service =

            interface_cast<IMediaPlayerService>(binder);



    sp<IBinder> binder = sm->getService(String16("media.drm"));

    sp<IMediaDrmService> service = interface_cast<IMediaDrmService>(binder);

    if (service == NULL) {

        return NULL;

    }

        crypto = service->makeCrypto();

    }



    sp<ICrypto> crypto = service->makeCrypto();

    if (crypto == NULL || (crypto->initCheck() != OK && crypto->initCheck() != NO_INIT)) {

        return NULL;

    }

media/jni/android_media_MediaDrm.cpp

+6 −23
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ 
#include <cutils/properties.h>

#include <media/IDrm.h>

#include <media/IMediaDrmService.h>

#include <media/IMediaPlayerService.h>

#include <media/stagefright/foundation/ADebug.h>

#include <media/stagefright/MediaErrors.h>
@@ -354,30 +353,14 @@ JDrm::~JDrm() { 
// static

sp<IDrm> JDrm::MakeDrm() {

    sp<IServiceManager> sm = defaultServiceManager();

    sp<IDrm> drm;



    char value[PROPERTY_VALUE_MAX];

    if (property_get("media.mediadrmservice.enable", value, NULL)

        && (!strcmp("1", value) || !strcasecmp("true", value))) {

        sp<IBinder> binder =

            sm->getService(String16("media.drm"));

        sp<IMediaDrmService> service =

            interface_cast<IMediaDrmService>(binder);

        if (service == NULL) {

            return NULL;

        }

        drm = service->makeDrm();

    } else {

        sp<IBinder> binder =

            sm->getService(String16("media.player"));

        sp<IMediaPlayerService> service =

            interface_cast<IMediaPlayerService>(binder);



    sp<IBinder> binder = sm->getService(String16("media.drm"));

    sp<IMediaDrmService> service = interface_cast<IMediaDrmService>(binder);

    if (service == NULL) {

        return NULL;

    }

        drm = service->makeDrm();

    }



    sp<IDrm> drm = service->makeDrm();

    if (drm == NULL || (drm->initCheck() != OK && drm->initCheck() != NO_INIT)) {

        return NULL;

    }