Merge "Modified that logs do not include URLs." (441e6198) · Commits · e / os / android_frameworks_av

media/libstagefright/httplive/LiveSession.cpp

+4 −4

Original line number	Diff line number	Diff line
		@@ -1234,7 +1234,7 @@ bool LiveSession::resumeFetcher(
		const AString &uri, uint32_t streamMask, int64_t timeUs, bool newUri) {
		ssize_t index = mFetcherInfos.indexOfKey(uri);
		if (index < 0) {
		ALOGE("did not find fetcher for uri: %s", uri.c_str());
		ALOGE("did not find fetcher for uri: %s", uriDebugString(uri).c_str());
		return false;
		}

		@@ -2005,7 +2005,7 @@ void LiveSession::tryToFinishBandwidthSwitch(const AString &oldUri) {

		if ((mNewStreamMask & stream) && mStreams[idx].mNewUri.empty()) {
		ALOGW("swapping stream type %d %s to empty stream",
		stream, mStreams[idx].mUri.c_str());
		stream, uriDebugString(mStreams[idx].mUri).c_str());
		}
		mStreams[idx].mUri = mStreams[idx].mNewUri;
		mStreams[idx].mNewUri.clear();
		@@ -2033,7 +2033,7 @@ void LiveSession::tryToFinishBandwidthSwitch(const AString &oldUri) {
		CHECK(idx >= 0);
		if (mStreams[idx].mNewUri.empty()) {
		ALOGW("swapping extra stream type %d %s to empty stream",
		stream, mStreams[idx].mUri.c_str());
		stream, uriDebugString(mStreams[idx].mUri).c_str());
		}
		mStreams[idx].mUri = mStreams[idx].mNewUri;
		mStreams[idx].mNewUri.clear();
		@@ -2138,7 +2138,7 @@ void LiveSession::cancelBandwidthSwitch(bool resume) {
		ALOGV("stopping newUri = %s", newUri.c_str());
		ssize_t index = mFetcherInfos.indexOfKey(newUri);
		if (index < 0) {
		ALOGE("did not find fetcher for newUri: %s", newUri.c_str());
		ALOGE("did not find fetcher for newUri: %s", uriDebugString(newUri).c_str());
		continue;
		}
		FetcherInfo &info = mFetcherInfos.editValueAt(index);

+1 −2

Original line number	Diff line number	Diff line
		@@ -1205,8 +1205,7 @@ status_t M3UParser::parseMedia(const AString &line) {
		if (val.size() < 2
		\|\| val.c_str()[0] != '"'
		\|\| val.c_str()[val.size() - 1] != '"') {
		ALOGE("Expected quoted string for URI, got '%s' instead.",
		val.c_str());
		ALOGE("Expected quoted string for URI.");

		return ERROR_MALFORMED;
		}

+3 −3

Original line number	Diff line number	Diff line
		@@ -365,10 +365,10 @@ status_t PlaylistFetcher::decryptBuffer(
		if (err == ERROR_NOT_CONNECTED) {
		return ERROR_NOT_CONNECTED;
		} else if (err < 0) {
		ALOGE("failed to fetch cipher key from '%s'.", keyURI.c_str());
		ALOGE("failed to fetch cipher key from '%s'.", uriDebugString(keyURI).c_str());
		return ERROR_IO;
		} else if (key->size() != 16) {
		ALOGE("key file '%s' wasn't 16 bytes in size.", keyURI.c_str());
		ALOGE("key file '%s' wasn't 16 bytes in size.", uriDebugString(keyURI).c_str());
		return ERROR_MALFORMED;
		}

		@@ -1366,7 +1366,7 @@ void PlaylistFetcher::onDownloadNext() {
		}
		if (bytesRead < 0) {
		status_t err = bytesRead;
		ALOGE("failed to fetch .ts segment at url '%s'", uri.c_str());
		ALOGE("failed to fetch .ts segment at url '%s'", uriDebugString(uri).c_str());
		notifyError(err);
		return;
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -255,7 +255,7 @@ void ARTSPConnection::onConnect(const sp<AMessage> &msg) {

		struct hostent *ent = gethostbyname(host.c_str());
		if (ent == NULL) {
		ALOGE("Unknown host %s", host.c_str());
		ALOGE("Unknown host %s", uriDebugString(host).c_str());

		reply->setInt32("result", -ENOENT);
		reply->post();

+1 −1

Original line number	Diff line number	Diff line
		@@ -80,7 +80,7 @@ bool ASessionDescription::parse(const void *data, size_t size) {
		return false;
		}

		ALOGI("%s", line.c_str());
		ALOGV("%s", line.c_str());

		switch (line.c_str()[0]) {
		case 'v':