diff options
| author | Marco Nelissen <marcone@google.com> | 2014-03-12 15:41:55 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-03-12 15:41:56 +0000 |
| commit | 19afb3869eb6a3e3733dc1f7420e1d4c3c03d376 (patch) | |
| tree | 27b482128c9930b9b0ce78f1e24f365131fcf20b | |
| parent | 2ad7af29bb667d939f27417011567847c4b62f94 (diff) | |
| parent | a8b8488f703bb6bda039d7d98f87e4f9d845664d (diff) | |
| download | frameworks_av-19afb3869eb6a3e3733dc1f7420e1d4c3c03d376.zip frameworks_av-19afb3869eb6a3e3733dc1f7420e1d4c3c03d376.tar.gz frameworks_av-19afb3869eb6a3e3733dc1f7420e1d4c3c03d376.tar.bz2 | |
Merge "Remove streaming URI from default logs"
| -rw-r--r-- | media/libstagefright/httplive/LiveSession.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/httplive/M3UParser.cpp | 3 | ||||
| -rw-r--r-- | media/libstagefright/rtsp/ARTSPConnection.cpp | 2 | ||||
| -rw-r--r-- | media/libstagefright/rtsp/MyHandler.h | 2 | ||||
| -rw-r--r-- | media/libstagefright/rtsp/SDPLoader.cpp | 2 |
5 files changed, 5 insertions, 6 deletions
diff --git a/media/libstagefright/httplive/LiveSession.cpp b/media/libstagefright/httplive/LiveSession.cpp index fc1353a..bdf5787 100644 --- a/media/libstagefright/httplive/LiveSession.cpp +++ b/media/libstagefright/httplive/LiveSession.cpp @@ -400,7 +400,7 @@ void LiveSession::onConnect(const sp<AMessage> &msg) { mPlaylist = fetchPlaylist(url.c_str(), NULL /* curPlaylistHash */, &dummy); if (mPlaylist == NULL) { - ALOGE("unable to fetch master playlist '%s'.", url.c_str()); + ALOGE("unable to fetch master playlist <URL suppressed>."); postPrepared(ERROR_IO); return; diff --git a/media/libstagefright/httplive/M3UParser.cpp b/media/libstagefright/httplive/M3UParser.cpp index 5ef7c0f..0f390c3 100644 --- a/media/libstagefright/httplive/M3UParser.cpp +++ b/media/libstagefright/httplive/M3UParser.cpp @@ -780,8 +780,7 @@ status_t M3UParser::parseCipherInfo( if (MakeURL(baseURI.c_str(), val.c_str(), &absURI)) { val = absURI; } else { - ALOGE("failed to make absolute url for '%s'.", - val.c_str()); + ALOGE("failed to make absolute url for <URL suppressed>."); } } diff --git a/media/libstagefright/rtsp/ARTSPConnection.cpp b/media/libstagefright/rtsp/ARTSPConnection.cpp index efde7a9..492bd4a 100644 --- a/media/libstagefright/rtsp/ARTSPConnection.cpp +++ b/media/libstagefright/rtsp/ARTSPConnection.cpp @@ -239,7 +239,7 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) { // right here, since we currently have no way of asking the user // for this information. - ALOGE("Malformed rtsp url %s", url.c_str()); + ALOGE("Malformed rtsp url <URL suppressed>"); reply->setInt32("result", ERROR_MALFORMED); reply->post(); diff --git a/media/libstagefright/rtsp/MyHandler.h b/media/libstagefright/rtsp/MyHandler.h index cd77aa0..1093b47 100644 --- a/media/libstagefright/rtsp/MyHandler.h +++ b/media/libstagefright/rtsp/MyHandler.h @@ -149,7 +149,7 @@ struct MyHandler : public AHandler { mSessionURL.append(StringPrintf("%u", port)); mSessionURL.append(path); - ALOGI("rewritten session url: '%s'", mSessionURL.c_str()); + ALOGV("rewritten session url: '%s'", mSessionURL.c_str()); } mSessionHost = host; diff --git a/media/libstagefright/rtsp/SDPLoader.cpp b/media/libstagefright/rtsp/SDPLoader.cpp index ed3fa7e..3c7d82a 100644 --- a/media/libstagefright/rtsp/SDPLoader.cpp +++ b/media/libstagefright/rtsp/SDPLoader.cpp @@ -95,7 +95,7 @@ void SDPLoader::onLoad(const sp<AMessage> &msg) { msg->findPointer("headers", (void **)&headers); if (!(mFlags & kFlagIncognito)) { - ALOGI("onLoad '%s'", url.c_str()); + ALOGV("onLoad '%s'", url.c_str()); } else { ALOGI("onLoad <URL suppressed>"); } |