diff options
| author | Andreas Huber <andih@google.com> | 2014-03-14 15:45:54 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-14 15:45:54 +0000 |
| commit | f10b9885462bea2f0c683038d6833ee230ad9eb2 (patch) | |
| tree | 27ff83a16ba4a15210f9ff3b380843b5485d9ae9 /media/libstagefright | |
| parent | f6bd712c8c252733f9d033ef60219ff1de9342ad (diff) | |
| parent | 4a67fc49d926c75fa6a96160ba5627fb0e209db6 (diff) | |
| download | frameworks_av-f10b9885462bea2f0c683038d6833ee230ad9eb2.zip frameworks_av-f10b9885462bea2f0c683038d6833ee230ad9eb2.tar.gz frameworks_av-f10b9885462bea2f0c683038d6833ee230ad9eb2.tar.bz2 | |
am 4a67fc49: Merge "Implemented support for RTSP 301 Redirect"
* commit '4a67fc49d926c75fa6a96160ba5627fb0e209db6':
Implemented support for RTSP 301 Redirect
Diffstat (limited to 'media/libstagefright')
| -rw-r--r-- | media/libstagefright/rtsp/MyHandler.h | 33 |
1 files changed, 22 insertions, 11 deletions
diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h index 1093b47..e7580c2 100644 --- a/media/libstagefright/rtsp/MyHandler.h +++ b/media/libstagefright/rtsp/MyHandler.h @@ -478,21 +478,32 @@ struct MyHandler : public AHandler { sp<ARTSPResponse> response = static_cast<ARTSPResponse *>(obj.get()); - if (response->mStatusCode == 302) { + if (response->mStatusCode == 301 || response->mStatusCode == 302) { ssize_t i = response->mHeaders.indexOfKey("location"); CHECK_GE(i, 0); - mSessionURL = response->mHeaders.valueAt(i); - - AString request; - request = "DESCRIBE "; - request.append(mSessionURL); - request.append(" RTSP/1.0\r\n"); - request.append("Accept: application/sdp\r\n"); - request.append("\r\n"); + mOriginalSessionURL = response->mHeaders.valueAt(i); + mSessionURL = mOriginalSessionURL; + + // Strip any authentication info from the session url, we don't + // want to transmit user/pass in cleartext. + AString host, path, user, pass; + unsigned port; + if (ARTSPConnection::ParseURL( + mSessionURL.c_str(), &host, &port, &path, &user, &pass) + && user.size() > 0) { + mSessionURL.clear(); + mSessionURL.append("rtsp://"); + mSessionURL.append(host); + mSessionURL.append(":"); + mSessionURL.append(StringPrintf("%u", port)); + mSessionURL.append(path); + + ALOGI("rewritten session url: '%s'", mSessionURL.c_str()); + } - sp<AMessage> reply = new AMessage('desc', id()); - mConn->sendRequest(request.c_str(), reply); + sp<AMessage> reply = new AMessage('conn', id()); + mConn->connect(mOriginalSessionURL.c_str(), reply); break; } |