mix, sink-input: Add to invoke hook fire when ramping is finished

[Version] 11.1-63
[Issue Type] New feature

Change-Id: Id7e826389dc69082d45271644e10987e0de83f48
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>

diff --git a/packaging/pulseaudio.spec b/packaging/pulseaudio.spec
index 60ae9b3..374e9f1 100644 (file)
--- a/packaging/pulseaudio.spec
+++ b/packaging/pulseaudio.spec
@@ -3,7 +3,7 @@
 Name:             pulseaudio
 Summary:          Improved Linux sound server
 Version:          11.1
-Release:          62
+Release:          63
 Group:            Multimedia/Audio
 License:          LGPL-2.1
 URL:              http://pulseaudio.org

diff --git a/src/pulsecore/core.h b/src/pulsecore/core.h
index e33df95..4c2fb90 100644 (file)
--- a/src/pulsecore/core.h
+++ b/src/pulsecore/core.h
@@ -142,6 +142,9 @@ typedef enum pa_core_hook {
     PA_CORE_HOOK_SAMPLE_CACHE_NEW,
     PA_CORE_HOOK_SAMPLE_CACHE_CHANGED,
     PA_CORE_HOOK_SAMPLE_CACHE_UNLINK,
+#ifdef __TIZEN__
+    PA_CORE_HOOK_SINK_INPUT_RAMP_FINISH,
+#endif
     PA_CORE_HOOK_MAX
 } pa_core_hook_t;
 

diff --git a/src/pulsecore/mix.c b/src/pulsecore/mix.c
index 319c4d8..c3d3d2f 100644 (file)
--- a/src/pulsecore/mix.c
+++ b/src/pulsecore/mix.c
@@ -837,6 +837,7 @@ static void calc_volume_ramps(pa_cvolume_ramp_int *ramp, float *vol)
             if (ramp->ramps[i].target == PA_VOLUME_NORM) {
                 vol[i] = 1.0;
             }
+            ramp->finished = true;
         } else {
             vol[i] = ramp->ramps[i].curr = calc_volume_ramp_table[ramp->ramps[i].type] (&ramp->ramps[i]);
             ramp->ramps[i].left--;
@@ -927,6 +928,8 @@ pa_cvolume_ramp_int* pa_cvolume_ramp_convert(const pa_cvolume_ramp *src, pa_cvol
         dst->ramps[j].end = dst->ramps[i].end;
     }
 
+    dst->finished = false;
+
     return dst;
 }
 

diff --git a/src/pulsecore/mix.h b/src/pulsecore/mix.h
index e36541d..ae26bde 100644 (file)
--- a/src/pulsecore/mix.h
+++ b/src/pulsecore/mix.h
@@ -73,6 +73,7 @@ typedef struct pa_volume_ramp_int_t {
 typedef struct pa_cvolume_ramp_int {
     uint8_t channels;
     pa_volume_ramp_int ramps[PA_CHANNELS_MAX];
+    bool finished;
 } pa_cvolume_ramp_int;
 
 pa_cvolume_ramp_int* pa_cvolume_ramp_convert(const pa_cvolume_ramp *src, pa_cvolume_ramp_int *dst, int sample_rate);

diff --git a/src/pulsecore/sink-input.c b/src/pulsecore/sink-input.c
index 1115950..032907e 100644 (file)
--- a/src/pulsecore/sink-input.c
+++ b/src/pulsecore/sink-input.c
@@ -1067,6 +1067,9 @@ static void check_and_apply_ramp(pa_cvolume_ramp_int *ramp, const pa_sample_spec
 void pa_sink_input_peek(pa_sink_input *i, size_t slength /* in sink bytes */, pa_memchunk *chunk, pa_cvolume *volume) {
     bool do_volume_adj_here, need_volume_factor_sink;
     bool volume_is_norm;
+#ifdef TIZEN_VOLUME_RAMP
+    bool prev_ramp_finished = false;
+#endif
     size_t block_size_max_sink, block_size_max_sink_input;
     size_t ilength;
     size_t ilength_full;
@@ -1187,6 +1190,8 @@ void pa_sink_input_peek(pa_sink_input *i, size_t slength /* in sink bytes */, pa
 
 #ifdef TIZEN_VOLUME_RAMP
             check_and_apply_silence(i);
+
+            prev_ramp_finished = i->thread_info.ramp.finished;
 #endif
             if (!i->thread_info.resampler) {
 
@@ -1257,6 +1262,14 @@ void pa_sink_input_peek(pa_sink_input *i, size_t slength /* in sink bytes */, pa
 #ifdef TIZEN_PCM_DUMP
     pa_sink_input_write_pcm_dump(i, chunk);
 #endif
+#ifdef TIZEN_VOLUME_RAMP
+    /* Hook fire only if ramp is finished. Note that it does not mean all the ramped data
+     * is written to the device, hence it needs to be improved later on. */
+    if (!prev_ramp_finished && i->thread_info.ramp.finished) {
+        pa_hook_fire(&i->core->hooks[PA_CORE_HOOK_SINK_INPUT_RAMP_FINISH], i);
+        i->thread_info.ramp.finished = false;
+    }
+#endif
 }
 
 /* Called from thread context */