Snap for 7354453 from ffa4219d61097fae8b32d0146940eafeaefcc555 to sc-release (91a71a4d) · Commits · e / os / android_frameworks_av

apex/manifest.json

+1 −1

+1 −1

Original line number	Diff line number	Diff line
		{
		"name": "com.android.media.swcodec",
		"version": 309999900,
		"version": 309999910,
		"requireNativeLibs": [
		":sphal"
		]

+6 −1

Original line number	Diff line number	Diff line
		@@ -523,7 +523,7 @@ void RevertOutputFormatIfNeeded(
		}

		void AmendOutputFormatWithCodecSpecificData(
		const uint8_t *data, size_t size, const std::string mediaType,
		const uint8_t *data, size_t size, const std::string &mediaType,
		const sp<AMessage> &outputFormat) {
		if (mediaType == MIMETYPE_VIDEO_AVC) {
		// Codec specific data should be SPS and PPS in a single buffer,
		@@ -2441,6 +2441,11 @@ void CCodec::initiateReleaseIfStuck() {
		C2String compName;
		{
		Mutexed<State>::Locked state(mState);
		if (!state->comp) {
		ALOGD("previous call to %s exceeded timeout "
		"and the component is already released", name.c_str());
		return;
		}
		compName = state->comp->getName();
		}
		ALOGW("[%s] previous call to %s exceeded timeout", compName.c_str(), name.c_str());

+13 −3

Original line number	Diff line number	Diff line
		@@ -749,10 +749,20 @@ status_t AudioFlingerClientAdapter::setVibratorInfos(
		AudioFlingerServerAdapter::AudioFlingerServerAdapter(
		const sp<AudioFlingerServerAdapter::Delegate>& delegate) : mDelegate(delegate) {}

		status_t AudioFlingerServerAdapter::onTransact(uint32_t code, const Parcel& data, Parcel* reply,
		status_t AudioFlingerServerAdapter::onTransact(uint32_t code,
		const Parcel& data,
		Parcel* reply,
		uint32_t flags) {
		return mDelegate->onPreTransact(static_cast<Delegate::TransactionCode>(code), data, flags)
		?: BnAudioFlingerService::onTransact(code, data, reply, flags);
		return mDelegate->onTransactWrapper(static_cast<Delegate::TransactionCode>(code),
		data,
		flags,
		[&] {
		return BnAudioFlingerService::onTransact(
		code,
		data,
		reply,
		flags);
		});
		}

		status_t AudioFlingerServerAdapter::dump(int fd, const Vector<String16>& args) {

+12 −8

Original line number	Diff line number	Diff line
		@@ -516,18 +516,22 @@ public:
		};

		/**
		* And optional hook, called on every transaction, before unparceling the data and
		* dispatching to the respective method. Useful for bulk operations, such as logging or
		* permission checks.
		* If an error status is returned, the transaction will return immediately and will not be
		* processed.
		* And optional hook, called on every transaction, allowing additional operations to be
		* performed before/after the unparceling ofthe data and dispatching to the respective
		* method. Useful for bulk operations, such as logging or permission checks.
		* The implementer is responsible to invoke the provided delegate function, which is the
		* actual onTransact(), unless an error occurs.
		* By default, this is just a pass-through to the delegate.
		*/
		virtual status_t onPreTransact(TransactionCode code, const Parcel& data, uint32_t flags) {
		virtual status_t onTransactWrapper(TransactionCode code,
		const Parcel& data,
		uint32_t flags,
		const std::function<status_t()>& delegate) {
		(void) code;
		(void) data;
		(void) flags;
		return OK;
		};
		return delegate();
		}

		/**
		* An optional hook for implementing diagnostics dumping.