diff options
author | Lajos Molnar <lajos@google.com> | 2014-02-10 17:47:07 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-10 17:47:07 +0000 |
commit | d2b566f34483882648a07bb6f46c3c1b0a2f5306 (patch) | |
tree | 0b975e0919e3fad3d117f494eff2c53ce1c5c2de | |
parent | 25da2f099f657d8b778ce3c03f5d4519e04150cf (diff) | |
parent | 61bdaaa18a1d52666827e31bb7980a5784443835 (diff) | |
download | frameworks_av-d2b566f34483882648a07bb6f46c3c1b0a2f5306.zip frameworks_av-d2b566f34483882648a07bb6f46c3c1b0a2f5306.tar.gz frameworks_av-d2b566f34483882648a07bb6f46c3c1b0a2f5306.tar.bz2 |
am 61bdaaa1: Merge "ChromiumHTTPDataSource: Keep track of the redirected URL"
* commit '61bdaaa18a1d52666827e31bb7980a5784443835':
ChromiumHTTPDataSource: Keep track of the redirected URL
-rw-r--r-- | media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp | 5 | ||||
-rw-r--r-- | media/libstagefright/chromium_http/support.cpp | 1 | ||||
-rw-r--r-- | media/libstagefright/include/ChromiumHTTPDataSource.h | 1 |
3 files changed, 7 insertions, 0 deletions
diff --git a/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp b/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp index a862d8b..7e5c280 100644 --- a/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp +++ b/media/libstagefright/chromium_http/ChromiumHTTPDataSource.cpp @@ -108,6 +108,11 @@ status_t ChromiumHTTPDataSource::connect_l( return mState == CONNECTED ? OK : mIOResult; } +void ChromiumHTTPDataSource::onRedirect(const char *url) { + Mutex::Autolock autoLock(mLock); + mURI = url; +} + void ChromiumHTTPDataSource::onConnectionEstablished( int64_t contentSize, const char *contentType) { Mutex::Autolock autoLock(mLock); diff --git a/media/libstagefright/chromium_http/support.cpp b/media/libstagefright/chromium_http/support.cpp index 0a8e3e3..3b33212 100644 --- a/media/libstagefright/chromium_http/support.cpp +++ b/media/libstagefright/chromium_http/support.cpp @@ -269,6 +269,7 @@ bool SfDelegate::getUID(uid_t *uid) const { void SfDelegate::OnReceivedRedirect( net::URLRequest *request, const GURL &new_url, bool *defer_redirect) { MY_LOGV("OnReceivedRedirect"); + mOwner->onRedirect(new_url.spec().c_str()); } void SfDelegate::OnAuthRequired( diff --git a/media/libstagefright/include/ChromiumHTTPDataSource.h b/media/libstagefright/include/ChromiumHTTPDataSource.h index 785f939..da188dd 100644 --- a/media/libstagefright/include/ChromiumHTTPDataSource.h +++ b/media/libstagefright/include/ChromiumHTTPDataSource.h @@ -113,6 +113,7 @@ private: void onConnectionFailed(status_t err); void onReadCompleted(ssize_t size); void onDisconnectComplete(); + void onRedirect(const char *url); void clearDRMState_l(); |