Move AudioDecoder and related stuff to the api/ directory

webrtc/modules/audio_coding/BUILD.gn

Index: webrtc/modules/audio_coding/BUILD.gn
diff --git a/webrtc/modules/audio_coding/BUILD.gn b/webrtc/modules/audio_coding/BUILD.gn
index 1d3c2d1016f012b7aafd2355e54efbf03b53c1bf..9c06b9b6cc92a6232e243e343e040a8bb629d41e 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -39,52 +39,27 @@ audio_coding_deps = audio_codec_deps + [
                       "../../system_wrappers",
                     ]
 
-rtc_static_library("audio_format") {
-  sources = [
-    "codecs/audio_format.cc",
-    "codecs/audio_format.h",
-  ]
-  deps = [
-    "../..:webrtc_common",
-  ]
-}
-
 rtc_static_library("audio_format_conversion") {
   sources = [
     "codecs/audio_format_conversion.cc",
     "codecs/audio_format_conversion.h",
   ]
   deps = [
-    ":audio_format",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_format",
     "../../base:rtc_base_approved",
   ]
 }
 
-rtc_source_set("audio_decoder_factory_interface") {
-  sources = [
-    "codecs/audio_decoder_factory.h",
-  ]
-  deps = [
-    ":audio_decoder_interface",
-    ":audio_format",
-
-    # TODO(charujain): Clean this dependency when downstream projects are
-    # updated to properly depend on audio_format_conversion target.
-    ":audio_format_conversion",
-    "../../base:rtc_base_approved",
-  ]
-}
-
-rtc_static_library("builtin_audio_decoder_factory") {
+rtc_static_library("internal_builtin_audio_decoder_factory") {
   sources = [
-    "codecs/builtin_audio_decoder_factory.cc",
-    "codecs/builtin_audio_decoder_factory.h",
+    "codecs/internal_builtin_audio_decoder_factory.cc",
+    "codecs/internal_builtin_audio_decoder_factory.h",
   ]
   deps = [
            "../..:webrtc_common",
            "../../base:rtc_base_approved",
-           ":audio_decoder_factory_interface",
+           "../../api/audio_codec:audio_decoder_factory_interface",
          ] + audio_codec_deps
   defines = audio_codec_defines
 }
@@ -101,7 +76,7 @@ rtc_static_library("rent_a_codec") {
     "acm2/rent_a_codec.h",
   ]
   deps = [
-           ":audio_decoder_interface",
+           "../../api/audio_codec:audio_decoder_interface",
            "../..:webrtc_common",
            "../../base:rtc_base_approved",
          ] + audio_codec_deps
@@ -149,9 +124,9 @@ rtc_static_library("audio_coding") {
   }
 
   deps = audio_coding_deps + [
-           ":audio_decoder_interface",
-           ":audio_decoder_factory_interface",
-           ":builtin_audio_decoder_factory",
+           "../../api/audio_codec:audio_decoder_interface",
+           "../../api/audio_codec:audio_decoder_factory_interface",
+           "../../api/audio_codec:builtin_audio_decoder_factory",
            ":neteq",
            ":rent_a_codec",
            "../../base:rtc_base_approved",
@@ -160,15 +135,13 @@ rtc_static_library("audio_coding") {
   defines = audio_coding_defines
 }
 
-rtc_static_library("audio_decoder_interface") {
+rtc_static_library("legacy_encoded_audio_frame") {
   sources = [
-    "codecs/audio_decoder.cc",
-    "codecs/audio_decoder.h",
     "codecs/legacy_encoded_audio_frame.cc",
     "codecs/legacy_encoded_audio_frame.h",
   ]
   deps = [
-    "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../base:rtc_base_approved",
   ]
 }
@@ -246,9 +219,10 @@ rtc_static_library("g711") {
   public_configs = [ ":g711_config" ]
 
   deps = [
-    ":audio_decoder_interface",
     ":audio_encoder_interface",
+    ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../base:rtc_base_approved",
   ]
   public_deps = [
@@ -287,9 +261,10 @@ rtc_static_library("g722") {
   public_configs = [ ":g722_config" ]
 
   deps = [
-    ":audio_decoder_interface",
     ":audio_encoder_interface",
+    ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../base:rtc_base_approved",
   ]
   public_deps = [
@@ -329,9 +304,10 @@ rtc_static_library("ilbc") {
   public_configs = [ ":ilbc_config" ]
 
   deps = [
-    ":audio_decoder_interface",
     ":audio_encoder_interface",
+    ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../base:rtc_base_approved",
     "../../common_audio",
   ]
@@ -487,9 +463,9 @@ rtc_source_set("ilbc_c") {
   public_configs = [ ":ilbc_config" ]
 
   deps = [
-    ":audio_decoder_interface",
     ":audio_encoder_interface",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../base:rtc_base_approved",
     "../../common_audio",
   ]
@@ -525,9 +501,9 @@ rtc_static_library("isac") {
   ]
 
   deps = [
-    ":audio_decoder_interface",
     ":audio_encoder_interface",
     ":isac_common",
+    "../../api/audio_codec:audio_decoder_interface",
   ]
   public_deps = [
     ":isac_c",
@@ -619,9 +595,9 @@ rtc_static_library("isac_fix") {
   public_configs = [ ":isac_fix_config" ]
 
   deps = [
-    ":audio_decoder_interface",
     ":audio_encoder_interface",
     ":isac_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../common_audio",
     "../../system_wrappers",
   ]
@@ -695,10 +671,10 @@ rtc_source_set("isac_fix_c") {
   public_configs = [ ":isac_fix_config" ]
 
   deps = [
-    ":audio_decoder_interface",
     ":audio_encoder_interface",
     ":isac_common",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../base:rtc_base_approved",
     "../../common_audio",
     "../../system_wrappers",
@@ -799,10 +775,11 @@ rtc_static_library("pcm16b") {
   ]
 
   deps = [
-    ":audio_decoder_interface",
     ":audio_encoder_interface",
     ":g711",
+    ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../base:rtc_base_approved",
   ]
   public_deps = [
@@ -837,10 +814,10 @@ rtc_static_library("webrtc_opus") {
   ]
 
   deps = [
-    ":audio_decoder_interface",
     ":audio_encoder_interface",
     ":audio_network_adaptor",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../base:rtc_base_approved",
     "../../base:rtc_numerics",
     "../../common_audio",
@@ -1029,16 +1006,16 @@ rtc_static_library("neteq") {
   ]
 
   deps = [
-    ":audio_decoder_factory_interface",
-    ":audio_decoder_interface",
-    ":audio_format",
-    ":builtin_audio_decoder_factory",
     ":cng",
     ":g711",
     ":isac_fix",
     ":pcm16b",
     ":rent_a_codec",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_factory_interface",
+    "../../api/audio_codec:audio_decoder_interface",
+    "../../api/audio_codec:audio_format",
+    "../../api/audio_codec:builtin_audio_decoder_factory",

[the sun, 2017/02/02 21:02:29]

1. Why does NetEq depend on builtin_audio_decoder_factory? It seems to be used
in its unit tests, but not by NetEq as such (which is as it should be).

2. Since we include the builtin factory, why do we need to explicitly pull in
the above deps? We must already have them transitively. If I'm using the lib to
build my app I want this to be easy - just add the builtin decoder factory and I
shouldn't need to worry about adding whatever other targets it needs to build. 

[kwiberg-webrtc, 2017/02/03 09:50:11]

It used to create a factory if it wasn't given one. We probably just forgot to
remove this dep when getting rid of the last call (we have no tool that finds
such errors). Fixed.
I thought the idea was that for each file you #include, you declare a dependency
on its build target. That's what I've done here. (We could lessen the need for
this by using public_deps, at the cost of making it much more difficult to
figure out what targets you do and do not need to declare deps on. Bad
trade-off, IMO.)

     "../../base:gtest_prod",
     "../../base:rtc_base_approved",
     "../../common_audio",
@@ -1093,9 +1070,9 @@ rtc_source_set("neteq_test_minimal") {
 
   deps = [
     ":audio_encoder_interface",
-    ":builtin_audio_decoder_factory",
     ":neteq",
     "../..:webrtc_common",
+    "../../api/audio_codec:builtin_audio_decoder_factory",
     "../../base:rtc_base_approved",
   ]
 }
@@ -1159,9 +1136,9 @@ if (rtc_include_tests) {
     deps = [
       ":audio_coding",
       ":audio_format_conversion",
-      ":builtin_audio_decoder_factory",
       ":pcm16b_c",
       "../..:webrtc_common",
+      "../../api/audio_codec:builtin_audio_decoder_factory",
       "../../base:rtc_base_approved",
       "../../system_wrappers:system_wrappers",
       "../../test:fileutils",
@@ -1213,8 +1190,8 @@ if (rtc_include_tests) {
     deps = audio_coding_deps + [
              ":audio_coding",
              ":audio_format_conversion",
-             ":audio_decoder_factory_interface",
-             ":builtin_audio_decoder_factory",
+             "../../api/audio_codec:audio_decoder_factory_interface",
+             "../../api/audio_codec:builtin_audio_decoder_factory",
              ":neteq_unittest_tools",
              "../../base:rtc_base_approved",
              "../../test:test_support",
@@ -1233,7 +1210,7 @@ if (rtc_include_tests) {
 
     deps = audio_coding_deps + [
              ":audio_coding",
-             ":audio_decoder_interface",
+             "../../api/audio_codec:audio_decoder_interface",
              ":audio_encoder_interface",
              ":neteq_unittest_tools",
              "../../base:rtc_base_approved",
@@ -1322,11 +1299,11 @@ if (rtc_include_tests) {
 
     deps += audio_coding_deps
     deps += [
-      ":audio_decoder_interface",
       ":isac",
       ":isac_fix",
       ":neteq",
       ":neteq_unittest_tools",
+      "../../api/audio_codec:audio_decoder_interface",
       "../../common_audio",
       "../../test:test_main",
       "//testing/gtest",
@@ -1457,12 +1434,12 @@ if (rtc_include_tests) {
     }
 
     deps = [
-      ":audio_decoder_interface",
-      ":builtin_audio_decoder_factory",
       ":neteq",
       ":neteq_unittest_tools",
       ":pcm16b",
       "../..:webrtc_common",
+      "../../api/audio_codec:audio_decoder_interface",
+      "../../api/audio_codec:builtin_audio_decoder_factory",
       "../../base:rtc_base_approved",
       "../../system_wrappers",
       "../../test:test_support",
@@ -1483,10 +1460,10 @@ if (rtc_include_tests) {
     }
 
     deps = [
-      ":builtin_audio_decoder_factory",
       ":neteq",
       ":neteq_unittest_tools",
       "../..:webrtc_common",
+      "../../api/audio_codec:builtin_audio_decoder_factory",
       "../../base:rtc_base_approved",
       "../../test:test_support",
       "//testing/gtest",
@@ -1537,10 +1514,10 @@ if (rtc_include_tests) {
     }
 
     deps = [
-      ":audio_decoder_interface",
       ":audio_encoder_interface",
       ":pcm16b",
       "../..:webrtc_common",
+      "../../api/audio_codec:audio_decoder_interface",
       "../../base:rtc_base_approved",
       "../../common_audio",
       "../../test:rtp_test_utils",
@@ -2060,17 +2037,16 @@ if (rtc_include_tests) {
       ":acm_receive_test",
       ":acm_send_test",
       ":audio_coding",
-      ":audio_decoder_interface",
       ":audio_encoder_interface",
       ":audio_format_conversion",
       ":audio_network_adaptor",
-      ":builtin_audio_decoder_factory",
       ":cng",
       ":g711",
       ":ilbc",
       ":isac",
       ":isac_c",
       ":isac_fix",
+      ":legacy_encoded_audio_frame",
       ":neteq",
       ":neteq_test_support",
       ":neteq_unittest_tools",
@@ -2079,6 +2055,8 @@ if (rtc_include_tests) {
       ":rent_a_codec",
       ":webrtc_opus",
       "../..:webrtc_common",
+      "../../api/audio_codec:audio_decoder_interface",
+      "../../api/audio_codec:builtin_audio_decoder_factory",
       "../../base:rtc_base",
       "../../base:rtc_base_approved",
       "../../base:rtc_base_tests_utils",
@@ -2112,3 +2090,27 @@ if (rtc_include_tests) {
     }
   }
 }
+
+# For backwards compatibility only! Use
+# webrtc/api/audio_codec:audio_decoder_interface instead.
+# TODO(kwiberg): Remove this.
+rtc_source_set("audio_decoder_interface") {
+  sources = [
+    "codecs/audio_decoder.h",
+  ]
+  deps = [

[kjellander_webrtc, 2017/02/01 14:54:50]

I thought you might need public_deps to not break GN check on existing users,
but maybe that's not always the case.

[ossu, 2017/02/01 15:05:26]

I think you need public_deps for these, or gn check will shout at using things
not explicitly depended on. That's what I had to do when moving peerconnection
from api/ to pc/.

[kwiberg-webrtc, 2017/02/01 20:15:03]

No... unless I've misunderstood what public_deps means, I don't think it's
needed at all ever as long as people depend on the build targets that contain
the headers they include.

[kjellander_webrtc, 2017/02/10 07:58:48]

That's correct, as long as they include the right targets it's fine (if GN check
is enabled for them, otherwise it doesn't really matter).

+    "../../api/audio_codec:audio_decoder_interface",
+  ]
+}
+
+# For backwards compatibility only! Use
+# webrtc/api/audio_codec:builtin_audio_decoder_factory instead.
+# TODO(kwiberg): Remove this.
+rtc_source_set("builtin_audio_decoder_factory") {
+  sources = [
+    "codecs/builtin_audio_decoder_factory.h",
+  ]
+  deps = [

[ossu, 2017/02/01 15:05:26]

Same here.

+    "../../api/audio_codec:builtin_audio_decoder_factory",
+  ]
+}