release-request-148314be-b6e7-4b4d-b50e-ab6405ef3c8a-for-git_oc-dr1-release-39... (17bfa43e) · Commits · e / os / android_frameworks_av

drm/libmediadrm/Android.bp

+0 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,6 @@ cc_library_shared {
		"libmediautils",
		"libstagefright_foundation",
		"libutils",
		"android.hidl.base@1.0",
		"android.hardware.drm@1.0",
		"libhidlbase",
		"libhidlmemory",

include/media/Interpolator.h

+3 −3

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

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

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

include/media/VolumeShaper.h

+10 −7

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

		Configuration()
		: Interpolator<S, T>()
		, RefBase()
		, mType(TYPE_SCALE)
		, mId(-1)
		, mOptionFlags(OPTION_FLAG_NONE)
		@@ -94,6 +95,7 @@ public:

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

		T adjustVolume(T volume) const {
		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);
		volume = out;
		}
		@@ -261,10 +263,10 @@ public:

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

		std::string toString() const {
		std::stringstream ss;
		ss << "mFlags: " << mFlags << std::endl;
		ss << "mFlags: " << static_cast<int32_t>(mFlags) << std::endl;
		ss << "mReplaceId: " << mReplaceId << std::endl;
		ss << "mXOffset: " << mXOffset << std::endl;
		return ss.str();
		@@ -500,14 +502,15 @@ public:
		void updatePosition(int64_t startFrame, double sampleRate) {
		double scale = (mConfiguration->last().first - mConfiguration->first().first)
		/ (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);
		const S xOffset = std::isnan(mDelayXOffset) ? mConfiguration->first().first : mDelayXOffset;
		VS_LOG("update position: scale %lf frameCount:%lld, sampleRate:%lf, xOffset:%f",
		scale, (long long) startFrame, sampleRate, xOffset);

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

media/libaaudio/src/binding/SharedMemoryParcelable.cpp

+6 −5

Original line number	Diff line number	Diff line
		@@ -72,13 +72,13 @@ status_t SharedMemoryParcelable::readFromParcel(const Parcel* parcel) {
		}

		aaudio_result_t SharedMemoryParcelable::close() {
		if (mResolvedAddress != nullptr) {
		if (mResolvedAddress != MMAP_UNRESOLVED_ADDRESS) {
		int err = munmap(mResolvedAddress, mSizeInBytes);
		if (err < 0) {
		ALOGE("SharedMemoryParcelable::close() munmap() failed %d", err);
		return AAudioConvert_androidToAAudioResult(err);
		}
		mResolvedAddress = nullptr;
		mResolvedAddress = MMAP_UNRESOLVED_ADDRESS;
		}
		if (mFd != -1) {
		::close(mFd);
		@@ -99,11 +99,12 @@ aaudio_result_t SharedMemoryParcelable::resolve(int32_t offsetInBytes, int32_t s
		offsetInBytes, sizeInBytes, mSizeInBytes);
		return AAUDIO_ERROR_OUT_OF_RANGE;
		}
		if (mResolvedAddress == nullptr) {
		if (mResolvedAddress == MMAP_UNRESOLVED_ADDRESS) {
		mResolvedAddress = (uint8_t *) mmap(0, mSizeInBytes, PROT_READ\|PROT_WRITE,
		MAP_SHARED, mFd, 0);
		if (mResolvedAddress == nullptr) {
		ALOGE("SharedMemoryParcelable mmap failed for fd = %d", mFd);
		if (mResolvedAddress == MMAP_UNRESOLVED_ADDRESS) {
		ALOGE("SharedMemoryParcelable mmap failed for fd = %d, errno = %s",
		mFd, strerror(errno));
		return AAUDIO_ERROR_INTERNAL;
		}
		}

media/libaaudio/src/binding/SharedMemoryParcelable.h

+4 −1

Original line number	Diff line number	Diff line
		@@ -64,9 +64,12 @@ public:
		void dump();

		protected:

		#define MMAP_UNRESOLVED_ADDRESS reinterpret_cast<uint8_t*>(MAP_FAILED)

		int mFd = -1;
		int32_t mSizeInBytes = 0;
		uint8_t *mResolvedAddress = nullptr;
		uint8_t *mResolvedAddress = MMAP_UNRESOLVED_ADDRESS;
		};

		} /* namespace aaudio */