diff options
| author | Chong Zhang <chz@google.com> | 2015-05-07 18:19:00 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-07 18:19:01 +0000 |
| commit | 70c75d8c15707d5eade38fe3e622f8500c29556b (patch) | |
| tree | 442891270258039a129cdecc16acaae686feda5f | |
| parent | 3f4431e97376b8a315ad8862724e1e1fb34c9292 (diff) | |
| parent | 5efccd8da813133060c089c647b07434116406cb (diff) | |
| download | frameworks_av-70c75d8c15707d5eade38fe3e622f8500c29556b.zip frameworks_av-70c75d8c15707d5eade38fe3e622f8500c29556b.tar.gz frameworks_av-70c75d8c15707d5eade38fe3e622f8500c29556b.tar.bz2 | |
Merge "RTSP: append track URL to base URL" into mnc-dev
| -rw-r--r-- | media/libstagefright/rtsp/MyHandler.h | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h index 00f071b..ba17e90 100644 --- a/media/libstagefright/rtsp/MyHandler.h +++ b/media/libstagefright/rtsp/MyHandler.h @@ -1673,21 +1673,11 @@ private: } size_t n = strlen(baseURL); - if (baseURL[n - 1] == '/') { - out->setTo(baseURL); - out->append(url); - } else { - const char *slashPos = strrchr(baseURL, '/'); - - if (slashPos > &baseURL[6]) { - out->setTo(baseURL, slashPos - baseURL); - } else { - out->setTo(baseURL); - } - + out->setTo(baseURL); + if (baseURL[n - 1] != '/') { out->append("/"); - out->append(url); } + out->append(url); return true; } |