Merge "HAL: Fix compress record" (198adc00) · Commits · e / os / android_hardware_qcom_audio

hal/audio_hw.c

+28 −16

Original line number	Diff line number	Diff line
		@@ -8392,24 +8392,31 @@ static int adev_open_input_stream(struct audio_hw_device *dev,
		goto err_open;
		}
		}
		#ifdef CONCURRENT_CAPTURE_ENABLED
		if (audio_extn_is_concurrent_capture_enabled()) {
		/* Acquire lock to avoid two concurrent use cases initialized to
		same pcm record use case */

		pthread_mutex_lock(&adev->lock);
		if (in->usecase == USECASE_AUDIO_RECORD) {
		pthread_mutex_lock(&adev->lock);
		if (!(adev->pcm_record_uc_state)) {
		ALOGV("%s: using USECASE_AUDIO_RECORD",__func__);
		adev->pcm_record_uc_state = 1;
		pthread_mutex_unlock(&adev->lock);
		} else {
		pthread_mutex_unlock(&adev->lock);
		/* Assign compress record use case for second record */
		in->usecase = USECASE_AUDIO_RECORD_COMPRESS2;
		in->flags \|= AUDIO_INPUT_FLAG_COMPRESS;
		ALOGV("%s: overriding usecase with USECASE_AUDIO_RECORD_COMPRESS2 and appending compress flag", __func__);
		if (audio_extn_cin_applicable_stream(in)) {
		in->sample_rate = config->sample_rate;
		ret = audio_extn_cin_configure_input_stream(in);
		if (ret)
		goto err_open;
		}
		}
		}
		}
		pthread_mutex_unlock(&adev->lock);
		#endif
		}

		in->config.channels = channel_count;
		@@ -8460,6 +8467,11 @@ static int adev_open_input_stream(struct audio_hw_device *dev,
		return ret;

		err_open:
		if (in->usecase == USECASE_AUDIO_RECORD) {
		pthread_mutex_lock(&adev->lock);
		adev->pcm_record_uc_state = 0;
		pthread_mutex_unlock(&adev->lock);
		}
		free(in);
		*stream_in = NULL;
		return ret;