Move functionality out from AudioFrame and into AudioFrameOperations.

webrtc/audio/utility/audio_frame_operations_unittest.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.
  */
 
+#include "webrtc/audio/utility/audio_frame_operations.h"
 #include "webrtc/base/checks.h"
 #include "webrtc/modules/include/module_common_types.h"
-#include "webrtc/modules/utility/include/audio_frame_operations.h"
 #include "webrtc/test/gtest.h"
 
 namespace webrtc {
 namespace {
 
 class AudioFrameOperationsTest : public ::testing::Test {
  protected:
   AudioFrameOperationsTest() {
     // Set typical values.
     frame_.samples_per_channel_ = 320;
@@ skipping 334 matching lines @@
   SetFrameData(&frame_, 1);
   EXPECT_EQ(0, AudioFrameOperations::ScaleWithSat(2.0, frame_));
 
   AudioFrame scaled_frame;
   scaled_frame.samples_per_channel_ = 320;
   scaled_frame.num_channels_ = 1;
   SetFrameData(&scaled_frame, 2);
   VerifyFramesAreEqual(scaled_frame, frame_);
 }
 
+TEST_F(AudioFrameOperationsTest, AddingXToEmptyGivesX) {
+  // When samples_per_channel_ is 0, the frame counts as empty and zero.
+  AudioFrame frame_to_add_to;
+  frame_to_add_to.samples_per_channel_ = 0;
+  frame_to_add_to.num_channels_ = frame_.num_channels_;
+
+  AudioFrameOperations::Add(frame_, &frame_to_add_to);
+  VerifyFramesAreEqual(frame_, frame_to_add_to);
+}
+
+TEST_F(AudioFrameOperationsTest, AddingTwoFramesProducesTheirSum) {
+  AudioFrame frame_to_add_to;
+  frame_to_add_to.samples_per_channel_ = frame_.samples_per_channel_;
+  frame_to_add_to.num_channels_ = frame_.num_channels_;
+  SetFrameData(&frame_to_add_to, 1000);
+
+  AudioFrameOperations::Add(frame_, &frame_to_add_to);
+  SetFrameData(&frame_, frame_.data_[0] + 1000);
+  VerifyFramesAreEqual(frame_, frame_to_add_to);
+}
 }  // namespace
 }  // namespace webrtc