Merge "Do not invalidate stream when the secondary outputs are changed." into sc-dev (faea6a60) · Commits · e / os / android_frameworks_av

media/libaudioclient/AidlConversion.cpp

+24 −0

Original line number	Diff line number	Diff line
		@@ -2323,4 +2323,28 @@ legacy2aidl_audio_encapsulation_type_t_AudioEncapsulationType(
		return unexpected(BAD_VALUE);
		}

		ConversionResult<TrackSecondaryOutputInfoPair>
		aidl2legacy_TrackSecondaryOutputInfo_TrackSecondaryOutputInfoPair(
		const media::TrackSecondaryOutputInfo& aidl) {
		TrackSecondaryOutputInfoPair trackSecondaryOutputInfoPair;
		trackSecondaryOutputInfoPair.first =
		VALUE_OR_RETURN(aidl2legacy_int32_t_audio_port_handle_t(aidl.portId));
		trackSecondaryOutputInfoPair.second =
		VALUE_OR_RETURN(convertContainer<std::vector<audio_port_handle_t>>(
		aidl.secondaryOutputIds, aidl2legacy_int32_t_audio_io_handle_t));
		return trackSecondaryOutputInfoPair;
		}

		ConversionResult<media::TrackSecondaryOutputInfo>
		legacy2aidl_TrackSecondaryOutputInfoPair_TrackSecondaryOutputInfo(
		const TrackSecondaryOutputInfoPair& legacy) {
		media::TrackSecondaryOutputInfo trackSecondaryOutputInfo;
		trackSecondaryOutputInfo.portId =
		VALUE_OR_RETURN(legacy2aidl_audio_port_handle_t_int32_t(legacy.first));
		trackSecondaryOutputInfo.secondaryOutputIds =
		VALUE_OR_RETURN(convertContainer<std::vector<int32_t>>(
		legacy.second, legacy2aidl_audio_io_handle_t_int32_t));
		return trackSecondaryOutputInfo;
		}

		} // namespace android

+1 −0

Original line number	Diff line number	Diff line
		@@ -351,6 +351,7 @@ aidl_interface {
		"aidl/android/media/AudioVibratorInfo.aidl",
		"aidl/android/media/EffectDescriptor.aidl",
		"aidl/android/media/ExtraAudioDescriptor.aidl",
		"aidl/android/media/TrackSecondaryOutputInfo.aidl",
		],
		imports: [
		"audio_common-aidl",

+19 −0

Original line number	Diff line number	Diff line
		@@ -743,6 +743,16 @@ status_t AudioFlingerClientAdapter::setVibratorInfos(
		return statusTFromBinderStatus(mDelegate->setVibratorInfos(vibratorInfos));
		}

		status_t AudioFlingerClientAdapter::updateSecondaryOutputs(
		const TrackSecondaryOutputsMap& trackSecondaryOutputs) {
		std::vector<media::TrackSecondaryOutputInfo> trackSecondaryOutputInfos =
		VALUE_OR_RETURN_STATUS(
		convertContainer<std::vector<media::TrackSecondaryOutputInfo>>(
		trackSecondaryOutputs,
		legacy2aidl_TrackSecondaryOutputInfoPair_TrackSecondaryOutputInfo));
		return statusTFromBinderStatus(mDelegate->updateSecondaryOutputs(trackSecondaryOutputInfos));
		}


		////////////////////////////////////////////////////////////////////////////////////////////////////
		// AudioFlingerServerAdapter
		@@ -1199,4 +1209,13 @@ Status AudioFlingerServerAdapter::setVibratorInfos(
		return Status::fromStatusT(mDelegate->setVibratorInfos(vibratorInfos));
		}

		Status AudioFlingerServerAdapter::updateSecondaryOutputs(
		const std::vector<media::TrackSecondaryOutputInfo>& trackSecondaryOutputInfos) {
		TrackSecondaryOutputsMap trackSecondaryOutputs =
		VALUE_OR_RETURN_BINDER(convertContainer<TrackSecondaryOutputsMap>(
		trackSecondaryOutputInfos,
		aidl2legacy_TrackSecondaryOutputInfo_TrackSecondaryOutputInfoPair));
		return Status::fromStatusT(mDelegate->updateSecondaryOutputs(trackSecondaryOutputs));
		}

		} // namespace android

+6 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ import android.media.IAudioRecord;
		import android.media.IAudioTrack;
		import android.media.MicrophoneInfoData;
		import android.media.RenderPosition;
		import android.media.TrackSecondaryOutputInfo;
		import android.media.audio.common.AudioFormat;

		/**
		@@ -207,4 +208,9 @@ interface IAudioFlingerService {
		// Set vibrators' information.
		// The value will be used to initialize HapticGenerator.
		void setVibratorInfos(in AudioVibratorInfo[] vibratorInfos);

		// Update secondary outputs.
		// This usually happens when there is a dynamic policy registered.
		void updateSecondaryOutputs(
		in TrackSecondaryOutputInfo[] trackSecondaryOutputInfos);
		}

0 → 100644

+27 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2021 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package android.media;

		/**
		* This is a class that contains port handle for a track and handles for all secondary
		* outputs of the track.
		* @hide
		*/
		parcelable TrackSecondaryOutputInfo {
		int portId; // audio_port_handle_t
		int[] secondaryOutputIds; // audio_io_handle_t[]
		}
		No newline at end of file