Merge changes from topic "upstream-hal-v7_1-p2" (bd3adb23) · Commits · e / os / android_frameworks_av

media/libaudioclient/AidlConversion.cpp

+4 −0

Original line number	Diff line number	Diff line
		@@ -584,6 +584,8 @@ ConversionResult<audio_output_flags_t> aidl2legacy_AudioOutputFlags_audio_output
		return AUDIO_OUTPUT_FLAG_INCALL_MUSIC;
		case media::AudioOutputFlags::GAPLESS_OFFLOAD:
		return AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD;
		case media::AudioOutputFlags::SPATIALIZER:
		return AUDIO_OUTPUT_FLAG_SPATIALIZER;
		}
		return unexpected(BAD_VALUE);
		}
		@@ -625,6 +627,8 @@ ConversionResult<media::AudioOutputFlags> legacy2aidl_audio_output_flags_t_Audio
		return media::AudioOutputFlags::INCALL_MUSIC;
		case AUDIO_OUTPUT_FLAG_GAPLESS_OFFLOAD:
		return media::AudioOutputFlags::GAPLESS_OFFLOAD;
		case AUDIO_OUTPUT_FLAG_SPATIALIZER:
		return media::AudioOutputFlags::SPATIALIZER;
		}
		return unexpected(BAD_VALUE);
		}

media/libaudioclient/aidl/android/media/AudioOutputFlags.aidl

+1 −0

Original line number	Diff line number	Diff line
		@@ -36,4 +36,5 @@ enum AudioOutputFlags {
		VOIP_RX = 13,
		INCALL_MUSIC = 14,
		GAPLESS_OFFLOAD = 15,
		SPATIALIZER = 16,
		}

media/libaudiohal/impl/StreamHalHidl.cpp

+86 −0

