resolved conflicts for merge of f285c91e to master (87cebadd) · Commits · e / os / android_frameworks_av

camera/VendorTagDescriptor.cpp

+4 −4

media/libnbaio/NBLog.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -438,7 +438,7 @@ void NBLog::Reader::dump(int fd, size_t indent)
	void NBLog::Reader::dumpLine(const String8& timestamp, String8& body)		void NBLog::Reader::dumpLine(const String8& timestamp, String8& body)
	{		{
	if (mFd >= 0) {		if (mFd >= 0) {
	fdprintf(mFd, "%.*s%s %s\n", mIndent, "", timestamp.string(), body.string());		dprintf(mFd, "%.*s%s %s\n", mIndent, "", timestamp.string(), body.string());
	} else {		} else {
	ALOGI("%.*s%s %s", mIndent, "", timestamp.string(), body.string());		ALOGI("%.*s%s %s", mIndent, "", timestamp.string(), body.string());
	}		}

services/audioflinger/AudioFlinger.cpp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -427,7 +427,7 @@ status_t AudioFlinger::dump(int fd, const Vector<String16>& args)
	if (mLogMemoryDealer != 0) {		if (mLogMemoryDealer != 0) {
	sp<IBinder> binder = defaultServiceManager()->getService(String16("media.log"));		sp<IBinder> binder = defaultServiceManager()->getService(String16("media.log"));
	if (binder != 0) {		if (binder != 0) {
	fdprintf(fd, "\nmedia.log:\n");		dprintf(fd, "\nmedia.log:\n");
	Vector<String16> args;		Vector<String16> args;
	binder->dump(fd, args);		binder->dump(fd, args);
	}		}
	@@ -2590,7 +2590,7 @@ void AudioFlinger::dumpTee(int fd, const sp<NBAIO_Source>& source, audio_io_hand
	}		}
	} else {		} else {
	if (fd >= 0) {		if (fd >= 0) {
	fdprintf(fd, "unable to rotate tees in %s: %s\n", teePath, strerror(errno));		dprintf(fd, "unable to rotate tees in %s: %s\n", teePath, strerror(errno));
	}		}
	}		}
	char teeTime[16];		char teeTime[16];
	@@ -2644,11 +2644,11 @@ void AudioFlinger::dumpTee(int fd, const sp<NBAIO_Source>& source, audio_io_hand
	write(teeFd, &temp, sizeof(temp));		write(teeFd, &temp, sizeof(temp));
	close(teeFd);		close(teeFd);
	if (fd >= 0) {		if (fd >= 0) {
	fdprintf(fd, "tee copied to %s\n", teePath);		dprintf(fd, "tee copied to %s\n", teePath);
	}		}
	} else {		} else {
	if (fd >= 0) {		if (fd >= 0) {
	fdprintf(fd, "unable to create tee %s: %s\n", teePath, strerror(errno));		dprintf(fd, "unable to create tee %s: %s\n", teePath, strerror(errno));
	}		}
	}		}
	}		}

services/audioflinger/AudioWatchdog.cpp

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -34,7 +34,7 @@ void AudioWatchdogDump::dump(int fd)
	} else {		} else {
	strcpy(buf, "N/A\n");		strcpy(buf, "N/A\n");
	}		}
	fdprintf(fd, "Watchdog: underruns=%u, logs=%u, most recent underrun log at %s",		dprintf(fd, "Watchdog: underruns=%u, logs=%u, most recent underrun log at %s",
	mUnderruns, mLogs, buf);		mUnderruns, mLogs, buf);
	}		}

services/audioflinger/FastMixer.cpp

+31 −31

