commit bbf21a3fd617abb37567a86e65f8ba18b8d64eb2
author Fredrik Solenberg <solenberg@webrtc.org> Thu Apr 12 22:44:09 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Thu Apr 12 22:05:27 2018 +0000
tree 296ca456e1498ec492fec1a66fbca6bb4b26f5a1
parent 0ab56511f14ce50b23341fd0c548575d024df2a5

Remove dependencies on modules:module_api from AudioProcessing.

- Directly include api/audio/audio_frame.h everywhere AudioFrame is used.
- This *will* remove transient dependencies on libjpeg and a bunch of other things from the e.g. APM.
- audio_frame.h still included from module_common_types.h for backwards compatibility with clients.

Bug: webrtc:9139, webrtc:7504
Change-Id: Id96f9268c01667fbcc29a01f5c1dd25a37836897
Reviewed-on: https://webrtc-review.googlesource.com/62464
Commit-Queue: Fredrik Solenberg <solenberg@webrtc.org>
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#22845}

modules/audio_coding/test/EncodeDecodeTest.h

diff --git a/modules/audio_coding/test/EncodeDecodeTest.h b/modules/audio_coding/test/EncodeDecodeTest.h
index 5351a2a..3855bc7 100644
--- a/modules/audio_coding/test/EncodeDecodeTest.h
+++ b/modules/audio_coding/test/EncodeDecodeTest.h
@@ -18,6 +18,7 @@
 #include "modules/audio_coding/test/ACMTest.h"
 #include "modules/audio_coding/test/PCMFile.h"
 #include "modules/audio_coding/test/RTPFile.h"
+#include "modules/include/module_common_types.h"
 #include "typedefs.h"  // NOLINT(build/include)
 
 namespace webrtc {

modules/audio_coding/test/PCMFile.cc

diff --git a/modules/audio_coding/test/PCMFile.cc b/modules/audio_coding/test/PCMFile.cc
index e9e9430..bdb46eb 100644
--- a/modules/audio_coding/test/PCMFile.cc
+++ b/modules/audio_coding/test/PCMFile.cc
@@ -14,7 +14,6 @@
 #include <stdio.h>
 #include <string.h>
 
-#include "modules/include/module_common_types.h"
 #include "test/gtest.h"
 
 namespace webrtc {

modules/audio_coding/test/PCMFile.h

diff --git a/modules/audio_coding/test/PCMFile.h b/modules/audio_coding/test/PCMFile.h
index bbf2571..84386dc 100644
--- a/modules/audio_coding/test/PCMFile.h
+++ b/modules/audio_coding/test/PCMFile.h
@@ -16,8 +16,8 @@
 
 #include <string>
 
+#include "api/audio/audio_frame.h"
 #include "api/optional.h"
-#include "modules/include/module_common_types.h"
 #include "typedefs.h"  // NOLINT(build/include)
 
 namespace webrtc {

modules/audio_coding/test/RTPFile.cc

diff --git a/modules/audio_coding/test/RTPFile.cc b/modules/audio_coding/test/RTPFile.cc
index 6ea5354..8cc5bd9 100644
--- a/modules/audio_coding/test/RTPFile.cc
+++ b/modules/audio_coding/test/RTPFile.cc
@@ -19,8 +19,7 @@
 #   include <arpa/inet.h>
 #endif
 
-#include "audio_coding_module.h"
-#include "rtc_base/synchronization/rw_lock_wrapper.h"
+#include "modules/include/module_common_types.h"
 // TODO(tlegrand): Consider removing usage of gtest.
 #include "test/gtest.h"
 #include "typedefs.h"  // NOLINT(build/include)

modules/audio_coding/test/RTPFile.h

diff --git a/modules/audio_coding/test/RTPFile.h b/modules/audio_coding/test/RTPFile.h
index d7e8c26..b9afe2f 100644
--- a/modules/audio_coding/test/RTPFile.h
+++ b/modules/audio_coding/test/RTPFile.h
@@ -15,7 +15,6 @@
 #include <queue>
 
 #include "modules/audio_coding/include/audio_coding_module.h"
-#include "modules/include/module_common_types.h"
 #include "rtc_base/synchronization/rw_lock_wrapper.h"
 #include "typedefs.h"  // NOLINT(build/include)
 

modules/audio_coding/test/insert_packet_with_timing.cc

diff --git a/modules/audio_coding/test/insert_packet_with_timing.cc b/modules/audio_coding/test/insert_packet_with_timing.cc
index d34fa20..2fe52a1 100644
--- a/modules/audio_coding/test/insert_packet_with_timing.cc
+++ b/modules/audio_coding/test/insert_packet_with_timing.cc
@@ -19,7 +19,6 @@
 #include "modules/audio_coding/include/audio_coding_module.h"
 #include "modules/audio_coding/test/Channel.h"
 #include "modules/audio_coding/test/PCMFile.h"
-#include "modules/include/module_common_types.h"
 #include "rtc_base/flags.h"
 #include "system_wrappers/include/clock.h"
 #include "test/gtest.h"

modules/audio_coding/test/target_delay_unittest.cc

diff --git a/modules/audio_coding/test/target_delay_unittest.cc b/modules/audio_coding/test/target_delay_unittest.cc
index 575dd70..89bf34f 100644
--- a/modules/audio_coding/test/target_delay_unittest.cc
+++ b/modules/audio_coding/test/target_delay_unittest.cc
@@ -10,6 +10,7 @@
 
 #include <memory>
 
+#include "api/audio/audio_frame.h"
 #include "api/audio_codecs/builtin_audio_decoder_factory.h"
 #include "common_types.h"  // NOLINT(build/include)
 #include "modules/audio_coding/codecs/pcm16b/pcm16b.h"