[Chromecast] Correct libcast_governor behavior.

chromecast/media/cma/backend/alsa/slew_volume.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chromecast/media/cma/backend/alsa/slew_volume.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "media/base/vector_math.h"
 
 namespace {
 
 // The time to slew from current volume to target volume.
 const int kMaxSlewTimeMs = 100;
 const int kDefaultSampleRate = 44100;
-}
+
+}  // namespace
 
 namespace chromecast {
 namespace media {
 
 SlewVolume::SlewVolume() : SlewVolume(kMaxSlewTimeMs) {}
 
 SlewVolume::SlewVolume(int max_slew_time_ms)
     : sample_rate_(kDefaultSampleRate),
       max_slew_time_ms_(max_slew_time_ms),
-      max_slew_per_sample_(1000.0 / (max_slew_time_ms_ * sample_rate_)) {
-  LOG(INFO) << "Creating a slew volume: " << max_slew_time_ms;
-}
+      max_slew_per_sample_(1000.0 / (max_slew_time_ms_ * sample_rate_)) {}
 
 void SlewVolume::SetSampleRate(int sample_rate) {
   sample_rate_ = sample_rate;
   SetVolume(volume_scale_);
 }
 
 // Slew rate should be volume_to_slew / slew_time / sample_rate
 void SlewVolume::SetVolume(double volume_scale) {
   volume_scale_ = volume_scale;
   if (interrupted_) {
     current_volume_ = volume_scale_;
   }
   if (volume_scale_ > current_volume_) {
     max_slew_per_sample_ = (volume_scale_ - current_volume_) * 1000.0 /
                            (max_slew_time_ms_ * sample_rate_);
   } else {
     max_slew_per_sample_ = (current_volume_ - volume_scale_) * 1000.0 /
                            (max_slew_time_ms_ * sample_rate_);
   }
 }
 
 void SlewVolume::SetMaxSlewTimeMs(int max_slew_time_ms) {
+  DCHECK_GE(max_slew_time_ms, 0);
+
   max_slew_time_ms_ = max_slew_time_ms;
 }
 
 void SlewVolume::Interrupted() {
   interrupted_ = true;
   current_volume_ = volume_scale_;
 }
 
 void SlewVolume::ProcessFMAC(bool repeat_transition,
                              const float* src,
@@ skipping 17 matching lines @@
   } else {
     last_starting_volume_ = current_volume_;
   }
 
   if (current_volume_ == volume_scale_) {
     if (current_volume_ == 0.0) {
       return;
     }
     ::media::vector_math::FMAC(src, current_volume_, frames, dest);
     return;
-  } else if (current_volume_ < volume_scale_) {
+  }
+
+  int original_frames = frames;
+  if (current_volume_ < volume_scale_) {
     do {
       (*dest) += (*src) * current_volume_;
       ++src;
       ++dest;
       --frames;
       current_volume_ += max_slew_per_sample_;
     } while (current_volume_ < volume_scale_ && frames);
     current_volume_ = std::min(current_volume_, volume_scale_);
   } else {  // current_volume_ > volume_scale_
     do {
       (*dest) += (*src) * current_volume_;
       ++src;
       ++dest;
       --frames;
       current_volume_ -= max_slew_per_sample_;
     } while (current_volume_ > volume_scale_ && frames);
     current_volume_ = std::max(current_volume_, volume_scale_);
   }
 
+  while (frames && ((original_frames - frames) % 4) != 0) {

[bcf, 2017/05/03 06:14:07]

I think this would be more explict as:

while (frames && (static_cast<uintptr_t>(src) %
media::vector_math::kRequiredAlignment) != 0) {

[bshaya, 2017/05/03 16:51:56]

Done.

[bcf, 2017/05/03 18:07:09]

This LGTM, but FYI the compiler will realize kRequiredAlignment is a power of
two and perform an optimization like this automatically.

[bshaya, 2017/05/04 03:01:18]

That's fine. This is the same code that vector_math.cc uses to DCHECK, so it
makes sense to be consistent.

+    (*dest) += (*src) * current_volume_;
+    ++src;
+    ++dest;
+    --frames;
+  }
   if (frames) {
-    for (int f = 0; f < frames; ++f) {
-      dest[f] += src[f] * current_volume_;
-    }
+    ::media::vector_math::FMAC(src, current_volume_, frames, dest);
   }
 }
 
+void SlewVolume::ProcessFMUL(bool repeat_transition,
+                             const float* src,
+                             int frames,
+                             float* dest) {
+  DCHECK(src);
+  DCHECK(dest);
+  // Ensure |src| and |dest| are 16-byte aligned.
+  DCHECK_EQ(0u, reinterpret_cast<uintptr_t>(src) &
+                    (::media::vector_math::kRequiredAlignment - 1));
+  DCHECK_EQ(0u, reinterpret_cast<uintptr_t>(dest) &
+                    (::media::vector_math::kRequiredAlignment - 1));
+
+  if (!frames) {
+    return;
+  }
+
+  interrupted_ = false;
+  if (repeat_transition) {
+    current_volume_ = last_starting_volume_;
+  } else {
+    last_starting_volume_ = current_volume_;
+  }
+
+  if (current_volume_ == volume_scale_) {
+    if (current_volume_ == 0.0) {
+      memset(dest, 0, frames * sizeof(*dest));

[bcf, 2017/05/03 06:14:07]

return after this?

[bshaya, 2017/05/03 16:51:56]

Done.

+    }
+    ::media::vector_math::FMUL(src, current_volume_, frames, dest);
+    return;
+  }
+
+  int original_frames = frames;
+  if (current_volume_ < volume_scale_) {
+    do {
+      (*dest) = (*src) * current_volume_;
+      ++src;
+      ++dest;
+      --frames;
+      current_volume_ += max_slew_per_sample_;
+    } while (current_volume_ < volume_scale_ && frames);
+    current_volume_ = std::min(current_volume_, volume_scale_);
+  } else {  // current_volume_ > volume_scale_
+    do {
+      (*dest) = (*src) * current_volume_;
+      ++src;
+      ++dest;
+      --frames;
+      current_volume_ -= max_slew_per_sample_;
+    } while (current_volume_ > volume_scale_ && frames);
+    current_volume_ = std::max(current_volume_, volume_scale_);
+  }
+
+  // Re-align to 16 bytes.
+  while (frames && ((original_frames - frames) % 4) != 0) {

[bcf, 2017/05/03 06:14:07]

ditto. Also the statement becomes self documenting then.

[bshaya, 2017/05/03 16:51:56]

Done.

+    (*dest) = (*src) * current_volume_;
+    ++src;
+    ++dest;
+    --frames;
+  }
+  if (frames) {
+    ::media::vector_math::FMUL(src, current_volume_, frames, dest);
+  }
+}
+
 // Scaling samples naively like this takes 0.2% of the CPU's time @ 44100hz
 // on pineapple.
 // Assumes 2 channel audio.
 bool SlewVolume::ProcessInterleaved(int32_t* data, int frames) {
   DCHECK(data);
 
   if (!frames) {
     return true;
   }
 
@@ skipping 38 matching lines @@
   }
 
   for (int i = 0; i < 2 * frames; ++i) {
     data[i] *= current_volume_;
   }
   return true;
 }
 
 }  // namespace media
 }  // namespace chromecast