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

Commit bfe745ef authored by Dongwon Kang's avatar Dongwon Kang Committed by Android (Google) Code Review
Browse files

Merge "Remove unused code DataSource::getDrmInfo"

parents 68d88976 92541a35

media/libmediaextractor/include/media/DataSource.h

+0 −1
Original line number Diff line number Diff line
@@ -102,7 +102,6 @@ public: 
    virtual sp<DecryptHandle> DrmInitialization(const char * /*mime*/ = NULL) {

        return NULL;

    }

    virtual void getDrmInfo(sp<DecryptHandle> &/*handle*/, DrmManagerClient ** /*client*/) {};



    virtual String8 getUri() {

        return String8();

media/libstagefright/FileSource.cpp

+0 −6
Original line number Diff line number Diff line
@@ -194,12 +194,6 @@ sp<DecryptHandle> FileSource::DrmInitialization(const char *mime) { 
    return mDecryptHandle;

}



void FileSource::getDrmInfo(sp<DecryptHandle> &handle, DrmManagerClient **client) {

    handle = mDecryptHandle;



    *client = mDrmManagerClient;

}



ssize_t FileSource::readAtDRM(off64_t offset, void *data, size_t size) {

    size_t DRM_CACHE_SIZE = 1024;

    if (mDrmBuf == NULL) {

media/libstagefright/NuCachedSource2.cpp

+0 −4
Original line number Diff line number Diff line
@@ -681,10 +681,6 @@ sp<DecryptHandle> NuCachedSource2::DrmInitialization(const char* mime) { 
    return mSource->DrmInitialization(mime);

}



void NuCachedSource2::getDrmInfo(sp<DecryptHandle> &handle, DrmManagerClient **client) {

    mSource->getDrmInfo(handle, client);

}



String8 NuCachedSource2::getUri() {

    return mSource->getUri();

}

media/libstagefright/http/MediaHTTP.cpp

+0 −6
Original line number Diff line number Diff line
@@ -176,12 +176,6 @@ sp<DecryptHandle> MediaHTTP::DrmInitialization(const char* mime) { 
    return mDecryptHandle;

}



void MediaHTTP::getDrmInfo(

        sp<DecryptHandle> &handle, DrmManagerClient **client) {

    handle = mDecryptHandle;

    *client = mDrmManagerClient;

}



String8 MediaHTTP::getUri() {

    if (mInitCheck != OK) {

        return String8::empty();

media/libstagefright/include/NuCachedSource2.h

+0 −1
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ struct NuCachedSource2 : public DataSource { 
    virtual uint32_t flags();



    virtual sp<DecryptHandle> DrmInitialization(const char* mime);

    virtual void getDrmInfo(sp<DecryptHandle> &handle, DrmManagerClient **client);

    virtual String8 getUri();



    virtual String8 getMIMEType() const;