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

Commit 3d1c5a27 authored by Gloria Wang's avatar Gloria Wang Committed by Android (Google) Code Review
Browse files

Merge "Add getUri() for streaming"

parents 0c400f0a 43cd12da

include/media/stagefright/DataSource.h

+3 −0
Original line number Diff line number Diff line
@@ -80,6 +80,9 @@ public: 
    }

    virtual void getDrmInfo(DecryptHandle **handle, DrmManagerClient **client) {};



    virtual String8 getUri() {

        return String8();

    }



protected:

    virtual ~DataSource() {}

media/libstagefright/NuCachedSource2.cpp

+3 −0
Original line number Diff line number Diff line
@@ -526,5 +526,8 @@ void NuCachedSource2::getDrmInfo(DecryptHandle **handle, DrmManagerClient **clie 
    mSource->getDrmInfo(handle, client);

}



String8 NuCachedSource2::getUri() {

    return mSource->getUri();

}

}  // namespace android

media/libstagefright/NuHTTPDataSource.cpp

+4 −0
Original line number Diff line number Diff line
@@ -424,4 +424,8 @@ void NuHTTPDataSource::getDrmInfo(DecryptHandle **handle, DrmManagerClient **cli 
    *client = mDrmManagerClient;

}



String8 NuHTTPDataSource::getUri() {

    return mUri;

}



}  // namespace android

media/libstagefright/include/NuCachedSource2.h

+1 −0
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ struct NuCachedSource2 : public DataSource { 


    virtual DecryptHandle* DrmInitialization(DrmManagerClient *client);

    virtual void getDrmInfo(DecryptHandle **handle, DrmManagerClient **client);

    virtual String8 getUri();

    ////////////////////////////////////////////////////////////////////////////



    size_t cachedSize();

media/libstagefright/include/NuHTTPDataSource.h

+1 −0
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ struct NuHTTPDataSource : public DataSource { 


    virtual DecryptHandle* DrmInitialization(DrmManagerClient *client);

    virtual void getDrmInfo(DecryptHandle **handle, DrmManagerClient **client);

    virtual String8 getUri();



protected:

    virtual ~NuHTTPDataSource();