Move audio_frame_operations to the utility module.

TBR=henrika@webrtc.org
BUG=issue551
TEST=voe_auto_test, webrtc_utility_unittest, trybots

Review URL: https://webrtc-codereview.appspot.com/599006

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2318 4adac7df-926f-26a2-2b94-8c16560cd09d

src/modules/audio_conference_mixer/source/audio_conference_mixer.gypi

@@ -13,6 +13,7 @@
       'type': '<(library)',
       'dependencies': [
         'audio_processing',
+        'webrtc_utility',
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
       'include_dirs': [

src/modules/audio_conference_mixer/source/audio_conference_mixer_impl.cc

@@ -14,7 +14,7 @@
 #include "audio_processing.h"
 #include "critical_section_wrapper.h"
 #include "map_wrapper.h"
-#include "voice_engine/main/source/audio_frame_operations.h"
+#include "modules/utility/interface/audio_frame_operations.h"
 #include "trace.h"
 
 namespace webrtc {

src/modules/utility/interface/audio_frame_operations.h

@@ -18,8 +18,8 @@ namespace webrtc {
 class AudioFrame;
 
 // TODO(andrew): consolidate this with utility.h and audio_frame_manipulator.h.
-// Change reference parameters to pointers. Move out of VoE to a common place.
-// Consider using a namespace rather than class.
+// Change reference parameters to pointers. Consider using a namespace rather
+// than a class.
 class AudioFrameOperations {
  public:
   static int MonoToStereo(AudioFrame& frame);

src/modules/utility/source/utility.gypi

@@ -29,10 +29,12 @@
         ],
       },
       'sources': [
+        '../interface/audio_frame_operations.h'
         '../interface/file_player.h',
         '../interface/file_recorder.h',
         '../interface/process_thread.h',
         '../interface/rtp_dump.h',
+        'audio_frame_operations.cc',
         'coder.cc',
         'coder.h',
         'file_player_impl.cc',
@@ -77,6 +79,7 @@
             '<(webrtc_root)/../test/test.gyp:test_support_main',
           ],
           'sources': [
+            'audio_frame_operations_unittest.cc',
             'file_player_unittest.cc',
           ],
         }, # webrtc_utility_unittests

src/voice_engine/main/source/voice_engine_core.gypi

@@ -54,8 +54,6 @@
         '../interface/voe_rtp_rtcp.h',
         '../interface/voe_video_sync.h',
         '../interface/voe_volume_control.h',
-        'audio_frame_operations.cc',
-        'audio_frame_operations.h',
         'channel.cc',
         'channel.h',
         'channel_manager.cc',
@@ -141,7 +139,6 @@
             '../interface',
           ],
           'sources': [
-            'audio_frame_operations_unittest.cc',
             'channel_unittest.cc',
           ],
         },