commit 087bd34d23dee541915aae59781bf3ef033d8082
author kwiberg <kwiberg@webrtc.org> Fri Feb 10 08:15:44 2017 -0800
committer Commit bot <commit-bot@chromium.org> Fri Feb 10 16:15:44 2017 +0000
tree 076cbdbfc3b19629c785d260589645715a30e4ab
parent 84a3759825ec3bcba104196148be15aabc258a08

Move AudioDecoder and related stuff to the api/ directory

BUG=webrtc:5805, webrtc:6725

Review-Url: https://codereview.webrtc.org/2668523004
Cr-Commit-Position: refs/heads/master@{#16534}

webrtc/voice_engine/BUILD.gn

diff --git a/webrtc/voice_engine/BUILD.gn b/webrtc/voice_engine/BUILD.gn
index ea2549f..22739af 100644
--- a/webrtc/voice_engine/BUILD.gn
+++ b/webrtc/voice_engine/BUILD.gn
@@ -15,9 +15,9 @@
   ]
   deps = [
     "..:webrtc_common",
+    "../api/audio_codecs:builtin_audio_decoder_factory",
     "../modules/audio_coding",
     "../modules/audio_coding:audio_format_conversion",
-    "../modules/audio_coding:builtin_audio_decoder_factory",
     "../modules/audio_coding:rent_a_codec",
   ]
 
@@ -152,13 +152,13 @@
     "../api:audio_mixer_api",
     "../api:call_api",
     "../api:transport_api",
+    "../api/audio_codecs:audio_codecs_api",
+    "../api/audio_codecs:builtin_audio_decoder_factory",
     "../audio/utility:audio_frame_operations",
     "../base:rtc_base_approved",
     "../common_audio",
     "../logging:rtc_event_log_api",
-    "../modules/audio_coding:audio_decoder_factory_interface",
     "../modules/audio_coding:audio_format_conversion",
-    "../modules/audio_coding:builtin_audio_decoder_factory",
     "../modules/audio_coding:rent_a_codec",
     "../modules/audio_conference_mixer",
     "../modules/audio_device",

webrtc/voice_engine/coder.cc

diff --git a/webrtc/voice_engine/coder.cc b/webrtc/voice_engine/coder.cc
index 82eb248..552e5a5 100644
--- a/webrtc/voice_engine/coder.cc
+++ b/webrtc/voice_engine/coder.cc
@@ -10,9 +10,9 @@
 
 #include "webrtc/voice_engine/coder.h"
 
+#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/common_types.h"
 #include "webrtc/modules/audio_coding/codecs/audio_format_conversion.h"
-#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/modules/include/module_common_types.h"
 
 namespace webrtc {

webrtc/voice_engine/include/voe_base.h

diff --git a/webrtc/voice_engine/include/voe_base.h b/webrtc/voice_engine/include/voe_base.h
index bdc1a26..95a3fd7 100644
--- a/webrtc/voice_engine/include/voe_base.h
+++ b/webrtc/voice_engine/include/voe_base.h
@@ -34,10 +34,10 @@
 #ifndef WEBRTC_VOICE_ENGINE_VOE_BASE_H
 #define WEBRTC_VOICE_ENGINE_VOE_BASE_H
 
+#include "webrtc/api/audio_codecs/audio_decoder_factory.h"
 #include "webrtc/base/scoped_ref_ptr.h"
-#include "webrtc/modules/audio_coding/codecs/audio_decoder_factory.h"
-#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/common_types.h"
+#include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 
 namespace webrtc {
 

webrtc/voice_engine/voe_base_impl.cc

diff --git a/webrtc/voice_engine/voe_base_impl.cc b/webrtc/voice_engine/voe_base_impl.cc
index fecb16a..6432e50 100644
--- a/webrtc/voice_engine/voe_base_impl.cc
+++ b/webrtc/voice_engine/voe_base_impl.cc
@@ -10,10 +10,10 @@
 
 #include "webrtc/voice_engine/voe_base_impl.h"
 
+#include "webrtc/api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/base/format_macros.h"
 #include "webrtc/base/logging.h"
 #include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
-#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
 #include "webrtc/modules/audio_coding/include/audio_coding_module.h"
 #include "webrtc/modules/audio_device/audio_device_impl.h"
 #include "webrtc/modules/audio_processing/include/audio_processing.h"