Original line number	Original line	Diff line number	Diff line
	@@ -349,18 +349,18 @@ void VendorTagDescriptor::dump(int fd, int verbosity, int indentation) const {

	size_t size = mTagToNameMap.size();		size_t size = mTagToNameMap.size();
	if (size == 0) {		if (size == 0) {
	fdprintf(fd, "%*sDumping configured vendor tag descriptors: None set\n",		dprintf(fd, "%*sDumping configured vendor tag descriptors: None set\n",
	indentation, "");		indentation, "");
	return;		return;
	}		}

	fdprintf(fd, "%*sDumping configured vendor tag descriptors: %zu entries\n",		dprintf(fd, "%*sDumping configured vendor tag descriptors: %zu entries\n",
	indentation, "", size);		indentation, "", size);
	for (size_t i = 0; i < size; ++i) {		for (size_t i = 0; i < size; ++i) {
	uint32_t tag = mTagToNameMap.keyAt(i);		uint32_t tag = mTagToNameMap.keyAt(i);

	if (verbosity < 1) {		if (verbosity < 1) {
	fdprintf(fd, "%*s0x%x\n", indentation + 2, "", tag);		dprintf(fd, "%*s0x%x\n", indentation + 2, "", tag);
	continue;		continue;
	}		}
	String8 name = mTagToNameMap.valueAt(i);		String8 name = mTagToNameMap.valueAt(i);
	@@ -369,7 +369,7 @@ void VendorTagDescriptor::dump(int fd, int verbosity, int indentation) const {
	int type = mTagToTypeMap.valueFor(tag);		int type = mTagToTypeMap.valueFor(tag);
	const char* typeName = (type >= 0 && type < NUM_TYPES) ?		const char* typeName = (type >= 0 && type < NUM_TYPES) ?
	camera_metadata_type_names[type] : "UNKNOWN";		camera_metadata_type_names[type] : "UNKNOWN";
	fdprintf(fd, "%*s0x%x (%s) with type %d (%s) defined in section %s\n", indentation + 2,		dprintf(fd, "%*s0x%x (%s) with type %d (%s) defined in section %s\n", indentation + 2,
	"", tag, name.string(), type, typeName, sectionName.string());		"", tag, name.string(), type, typeName, sectionName.string());
	}		}

Original line number	Original line	Diff line number	Diff line
	@@ -461,7 +461,7 @@ static int compare_uint32_t(const void pa, const void pb)
	void FastMixerDumpState::dump(int fd) const		void FastMixerDumpState::dump(int fd) const
	{		{
	if (mCommand == FastMixerState::INITIAL) {		if (mCommand == FastMixerState::INITIAL) {
	fdprintf(fd, " FastMixer not initialized\n");		dprintf(fd, " FastMixer not initialized\n");
	return;		return;
	}		}
	#define COMMAND_MAX 32		#define COMMAND_MAX 32
	@@ -495,7 +495,7 @@ void FastMixerDumpState::dump(int fd) const
	double measuredWarmupMs = (mMeasuredWarmupTs.tv_sec * 1000.0) +		double measuredWarmupMs = (mMeasuredWarmupTs.tv_sec * 1000.0) +
	(mMeasuredWarmupTs.tv_nsec / 1000000.0);		(mMeasuredWarmupTs.tv_nsec / 1000000.0);
	double mixPeriodSec = (double) mFrameCount / (double) mSampleRate;		double mixPeriodSec = (double) mFrameCount / (double) mSampleRate;
	fdprintf(fd, " FastMixer command=%s writeSequence=%u framesWritten=%u\n"		dprintf(fd, " FastMixer command=%s writeSequence=%u framesWritten=%u\n"
	" numTracks=%u writeErrors=%u underruns=%u overruns=%u\n"		" numTracks=%u writeErrors=%u underruns=%u overruns=%u\n"
	" sampleRate=%u frameCount=%zu measuredWarmup=%.3g ms, warmupCycles=%u\n"		" sampleRate=%u frameCount=%zu measuredWarmup=%.3g ms, warmupCycles=%u\n"
	" mixPeriod=%.2f ms\n",		" mixPeriod=%.2f ms\n",
	@@ -550,24 +550,24 @@ void FastMixerDumpState::dump(int fd) const
	#endif		#endif
	}		}
	if (n) {		if (n) {
	fdprintf(fd, " Simple moving statistics over last %.1f seconds:\n",		dprintf(fd, " Simple moving statistics over last %.1f seconds:\n",
	wall.n() * mixPeriodSec);		wall.n() * mixPeriodSec);
	fdprintf(fd, " wall clock time in ms per mix cycle:\n"		dprintf(fd, " wall clock time in ms per mix cycle:\n"
	" mean=%.2f min=%.2f max=%.2f stddev=%.2f\n",		" mean=%.2f min=%.2f max=%.2f stddev=%.2f\n",
	wall.mean()1e-6, wall.minimum()1e-6, wall.maximum()*1e-6,		wall.mean()1e-6, wall.minimum()1e-6, wall.maximum()*1e-6,
	wall.stddev()*1e-6);		wall.stddev()*1e-6);
	fdprintf(fd, " raw CPU load in us per mix cycle:\n"		dprintf(fd, " raw CPU load in us per mix cycle:\n"
	" mean=%.0f min=%.0f max=%.0f stddev=%.0f\n",		" mean=%.0f min=%.0f max=%.0f stddev=%.0f\n",
	loadNs.mean()1e-3, loadNs.minimum()1e-3, loadNs.maximum()*1e-3,		loadNs.mean()1e-3, loadNs.minimum()1e-3, loadNs.maximum()*1e-3,
	loadNs.stddev()*1e-3);		loadNs.stddev()*1e-3);
	} else {		} else {
	fdprintf(fd, " No FastMixer statistics available currently\n");		dprintf(fd, " No FastMixer statistics available currently\n");
	}		}
	#ifdef CPU_FREQUENCY_STATISTICS		#ifdef CPU_FREQUENCY_STATISTICS
	fdprintf(fd, " CPU clock frequency in MHz:\n"		dprintf(fd, " CPU clock frequency in MHz:\n"
	" mean=%.0f min=%.0f max=%.0f stddev=%.0f\n",		" mean=%.0f min=%.0f max=%.0f stddev=%.0f\n",
	kHz.mean()1e-3, kHz.minimum()1e-3, kHz.maximum()1e-3, kHz.stddev()1e-3);		kHz.mean()1e-3, kHz.minimum()1e-3, kHz.maximum()1e-3, kHz.stddev()1e-3);
	fdprintf(fd, " adjusted CPU load in MHz (i.e. normalized for CPU clock frequency):\n"		dprintf(fd, " adjusted CPU load in MHz (i.e. normalized for CPU clock frequency):\n"
	" mean=%.1f min=%.1f max=%.1f stddev=%.1f\n",		" mean=%.1f min=%.1f max=%.1f stddev=%.1f\n",
	loadMHz.mean(), loadMHz.minimum(), loadMHz.maximum(), loadMHz.stddev());		loadMHz.mean(), loadMHz.minimum(), loadMHz.maximum(), loadMHz.stddev());