diff --git a/media/libstagefright/NuHTTPDataSource.cpp b/media/libstagefright/NuHTTPDataSource.cpp index 4ce72650f8702..653c85e5b91cb 100644 --- a/media/libstagefright/NuHTTPDataSource.cpp +++ b/media/libstagefright/NuHTTPDataSource.cpp @@ -158,6 +158,9 @@ status_t NuHTTPDataSource::connect( request.append(" HTTP/1.1\r\n"); request.append("Host: "); request.append(mHost); + if (mPort != 80) { + request.append(StringPrintf(":%u", mPort).c_str()); + } request.append("\r\n"); if (offset != 0) { diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp index d4a29c090be4f..38a7cc5e12fc1 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp @@ -14,6 +14,10 @@ * limitations under the License. */ +//#define LOG_NDEBUG 0 +#define LOG_TAG "M3UParser" +#include + #include "include/M3UParser.h" #include @@ -88,6 +92,9 @@ static bool MakeURL(const char *baseURL, const char *url, AString *out) { if (!strncasecmp("http://", url, 7)) { // "url" is already an absolute URL, ignore base URL. out->setTo(url); + + LOGV("base:'%s', url:'%s' => '%s'", baseURL, url, out->c_str()); + return true; } @@ -108,6 +115,8 @@ static bool MakeURL(const char *baseURL, const char *url, AString *out) { out->append(url); } + LOGV("base:'%s', url:'%s' => '%s'", baseURL, url, out->c_str()); + return true; }