tizenaudio-echo-cancel: Fix UNINIT.LOCAL_VAR

This patch fixes the svace and convention issues

 * Fix svace issue
 * Relace echo with referece

[Version] 15.0.12
[Issue Type] SVACE

Change-Id: I8ebe7e724c090fc4ce8bfa120b0e596d95723a2d
Signed-off-by: Jaechul Lee <jcsing.lee@samsung.com>

diff --git a/packaging/pulseaudio-modules-tizen.spec b/packaging/pulseaudio-modules-tizen.spec
index 9122970..6c31737 100644 (file)
--- a/packaging/pulseaudio-modules-tizen.spec
+++ b/packaging/pulseaudio-modules-tizen.spec
@@ -2,7 +2,7 @@
 
 Name:             pulseaudio-modules-tizen
 Summary:          Pulseaudio modules for Tizen
-Version:          15.0.11
+Version:          15.0.12
 Release:          0
 Group:            Multimedia/Audio
 License:          LGPL-2.1+

diff --git a/src/echo-cancel/module-tizenaudio-echo-cancel.c b/src/echo-cancel/module-tizenaudio-echo-cancel.c
index 8aa456c..d27a2cd 100644 (file)
--- a/src/echo-cancel/module-tizenaudio-echo-cancel.c
+++ b/src/echo-cancel/module-tizenaudio-echo-cancel.c
@@ -150,8 +150,8 @@ static pa_source_output *find_source_output_by_flags(pa_source *s) {
 }
 
 static pa_usec_t get_round_trip_latency(struct userdata *u) {
-    pa_usec_t sink_latency;
-    pa_usec_t source_latency;
+    pa_usec_t sink_latency = 0ULL;
+    pa_usec_t source_latency = 0ULL;
 
     pa_assert(u);
     pa_assert(u->sink);
@@ -272,19 +272,6 @@ static int update_state_by_source(struct userdata *u, bool enable) {
     return 0;
 }
 
-static void pa_source_push_echo(pa_source *s, pa_memchunk *chunk) {
-    pa_source_output *o = NULL;
-
-    o = find_source_output_by_flags(s);
-    if (!o) {
-        pa_log_error("Can't find aec source-output");
-        return;
-    }
-
-    if (pa_processor_push_data(o->thread_info.processor, chunk) < 0)
-        pa_log_error("Failed to push reference data");
-}
-
 static int post_process(pa_source_output *o, pa_memchunk *chunk, pa_memchunk *ochunk) {
     int ret = -1;
 
@@ -336,8 +323,20 @@ static int process_msg(
 
             break;
         case PA_ECHO_CANCEL_MESSAGE_PUSH_ECHO:
-            if (u->enable_in_thread)
-                pa_source_push_echo(u->source, chunk);
+            if (u->enable_in_thread) {
+                pa_source_output *o = NULL;
+
+                pa_assert(u->source);
+
+                o = find_source_output_by_flags(u->source);
+                if (!o) {
+                    pa_log_error("Can't find aec source-output");
+                    break;
+                }
+
+                if (pa_processor_push_reference(o->thread_info.processor, chunk) < 0)
+                    pa_log_error("Failed to push reference data");
+            }
 
             break;
         case PA_ECHO_CANCEL_MESSAGE_SET_AEC_STATE: {

diff --git a/src/echo-cancel/processor.c b/src/echo-cancel/processor.c
index a97b99c..5b8916b 100644 (file)
--- a/src/echo-cancel/processor.c
+++ b/src/echo-cancel/processor.c
@@ -345,7 +345,7 @@ int pa_processor_process(pa_processor *processor, pa_memchunk *chunk, pa_memchun
     pa_assert(ochunk);
 
     if ((r = pa_memblockq_push(processor->output_memblockq, chunk)) < 0) {
-        pa_log_error("Failed to push chunk to echo memblockq");
+        pa_log_error("Failed to push chunk to reference memblockq");
         return r;
     }
 
@@ -410,12 +410,12 @@ int pa_processor_push_data(pa_processor *processor, pa_memchunk *chunk) {
     }
 
     if ((r = pa_memblockq_push(processor->reference_memblockq, chunk)) < 0)
-        pa_log_error("Failed to push chunk to echo memblockq");
+        pa_log_error("Failed to push chunk to reference memblockq");
 
     if (processor->resampler)
         pa_memblock_unref(chunk->memblock);
 
-    pa_log_debug("Pushed echo data. bytes(%zu), msec(%" PRIu64 "ms), nblocks(%d) index(%" PRId64 ":%" PRId64 ")",
+    pa_log_debug("Pushed reference data. bytes(%zu), msec(%" PRIu64 "ms), nblocks(%d) index(%" PRId64 ":%" PRId64 ")",
                     chunk->length,
                     pa_bytes_to_usec(chunk->length, &processor->reference_memblockq_ss) / PA_USEC_PER_MSEC,
                     pa_memblockq_get_nblocks(processor->reference_memblockq),

diff --git a/src/echo-cancel/processor.h b/src/echo-cancel/processor.h
index fa77e87..ea07143 100644 (file)
--- a/src/echo-cancel/processor.h
+++ b/src/echo-cancel/processor.h
@@ -55,7 +55,7 @@ int pa_processor_bind_reference(pa_processor *processor,
                                 pa_channel_map *reference_chmap);
 int pa_processor_setup_reference_memblockq_padding(pa_processor *processor, pa_usec_t latency);
 int pa_processor_process(pa_processor *processor, pa_memchunk *rec, pa_memchunk *out);
-int pa_processor_push_data(pa_processor *processor, pa_memchunk *chunk);
+int pa_processor_push_reference(pa_processor *processor, pa_memchunk *chunk);
 void pa_processor_flush(pa_processor *processor);
 int pa_processor_free(pa_processor *processor);
 pa_processor_method_t pa_processor_get_method(const char *requset_method, const char *default_method);