diff options
| author | Gloria Wang <gwang@google.com> | 2010-11-18 11:18:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-11-18 11:18:35 -0800 |
| commit | 14d32754d3a9c1ccf49188c489f224800cd747a7 (patch) | |
| tree | dee16a191c2e4b08082a8ebaf6729d41d99c1163 /media | |
| parent | e1b8cf1cafb75ce1339b67eb1764e224a257c579 (diff) | |
| parent | 771b85d9245a24273497792a2515d88d31c99e1e (diff) | |
| download | frameworks_av-14d32754d3a9c1ccf49188c489f224800cd747a7.zip frameworks_av-14d32754d3a9c1ccf49188c489f224800cd747a7.tar.gz frameworks_av-14d32754d3a9c1ccf49188c489f224800cd747a7.tar.bz2 | |
Merge "Add getUri() for streaming"
Diffstat (limited to 'media')
| -rw-r--r-- | media/libstagefright/NuCachedSource2.cpp | 3 | ||||
| -rw-r--r-- | media/libstagefright/NuHTTPDataSource.cpp | 4 | ||||
| -rw-r--r-- | media/libstagefright/include/NuCachedSource2.h | 1 | ||||
| -rw-r--r-- | media/libstagefright/include/NuHTTPDataSource.h | 1 |
4 files changed, 9 insertions, 0 deletions
diff --git a/media/libstagefright/NuCachedSource2.cpp b/media/libstagefright/NuCachedSource2.cpp index 4a2402b..3bb38de 100644 --- a/media/libstagefright/NuCachedSource2.cpp +++ b/media/libstagefright/NuCachedSource2.cpp @@ -526,5 +526,8 @@ void NuCachedSource2::getDrmInfo(DecryptHandle **handle, DrmManagerClient **clie mSource->getDrmInfo(handle, client); } +String8 NuCachedSource2::getUri() { + return mSource->getUri(); +} } // namespace android diff --git a/media/libstagefright/NuHTTPDataSource.cpp b/media/libstagefright/NuHTTPDataSource.cpp index 133f225..40f501a 100644 --- a/media/libstagefright/NuHTTPDataSource.cpp +++ b/media/libstagefright/NuHTTPDataSource.cpp @@ -424,4 +424,8 @@ void NuHTTPDataSource::getDrmInfo(DecryptHandle **handle, DrmManagerClient **cli *client = mDrmManagerClient; } +String8 NuHTTPDataSource::getUri() { + return mUri; +} + } // namespace android diff --git a/media/libstagefright/include/NuCachedSource2.h b/media/libstagefright/include/NuCachedSource2.h index 8cec1b1..5e404b6 100644 --- a/media/libstagefright/include/NuCachedSource2.h +++ b/media/libstagefright/include/NuCachedSource2.h @@ -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(); diff --git a/media/libstagefright/include/NuHTTPDataSource.h b/media/libstagefright/include/NuHTTPDataSource.h index c707fdc..0b840bd 100644 --- a/media/libstagefright/include/NuHTTPDataSource.h +++ b/media/libstagefright/include/NuHTTPDataSource.h @@ -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(); |