Merge "VIS : SoundTriggerService: fix fake AudioRecord creation" (e14b11be) · Commits · e / os / android_frameworks_base

services/voiceinteraction/java/com/android/server/soundtrigger/SoundTriggerService.java

+19 −19

Original line number	Diff line number	Diff line
		@@ -1281,27 +1281,25 @@ public class SoundTriggerService extends SystemService {
		attributesBuilder.setInternalCapturePreset(MediaRecorder.AudioSource.HOTWORD);
		AudioAttributes attributes = attributesBuilder.build();

		// Use same AudioFormat processing as in RecognitionEvent.fromParcel
		AudioFormat originalFormat = event.getCaptureFormat();
		AudioFormat captureFormat = (new AudioFormat.Builder())

		sEventLogger.log(new SoundTriggerLogger.StringEvent("createAudioRecordForEvent"));

		try {
		return (new AudioRecord.Builder())
		.setAudioAttributes(attributes)
		.setAudioFormat((new AudioFormat.Builder())
		.setChannelMask(originalFormat.getChannelMask())
		.setEncoding(originalFormat.getEncoding())
		.setSampleRate(originalFormat.getSampleRate())
		.build())
		.setSessionId(event.getCaptureSession())
		.build();

		int bufferSize = AudioRecord.getMinBufferSize(
		captureFormat.getSampleRate() == AudioFormat.SAMPLE_RATE_UNSPECIFIED
		? AudioFormat.SAMPLE_RATE_HZ_MAX
		: captureFormat.getSampleRate(),
		captureFormat.getChannelCount() == 2
		? AudioFormat.CHANNEL_IN_STEREO
		: AudioFormat.CHANNEL_IN_MONO,
		captureFormat.getEncoding());

		sEventLogger.log(new SoundTriggerLogger.StringEvent("createAudioRecordForEvent"));

		return new AudioRecord(attributes, captureFormat, bufferSize,
		event.getCaptureSession());
		} catch (IllegalArgumentException \| UnsupportedOperationException e) {
		Slog.w(TAG, mPuuid + ": createAudioRecordForEvent(" + event
		+ "), failed to create AudioRecord");
		return null;
		}
		}

		@Override
		@@ -1331,9 +1329,11 @@ public class SoundTriggerService extends SystemService {

		// Currently we need to start and release the audio record to reset
		// the DSP even if we don't want to process the event
		if (capturedData != null) {
		capturedData.startRecording();
		capturedData.release();
		}
		}
		}));
		}