Reformat existing code. There should be no functional effects.

webrtc/modules/audio_coding/neteq/merge.cc

 /*
  *  Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 291 matching lines @@
                              num_coefficients, decimation_factor,
                              kCompensateDelay);
   }
 }
 
 int16_t Merge::CorrelateAndPeakSearch(int16_t expanded_max, int16_t input_max,
                                       int start_position, int input_length,
                                       int expand_period) const {
   // Calculate correlation without any normalization.
   const int max_corr_length = kMaxCorrelationLength;
-  int stop_position_downsamp = std::min(
-      max_corr_length, expand_->max_lag() / (fs_mult_ * 2) + 1);
+  int stop_position_downsamp =
+      std::min(max_corr_length, expand_->max_lag() / (fs_mult_ * 2) + 1);
   int correlation_shift = 0;
   if (expanded_max * input_max > 26843546) {
     correlation_shift = 3;
   }
 
   int32_t correlation[kMaxCorrelationLength];
   WebRtcSpl_CrossCorrelation(correlation, input_downsampled_,
                              expanded_downsampled_, kInputDownsampLength,
                              stop_position_downsamp, correlation_shift, 1);
 
@@ skipping 33 matching lines @@
   DspHelper::PeakDetection(&correlation_ptr[start_index_downsamp],
                            modified_stop_pos, kNumCorrelationCandidates,
                            fs_mult_, &best_correlation_index,
                            &best_correlation);
   // Compensate for modified start index.
   best_correlation_index += start_index;
 
   // Ensure that underrun does not occur for 10ms case => we have to get at
   // least 10ms + overlap . (This should never happen thanks to the above
   // modification of peak-finding starting point.)
-  while ((best_correlation_index + input_length) <
-      static_cast<int>(timestamps_per_call_ + expand_->overlap_length()) ||
-      best_correlation_index + input_length < start_position) {
+  while (((best_correlation_index + input_length) <
+      static_cast<int>(timestamps_per_call_ + expand_->overlap_length())) ||
+      ((best_correlation_index + input_length) < start_position)) {

[kwiberg-webrtc, 2015/06/10 11:58:32]

Why the extra parentheses? There were too many to begin with.

To get rid of the repetition, maybe

  best_correlation_index + input_length
    < std::max<int>(timestamps_per_call_ + expand_->overlap_length(),
                    start_position)

but to make it truly readable one would probably have to extract at least one
named subexpression.

     assert(false);  // Should never happen.
     best_correlation_index += expand_period;  // Jump one lag ahead.
   }
   return best_correlation_index;
 }
 
 int Merge::RequiredFutureSamples() {
   return static_cast<int>(fs_hz_ / 100 * num_channels_);  // 10 ms.
 }
 
 
 }  // namespace webrtc