[pulseaudio-commits] 3 commits - src/pulsecore

[Tanu Kaskinen]

 src/pulsecore/sink.c   |   11 +++++------
 src/pulsecore/source.c |   11 +++++------
 2 files changed, 10 insertions(+), 12 deletions(-)

New commits:
commit 963da3de93ed814e23e3e3dc3bca6339af80f960
Author: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
Date:   Fri Aug 9 08:56:23 2013 +0300

    sink, source: Small readability improvement

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index bcf496a..2c33af4 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -1415,8 +1415,7 @@ bool pa_sink_update_rate(pa_sink *s, uint32_t rate, bool passthrough) {
         pa_assert((default_rate % 4000 == 0) || (default_rate % 11025 == 0));
         pa_assert((alternate_rate % 4000 == 0) || (alternate_rate % 11025 == 0));
 
-        if (default_rate % 4000) {
-            /* default is a 11025 multiple */
+        if (default_rate % 11025 == 0) {
             if ((alternate_rate % 4000 == 0) && (desired_rate % 4000 == 0))
                 use_alternate=true;
         } else {
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index e8d6a41..3293812 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -998,8 +998,7 @@ bool pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough) {
         pa_assert((default_rate % 4000 == 0) || (default_rate % 11025 == 0));
         pa_assert((alternate_rate % 4000 == 0) || (alternate_rate % 11025 == 0));
 
-        if (default_rate % 4000) {
-            /* default is a 11025 multiple */
+        if (default_rate % 11025 == 0) {
             if ((alternate_rate % 4000 == 0) && (desired_rate % 4000 == 0))
                 use_alternate=true;
         } else {

commit eeea84d196e1000d09d3cde80a69b671abd326fe
Author: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
Date:   Fri Aug 9 08:55:52 2013 +0300

    sink, source: Fix default and alternate rate assertions

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index cd08b99..bcf496a 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -1412,8 +1412,8 @@ bool pa_sink_update_rate(pa_sink *s, uint32_t rate, bool passthrough) {
         return false;
 
     if (!passthrough) {
-        pa_assert(default_rate % 4000 || default_rate % 11025);
-        pa_assert(alternate_rate % 4000 || alternate_rate % 11025);
+        pa_assert((default_rate % 4000 == 0) || (default_rate % 11025 == 0));
+        pa_assert((alternate_rate % 4000 == 0) || (alternate_rate % 11025 == 0));
 
         if (default_rate % 4000) {
             /* default is a 11025 multiple */
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 0029454..e8d6a41 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -995,8 +995,8 @@ bool pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough) {
         return false;
 
     if (!passthrough) {
-        pa_assert(default_rate % 4000 || default_rate % 11025);
-        pa_assert(alternate_rate % 4000 || alternate_rate % 11025);
+        pa_assert((default_rate % 4000 == 0) || (default_rate % 11025 == 0));
+        pa_assert((alternate_rate % 4000 == 0) || (alternate_rate % 11025 == 0));
 
         if (default_rate % 4000) {
             /* default is a 11025 multiple */

commit 22058713af28930c2b95318937c06a8786b41c94
Author: Tanu Kaskinen <tanu.kaskinen at linux.intel.com>
Date:   Fri Aug 9 08:51:12 2013 +0300

    sink, source: Don't care about default and alternate rate in passthrough mode
    
    In passthrough mode the device rate is set to match the stream rate,
    and the default and alternate rates are ignored.

diff --git a/src/pulsecore/sink.c b/src/pulsecore/sink.c
index 2f5174e..cd08b99 100644
--- a/src/pulsecore/sink.c
+++ b/src/pulsecore/sink.c
@@ -1389,8 +1389,8 @@ bool pa_sink_update_rate(pa_sink *s, uint32_t rate, bool passthrough) {
     if (!s->update_rate)
         return false;
 
-    if (PA_UNLIKELY(default_rate == alternate_rate)) {
-        pa_log_warn("Default and alternate sample rates are the same.");
+    if (PA_UNLIKELY(default_rate == alternate_rate && !passthrough)) {
+        pa_log_debug("Default and alternate sample rates are the same.");
         return false;
     }
 
diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 2c8d440..0029454 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -979,8 +979,8 @@ bool pa_source_update_rate(pa_source *s, uint32_t rate, bool passthrough) {
     if (!s->update_rate)
         return false;
 
-    if (PA_UNLIKELY(default_rate == alternate_rate)) {
-        pa_log_warn("Default and alternate sample rates are the same.");
+    if (PA_UNLIKELY(default_rate == alternate_rate && !passthrough)) {
+        pa_log_debug("Default and alternate sample rates are the same.");
         return false;
     }