Merge "av: Support restore track for offload/direct track" into main (807baf46) · Commits · e / devices / smdk4412 / android_frameworks_av

media/libaudioclient/AudioTrack.cpp

+4 −4

Original line number	Original line	Diff line number	Diff line
	@@ -1707,14 +1707,14 @@ status_t AudioTrack::setOutputDevice(audio_port_handle_t deviceId) {
	mSelectedDeviceId = deviceId;		mSelectedDeviceId = deviceId;
	if (mStatus == NO_ERROR) {		if (mStatus == NO_ERROR) {
	if (isOffloadedOrDirect_l()) {		if (isOffloadedOrDirect_l()) {
	if (mState == STATE_STOPPED \|\| mState == STATE_FLUSHED) {		if (isPlaying_l()) {
	ALOGD("%s(%d): creating a new AudioTrack", __func__, mPortId);
	result = restoreTrack_l("setOutputDevice", true /* forceRestore */);
	} else {
	ALOGW("%s(%d). Offloaded or Direct track is not STOPPED or FLUSHED. "		ALOGW("%s(%d). Offloaded or Direct track is not STOPPED or FLUSHED. "
	"State: %s.",		"State: %s.",
	__func__, mPortId, stateToString(mState));		__func__, mPortId, stateToString(mState));
	result = INVALID_OPERATION;		result = INVALID_OPERATION;
			} else {
			ALOGD("%s(%d): creating a new AudioTrack", __func__, mPortId);
			result = restoreTrack_l("setOutputDevice", true /* forceRestore */);
	}		}
	} else {		} else {
	// allow track invalidation when track is not playing to propagate		// allow track invalidation when track is not playing to propagate