Original line number	Diff line number	Diff line
		@@ -684,6 +684,7 @@ status_t StreamOutHalHidl::setEventCallback(
		// Codec format callback is supported starting from audio HAL V6.0
		return INVALID_OPERATION;
		}

		#else

		status_t StreamOutHalHidl::getDualMonoMode(audio_dual_mono_mode_t* mode) {
		@@ -789,6 +790,84 @@ status_t StreamOutHalHidl::setEventCallback(
		}
		#endif

		#if MAJOR_VERSION == 7 && MINOR_VERSION == 1
		using hardware::audio::V7_1::LatencyMode;

		status_t StreamOutHalHidl::setLatencyMode(audio_latency_mode_t mode) {
		if (mStream == 0) return NO_INIT;
		return processReturn(
		"setLatencyMode", mStream->setLatencyMode(static_cast<LatencyMode>(mode)));
		};

		status_t StreamOutHalHidl::getRecommendedLatencyModes(std::vector<audio_latency_mode_t> *modes) {
		if (!mStream) return NO_INIT;
		Result retval;
		Return<void> ret = mStream->getRecommendedLatencyModes(
		[&](Result r, hidl_vec<LatencyMode> hidlModes) {
		retval = r;
		for (size_t i = 0; i < hidlModes.size(); i++) {
		modes->push_back(static_cast<audio_latency_mode_t>(hidlModes[i]));
		}
		});
		return processReturn("getRecommendedLatencyModes", ret, retval);
		};

		#include PATH(android/hardware/audio/FILE_VERSION/IStreamOutLatencyModeCallback.h)

		using hardware::audio::V7_1::IStreamOutLatencyModeCallback;

		namespace {
		struct StreamOutLatencyModeCallback : public IStreamOutLatencyModeCallback {
		StreamOutLatencyModeCallback(const wp<StreamOutHalHidl>& stream) : mStream(stream) {}

		// IStreamOutLatencyModeCallback implementation
		Return<void> onRecommendedLatencyModeChanged(const hidl_vec<LatencyMode>& hidlModes) override {
		sp<StreamOutHalHidl> stream = mStream.promote();
		if (stream != nullptr) {
		std::vector<audio_latency_mode_t> modes;
		for (size_t i = 0; i < hidlModes.size(); i++) {
		modes.push_back(static_cast<audio_latency_mode_t>(hidlModes[i]));
		}
		stream->onRecommendedLatencyModeChanged(modes);
		}
		return Void();
		}

		private:
		wp<StreamOutHalHidl> mStream;
		};
		} // namespace

		status_t StreamOutHalHidl::setLatencyModeCallback(
		const sp<StreamOutHalInterfaceLatencyModeCallback>& callback) {

		if (mStream == nullptr) return NO_INIT;
		mLatencyModeCallback = callback;
		status_t status = processReturn(
		"setLatencyModeCallback",
		mStream->setLatencyModeCallback(
		callback.get() == nullptr ? nullptr : new StreamOutLatencyModeCallback(this)));
		return status;
		};

		#else

		status_t StreamOutHalHidl::setLatencyMode(audio_latency_mode_t mode __unused) {
		return INVALID_OPERATION;
		};

		status_t StreamOutHalHidl::getRecommendedLatencyModes(
		std::vector<audio_latency_mode_t> *modes __unused) {
		return INVALID_OPERATION;
		};

		status_t StreamOutHalHidl::setLatencyModeCallback(
		const sp<StreamOutHalInterfaceLatencyModeCallback>& callback __unused) {
		return INVALID_OPERATION;
		};

		#endif

		void StreamOutHalHidl::onWriteReady() {
		sp<StreamOutHalInterfaceCallback> callback = mCallback.load().promote();
		if (callback == 0) return;
		@@ -817,6 +896,13 @@ void StreamOutHalHidl::onCodecFormatChanged(const std::basic_string<uint8_t>& me
		callback->onCodecFormatChanged(metadataBs);
		}

		void StreamOutHalHidl::onRecommendedLatencyModeChanged(
		const std::vector<audio_latency_mode_t>& modes) {
		sp<StreamOutHalInterfaceLatencyModeCallback> callback = mLatencyModeCallback.load().promote();
		if (callback == nullptr) return;
		callback->onRecommendedLatencyModeChanged(modes);
		}


		StreamInHalHidl::StreamInHalHidl(
		const sp<::android::hardware::audio::CPP_VERSION::IStreamIn>& stream)

media/libaudiohal/impl/StreamHalHidl.h

+9 −0

Original line number	Diff line number	Diff line
		@@ -189,6 +189,13 @@ class StreamOutHalHidl : public StreamOutHalInterface, public StreamHalHidl {
		// Methods used by StreamCodecFormatCallback (HIDL).
		void onCodecFormatChanged(const std::basic_string<uint8_t>& metadataBs);

		status_t setLatencyMode(audio_latency_mode_t mode) override;
		status_t getRecommendedLatencyModes(std::vector<audio_latency_mode_t> *modes) override;
		status_t setLatencyModeCallback(
		const sp<StreamOutHalInterfaceLatencyModeCallback>& callback) override;

		void onRecommendedLatencyModeChanged(const std::vector<audio_latency_mode_t>& modes);

		private:
		friend class DeviceHalHidl;
		typedef MessageQueue<WriteCommand, hardware::kSynchronizedReadWrite> CommandMQ;
		@@ -197,6 +204,8 @@ class StreamOutHalHidl : public StreamOutHalInterface, public StreamHalHidl {

		mediautils::atomic_wp<StreamOutHalInterfaceCallback> mCallback;
		mediautils::atomic_wp<StreamOutHalInterfaceEventCallback> mEventCallback;
		mediautils::atomic_wp<StreamOutHalInterfaceLatencyModeCallback> mLatencyModeCallback;

		const sp<::android::hardware::audio::CPP_VERSION::IStreamOut> mStream;
		std::unique_ptr<CommandMQ> mCommandMQ;
		std::unique_ptr<DataMQ> mDataMQ;

media/libaudiohal/impl/StreamHalLocal.h

+12 −0

Original line number	Diff line number	Diff line
		@@ -168,6 +168,18 @@ class StreamOutHalLocal : public StreamOutHalInterface, public StreamHalLocal {

		status_t setEventCallback(const sp<StreamOutHalInterfaceEventCallback>& callback) override;

		status_t setLatencyMode(audio_latency_mode_t mode __unused) override {
		return INVALID_OPERATION;
		}
		status_t getRecommendedLatencyModes(
		std::vector<audio_latency_mode_t> *modes __unused) override {
		return INVALID_OPERATION;
		}
		status_t setLatencyModeCallback(
		const sp<StreamOutHalInterfaceLatencyModeCallback>& callback __unused) override {
		return INVALID_OPERATION;
		}

		private:
		audio_stream_out_t *mStream;
		wp<StreamOutHalInterfaceCallback> mCallback;