Merge "Fix -Wextra warnings in frameworks/av/include" into oc-dev (ae1c19fc) · Commits · e / os / android_frameworks_av

include/media/Interpolator.h

+3 −3

Original line number	Original line	Diff line number	Diff line
	@@ -152,8 +152,8 @@ public:
	: mLastSlope;		: mLastSlope;
	} else {		} else {
	// finite difference spline		// finite difference spline
	m0 = (sec0 + sec) * 0.5;		m0 = (sec0 + sec) * 0.5f;
	m1 = (sec1 + sec) * 0.5;		m1 = (sec1 + sec) * 0.5f;
	}		}

	if (monotonic) {		if (monotonic) {
	@@ -294,7 +294,7 @@ public:

	std::string toString() const {		std::string toString() const {
	std::stringstream ss;		std::stringstream ss;
	ss << "mInterpolatorType: " << mInterpolatorType << std::endl;		ss << "mInterpolatorType: " << static_cast<int32_t>(mInterpolatorType) << std::endl;
	ss << "mFirstSlope: " << mFirstSlope << std::endl;		ss << "mFirstSlope: " << mFirstSlope << std::endl;
	ss << "mLastSlope: " << mLastSlope << std::endl;		ss << "mLastSlope: " << mLastSlope << std::endl;
	for (const auto &pt : *this) {		for (const auto &pt : *this) {

include/media/VolumeShaper.h

+10 −7

Original line number	Original line	Diff line number	Diff line
	@@ -89,6 +89,7 @@ public:

	Configuration()		Configuration()
	: Interpolator<S, T>()		: Interpolator<S, T>()
			, RefBase()
	, mType(TYPE_SCALE)		, mType(TYPE_SCALE)
	, mOptionFlags(OPTION_FLAG_NONE)		, mOptionFlags(OPTION_FLAG_NONE)
	, mDurationMs(1000.)		, mDurationMs(1000.)
	@@ -97,6 +98,7 @@ public:

	explicit Configuration(const Configuration &configuration)		explicit Configuration(const Configuration &configuration)
	: Interpolator<S, T>(static_cast<const Interpolator<S, T> >(&configuration))		: Interpolator<S, T>(static_cast<const Interpolator<S, T> >(&configuration))
			, RefBase()
	, mType(configuration.mType)		, mType(configuration.mType)
	, mOptionFlags(configuration.mOptionFlags)		, mOptionFlags(configuration.mOptionFlags)
	, mDurationMs(configuration.mDurationMs)		, mDurationMs(configuration.mDurationMs)
	@@ -150,7 +152,7 @@ public:

	T adjustVolume(T volume) const {		T adjustVolume(T volume) const {
	if ((getOptionFlags() & OPTION_FLAG_VOLUME_IN_DBFS) != 0) {		if ((getOptionFlags() & OPTION_FLAG_VOLUME_IN_DBFS) != 0) {
	const T out = powf(10.f, volume / 10.);		const T out = powf(10.f, volume / 10.0f);
	VS_LOG("in: %f out: %f", volume, out);		VS_LOG("in: %f out: %f", volume, out);
	volume = out;		volume = out;
	}		}
	@@ -264,10 +266,10 @@ public:

	std::string toString() const {		std::string toString() const {
	std::stringstream ss;		std::stringstream ss;
	ss << "mType: " << mType << std::endl;		ss << "mType: " << static_cast<int32_t>(mType) << std::endl;
	ss << "mId: " << mId << std::endl;		ss << "mId: " << mId << std::endl;
	if (mType != TYPE_ID) {		if (mType != TYPE_ID) {
	ss << "mOptionFlags: " << mOptionFlags << std::endl;		ss << "mOptionFlags: " << static_cast<int32_t>(mOptionFlags) << std::endl;
	ss << "mDurationMs: " << mDurationMs << std::endl;		ss << "mDurationMs: " << mDurationMs << std::endl;
	ss << Interpolator<S, T>::toString().c_str();		ss << Interpolator<S, T>::toString().c_str();
	}		}
	@@ -365,7 +367,7 @@ public:

	std::string toString() const {		std::string toString() const {
	std::stringstream ss;		std::stringstream ss;
	ss << "mFlags: " << mFlags << std::endl;		ss << "mFlags: " << static_cast<int32_t>(mFlags) << std::endl;
	ss << "mReplaceId: " << mReplaceId << std::endl;		ss << "mReplaceId: " << mReplaceId << std::endl;
	ss << "mXOffset: " << mXOffset << std::endl;		ss << "mXOffset: " << mXOffset << std::endl;
	return ss.str();		return ss.str();
	@@ -503,14 +505,15 @@ public:
	void updatePosition(int64_t startFrame, double sampleRate) {		void updatePosition(int64_t startFrame, double sampleRate) {
	double scale = (mConfiguration->last().first - mConfiguration->first().first)		double scale = (mConfiguration->last().first - mConfiguration->first().first)
	/ (mConfiguration->getDurationMs() * 0.001 * sampleRate);		/ (mConfiguration->getDurationMs() * 0.001 * sampleRate);
	const double minScale = 1. / INT64_MAX;		const double minScale = 1. / static_cast<double>(INT64_MAX);
	scale = std::max(scale, minScale);		scale = std::max(scale, minScale);
	const S xOffset = std::isnan(mDelayXOffset) ? mConfiguration->first().first : mDelayXOffset;		const S xOffset = std::isnan(mDelayXOffset) ? mConfiguration->first().first : mDelayXOffset;
	VS_LOG("update position: scale %lf frameCount:%lld, sampleRate:%lf, xOffset:%f",		VS_LOG("update position: scale %lf frameCount:%lld, sampleRate:%lf, xOffset:%f",
	scale, (long long) startFrame, sampleRate, xOffset);		scale, (long long) startFrame, sampleRate, xOffset);

	mXTranslate.setOffset(startFrame - xOffset / scale);		mXTranslate.setOffset(static_cast<float>(static_cast<double>(startFrame)
	mXTranslate.setScale(scale);		- static_cast<double>(xOffset) / scale));
			mXTranslate.setScale(static_cast<float>(scale));
	VS_LOG("translate: %s", mXTranslate.toString().c_str());		VS_LOG("translate: %s", mXTranslate.toString().c_str());
	}		}