Injectable audio encoders: Moved audio encoder, factory and builtin factory to api/.

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 5ae3164b26a644e27ddd025f6066adf0b459fb0d..ef75a459017295fa509ab6b52358e2015278d9f7 100644
--- a/webrtc/modules/audio_coding/BUILD.gn
+++ b/webrtc/modules/audio_coding/BUILD.gn
@@ -51,37 +51,23 @@ rtc_static_library("audio_format_conversion") {
   ]
 }
 
-rtc_source_set("audio_encoder_factory_interface") {
-  sources = [
-    "codecs/audio_encoder_factory.h",
-  ]
-  deps = [
-    ":audio_encoder_interface",
-    "../../api/audio_codecs:audio_codecs_api",
-    "../../base:rtc_base_approved",
-  ]
-}
-
-rtc_static_library("builtin_audio_encoder_factory") {
-  # TODO(kjellander): Remove (bugs.webrtc.org/6828)
-  # Errors on cyclic dependency with :isac_fix if enabled.
-  check_includes = false
+rtc_static_library("builtin_audio_decoder_factory_internal") {
   sources = [
-    "codecs/builtin_audio_encoder_factory.cc",
-    "codecs/builtin_audio_encoder_factory.h",
+    "codecs/builtin_audio_decoder_factory_internal.cc",
+    "codecs/builtin_audio_decoder_factory_internal.h",
   ]
   deps = [
            "../..:webrtc_common",
            "../../base:rtc_base_approved",
-           ":audio_encoder_factory_interface",
+           "../../api/audio_codecs:audio_codecs_api",
          ] + audio_codec_deps
   defines = audio_codec_defines
 }
 
-rtc_static_library("builtin_audio_decoder_factory_internal") {
+rtc_static_library("builtin_audio_encoder_factory_internal") {
   sources = [
-    "codecs/builtin_audio_decoder_factory_internal.cc",
-    "codecs/builtin_audio_decoder_factory_internal.h",
+    "codecs/builtin_audio_encoder_factory_internal.cc",
+    "codecs/builtin_audio_encoder_factory_internal.h",
   ]
   deps = [
            "../..:webrtc_common",
@@ -104,7 +90,6 @@ rtc_static_library("rent_a_codec") {
            "../../base:rtc_base_approved",
            "../../system_wrappers",
            ":audio_coding_module_typedefs",
-           ":audio_encoder_interface",
            ":isac_common",
            ":isac_fix_c",
            ":neteq_decoder_enum",
@@ -163,7 +148,6 @@ rtc_static_library("audio_coding") {
            "../../api/audio_codecs:audio_codecs_api",
            "../../api/audio_codecs:builtin_audio_decoder_factory",
            ":audio_coding_module_typedefs",
-           ":audio_encoder_interface",
            ":neteq",
            ":rent_a_codec",
            "../../base:rtc_base_approved",
@@ -183,17 +167,6 @@ rtc_static_library("legacy_encoded_audio_frame") {
   ]
 }
 
-rtc_static_library("audio_encoder_interface") {
-  sources = [
-    "codecs/audio_encoder.cc",
-    "codecs/audio_encoder.h",
-  ]
-  deps = [
-    "../..:webrtc_common",
-    "../../base:rtc_base_approved",
-  ]
-}
-
 config("cng_config") {
   include_dirs = [
     "../../..",
@@ -212,8 +185,8 @@ rtc_static_library("cng") {
   public_configs = [ ":cng_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     "../..:webrtc_common",
+    "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
     "../../common_audio",
   ]
@@ -232,7 +205,7 @@ rtc_static_library("red") {
   public_configs = [ ":red_config" ]
 
   deps = [
-    ":audio_encoder_interface",
+    "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
     "../../common_audio",
   ]
@@ -256,7 +229,6 @@ rtc_static_library("g711") {
   public_configs = [ ":g711_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
@@ -298,7 +270,6 @@ rtc_static_library("g722") {
   public_configs = [ ":g722_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
@@ -341,7 +312,6 @@ rtc_static_library("ilbc") {
   public_configs = [ ":ilbc_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
@@ -500,7 +470,6 @@ rtc_source_set("ilbc_c") {
   public_configs = [ ":ilbc_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
@@ -516,7 +485,6 @@ rtc_static_library("isac_common") {
     "codecs/isac/locked_bandwidth_info.h",
   ]
   deps = [
-    ":audio_encoder_interface",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
@@ -539,7 +507,6 @@ rtc_static_library("isac") {
   ]
 
   deps = [
-    ":audio_encoder_interface",
     ":isac_common",
     "../../api/audio_codecs:audio_codecs_api",
   ]
@@ -633,7 +600,6 @@ rtc_static_library("isac_fix") {
   public_configs = [ ":isac_fix_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     ":isac_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../common_audio",
@@ -709,7 +675,6 @@ rtc_source_set("isac_fix_c") {
   public_configs = [ ":isac_fix_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     ":isac_common",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
@@ -813,7 +778,6 @@ rtc_static_library("pcm16b") {
   ]
 
   deps = [
-    ":audio_encoder_interface",
     ":g711",
     ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
@@ -852,7 +816,6 @@ rtc_static_library("webrtc_opus") {
   ]
 
   deps = [
-    ":audio_encoder_interface",
     ":audio_network_adaptor",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
@@ -1117,7 +1080,6 @@ rtc_source_set("neteq_test_minimal") {
   }
 
   deps = [
-    ":audio_encoder_interface",
     ":neteq",
     "../..:webrtc_common",
     "../../api/audio_codecs:builtin_audio_decoder_factory",
@@ -1259,7 +1221,6 @@ if (rtc_include_tests) {
     deps = audio_coding_deps + [
              ":audio_coding",
              "../../api/audio_codecs:audio_codecs_api",
-             ":audio_encoder_interface",
              ":neteq_unittest_tools",
              "../../base:rtc_base_approved",
              "../../test:test_support",
@@ -1564,7 +1525,6 @@ if (rtc_include_tests) {
     }
 
     deps = [
-      ":audio_encoder_interface",
       ":pcm16b",
       "../..:webrtc_common",
       "../../api/audio_codecs:audio_codecs_api",
@@ -2091,10 +2051,8 @@ if (rtc_include_tests) {
       ":acm_send_test",
       ":audio_coding",
       ":audio_coding_module_typedefs",
-      ":audio_encoder_interface",
       ":audio_format_conversion",
       ":audio_network_adaptor",
-      ":builtin_audio_encoder_factory",
       ":cng",
       ":g711",
       ":ilbc",
@@ -2112,6 +2070,7 @@ if (rtc_include_tests) {
       "../..:webrtc_common",
       "../../api/audio_codecs:audio_codecs_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
+      "../../api/audio_codecs:builtin_audio_encoder_factory",
       "../../base:rtc_base",
       "../../base:rtc_base_approved",
       "../../base:rtc_base_tests_utils",