[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid.changes
|
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid.spec
^
|
|
[-]
[+]
|
Changed |
_service
^
|
@@ -2,7 +2,7 @@
<service name="tar_git">
<param name="url">https://github.com/mer-hybris/pulseaudio-modules-droid.git</param>
<param name="branch">master</param>
- <param name="revision">6.0.46</param>
+ <param name="revision">8.0.49</param>
<param name="token"/>
<param name="debian"/>
<param name="dumb"/>
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-8.0.49.tar.bz2/src/common/droid-util.c
^
|
@@ -862,8 +862,13 @@
}
to_inputs = pa_strlist_reverse(to_inputs);
+#if (PULSEAUDIO_VERSION >= 8)
+ o_str = pa_strlist_to_string(to_outputs);
+ i_str = pa_strlist_to_string(to_inputs);
+#else
o_str = pa_strlist_tostring(to_outputs);
i_str = pa_strlist_tostring(to_inputs);
+#endif
pa_log_debug("New combined profile: %s (outputs: %s, inputs: %s)", module->name, o_str, i_str);
@@ -1664,8 +1669,12 @@
pa_channel_map_init_mono(&channel_map);
sample_spec.channels = 1;
/* Only allow recording both downlink and uplink. */
-#ifdef QCOM_HARDWARE
+#if defined(QCOM_HARDWARE)
+ #if ANDROID_VERSION_MAJOR == 5 && ANDROID_VERSION_MINOR == 1
+ hal_channel_mask = AUDIO_CHANNEL_IN_MONO;
+ #else
hal_channel_mask = AUDIO_CHANNEL_IN_VOICE_CALL_MONO;
+ #endif
#else
hal_channel_mask = AUDIO_CHANNEL_IN_VOICE_UPLINK | AUDIO_CHANNEL_IN_VOICE_DNLINK;
#endif
@@ -1690,7 +1699,15 @@
pa_droid_hw_module_unlock(module);
if (ret < 0 || !stream) {
- pa_log("Failed to open input stream: %d", ret);
+ pa_log("Failed to open input stream: %d with device: %u flags: %u sample rate: %u channels: %u (%u) format: %u (%u)",
+ ret,
+ devices,
+ 0, /* AUDIO_INPUT_FLAG_NONE on v3. v1 and v2 don't have input flags. */
+ config_in.sample_rate,
+ sample_spec.channels,
+ config_in.channel_mask,
+ sample_spec.format,
+ config_in.format);
goto fail;
}
@@ -1707,6 +1724,10 @@
buffer_size = s->in->common.get_buffer_size(&s->in->common);
+ /* As audio_source_t may not have any effect when opening the input stream
+ * set input parameters immediately after opening the stream. */
+ pa_droid_stream_set_input_route(s, devices, NULL);
+
pa_log_info("Opened droid input stream %p with device: %u flags: %u sample rate: %u channels: %u (%u) format: %u (%u) buffer size: %u (%llu usec)",
(void *) s,
devices,
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-8.0.49.tar.bz2/src/droid/droid-sink.c
^
|
@@ -407,7 +407,7 @@
/* Sleep */
#if (PULSEAUDIO_VERSION == 5)
if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
-#elif (PULSEAUDIO_VERSION == 6)
+#elif (PULSEAUDIO_VERSION >= 6)
if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
#endif
goto fail;
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-8.0.49.tar.bz2/src/droid/droid-source.c
^
|
@@ -209,7 +209,7 @@
/* Sleep */
#if (PULSEAUDIO_VERSION == 5)
if ((ret = pa_rtpoll_run(u->rtpoll, true)) < 0)
-#elif (PULSEAUDIO_VERSION == 6)
+#elif (PULSEAUDIO_VERSION >= 6)
if ((ret = pa_rtpoll_run(u->rtpoll)) < 0)
#endif
goto fail;
@@ -368,7 +368,7 @@
#if (PULSEAUDIO_VERSION == 5)
static void source_get_mute_cb(pa_source *s) {
-#elif (PULSEAUDIO_VERSION == 6)
+#elif (PULSEAUDIO_VERSION >= 6)
static int source_get_mute_cb(pa_source *s, bool *muted) {
#endif
struct userdata *u = s->userdata;
@@ -388,7 +388,7 @@
#if (PULSEAUDIO_VERSION == 5)
if (ret == 0)
s->muted = b;
-#elif (PULSEAUDIO_VERSION == 6)
+#elif (PULSEAUDIO_VERSION >= 6)
if (ret == 0)
*muted = b;
|
[-]
[+]
|
Changed |
_service:tar_git:pulseaudio-modules-droid-8.0.49.tar.bz2/src/droid/module-droid-card.c
^
|
@@ -470,7 +470,8 @@
return true;
}
-#if DROID_HAL == 1
+#if (DROID_HAL == 1) || \
+ (defined(QCOM_HARDWARE) && ANDROID_VERSION_MAJOR == 5 && ANDROID_VERSION_MINOR == 1)
static bool voicecall_record_profile_event_cb(struct userdata *u, pa_droid_profile *p, bool enabling) {
pa_queue *source_outputs = NULL;
pa_droid_mapping *am;
@@ -505,15 +506,13 @@
}
} else {
- /* don't do anything if voicecall source has already been destroyed. */
- if (!u->voicecall_source)
- return true;
-
pa_log_info("Disabling voice call record.");
- source_outputs = pa_source_move_all_start(u->voicecall_source, source_outputs);
- pa_droid_source_free(u->voicecall_source);
- u->voicecall_source = NULL;
+ if (u->voicecall_source) {
+ source_outputs = pa_source_move_all_start(u->voicecall_source, source_outputs);
+ pa_droid_source_free(u->voicecall_source);
+ u->voicecall_source = NULL;
+ }
am = pa_droid_idxset_get_primary(u->old_profile->input_mappings);
|