Merge "Fix issues with extractor dumpsys" am: 24cd6995c7 (7944a0a5) · Commits · e / os / android_frameworks_av

media/libmedia/IMediaExtractor.cpp

+15 −5

Original line number	Diff line number	Diff line
		@@ -209,13 +209,18 @@ String8 ExtractorInstance::toString() const {
		for (size_t i = 0; i < tracks.size(); i++) {
		const String8 desc = trackDescriptions.itemAt(i);
		str.appendFormat(" track {%s} ", desc.string());
		const sp<IMediaSource> source = tracks.itemAt(i).promote();
		wp<IMediaSource> wSource = tracks.itemAt(i);
		if (wSource == NULL) {
		str.append(": null\n");
		} else {
		const sp<IMediaSource> source = wSource.promote();
		if (source == NULL) {
		str.append(": deleted\n");
		} else {
		str.appendFormat(": active\n");
		}
		}
		}
		return str;
		}

		@@ -232,9 +237,14 @@ void registerMediaSource(
		if (extractor != NULL && extractor == ex) {
		if (instance.tracks.size() > 5) {
		instance.tracks.resize(5);
		instance.trackDescriptions.resize(5);
		}
		instance.tracks.push_front(source);
		instance.trackDescriptions.add(source->getFormat()->toString());
		if (source != NULL) {
		instance.trackDescriptions.push_front(source->getFormat()->toString());
		} else {
		instance.trackDescriptions.push_front(String8::empty());
		}
		break;
		}
		}