Merge "support changing audio-hw-sync-id during playback." (2f844ad4) · Commits · e / os / android_frameworks_av

media/codec2/sfplugin/CCodec.cpp

+10 −0

Original line number	Original line	Diff line number	Diff line
	@@ -1894,6 +1894,12 @@ void CCodec::signalSetParameters(const sp<AMessage> &msg) {
	params->removeEntryAt(params->findEntryByName(KEY_BIT_RATE));		params->removeEntryAt(params->findEntryByName(KEY_BIT_RATE));
	}		}

			int32_t syncId = 0;
			if (params->findInt32("audio-hw-sync", &syncId)
			\|\| params->findInt32("hw-av-sync-id", &syncId)) {
			configureTunneledVideoPlayback(comp, nullptr, params);
			}

	Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);		Mutexed<std::unique_ptr<Config>>::Locked configLocked(mConfig);
	const std::unique_ptr<Config> &config = *configLocked;		const std::unique_ptr<Config> &config = *configLocked;

	@@ -2217,6 +2223,10 @@ status_t CCodec::configureTunneledVideoPlayback(
	return UNKNOWN_ERROR;		return UNKNOWN_ERROR;
	}		}

			if (sidebandHandle == nullptr) {
			return OK;
			}

	std::vector<std::unique_ptr<C2Param>> params;		std::vector<std::unique_ptr<C2Param>> params;
	c2err = comp->query({}, {C2PortTunnelHandleTuning::output::PARAM_TYPE}, C2_DONT_BLOCK, &params);		c2err = comp->query({}, {C2PortTunnelHandleTuning::output::PARAM_TYPE}, C2_DONT_BLOCK, &params);
	if (c2err == C2_OK && params.size() == 1u) {		if (c2err == C2_OK && params.size() == 1u) {