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

webrtc/modules/audio_coding/BUILD.gn

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("../../webrtc.gni")
 import("audio_coding.gni")
@@ skipping 33 matching lines @@
     "codecs/audio_format_conversion.cc",
     "codecs/audio_format_conversion.h",
   ]
   deps = [
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
   ]
 }
 
-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
-  sources = [
-    "codecs/builtin_audio_encoder_factory.cc",
-    "codecs/builtin_audio_encoder_factory.h",
-  ]
-  deps = [
-           "../..:webrtc_common",
-           "../../base:protobuf_utils",
-           "../../base:rtc_base_approved",
-           ":audio_encoder_factory_interface",
-         ] + audio_codec_deps
-  defines = audio_codec_defines
-}
-
 rtc_static_library("builtin_audio_decoder_factory_internal") {
   sources = [
     "codecs/builtin_audio_decoder_factory_internal.cc",
     "codecs/builtin_audio_decoder_factory_internal.h",
   ]
   deps = [
            "../..:webrtc_common",
+           "../../base:protobuf_utils",
            "../../base:rtc_base_approved",
            "../../api/audio_codecs:audio_codecs_api",
          ] + audio_codec_deps
+  defines = audio_codec_defines
+}
+
+rtc_static_library("builtin_audio_encoder_factory_internal") {
+  sources = [
+    "codecs/builtin_audio_encoder_factory_internal.cc",
+    "codecs/builtin_audio_encoder_factory_internal.h",
+  ]
+  deps = [
+           "../..:webrtc_common",
+           "../../base:protobuf_utils",
+           "../../base:rtc_base_approved",
+           "../../api/audio_codecs:audio_codecs_api",
+         ] + audio_codec_deps
   defines = audio_codec_defines
 }
 
 rtc_static_library("rent_a_codec") {
   sources = [
     "acm2/acm_codec_database.cc",
     "acm2/acm_codec_database.h",
     "acm2/rent_a_codec.cc",
     "acm2/rent_a_codec.h",
   ]
   deps = [
            "../../api/audio_codecs:audio_codecs_api",
            "../..:webrtc_common",
            "../../base:protobuf_utils",
            "../../base:rtc_base_approved",
            "../../system_wrappers",
            ":audio_coding_module_typedefs",
-           ":audio_encoder_interface",
            ":isac_common",
            ":isac_fix_c",
            ":neteq_decoder_enum",
          ] + audio_codec_deps
 
   defines = audio_codec_defines
 }
 
 config("audio_coding_config") {
   include_dirs = [
@@ skipping 41 matching lines @@
       # TODO(kjellander): Bug 261: fix this warning.
       "/wd4373",  # virtual function override.
     ]
   }
 
   deps = audio_coding_deps + [
            "..:module_api",
            "../../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",
            "../../logging:rtc_event_log_api",
          ]
   defines = audio_coding_defines
 }
 
 rtc_static_library("legacy_encoded_audio_frame") {
   sources = [
     "codecs/legacy_encoded_audio_frame.cc",
     "codecs/legacy_encoded_audio_frame.h",
   ]
   deps = [
     "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
   ]
 }
 
-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 = [
     "../../..",
     "codecs/cng/include",
   ]
 }
 
 rtc_static_library("cng") {
   sources = [
     "codecs/cng/audio_encoder_cng.cc",
     "codecs/cng/audio_encoder_cng.h",
     "codecs/cng/webrtc_cng.cc",
     "codecs/cng/webrtc_cng.h",
   ]
 
   public_configs = [ ":cng_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     "../..:webrtc_common",
+    "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
     "../../common_audio",
   ]
 }
 
 config("red_config") {
   include_dirs = [ "codecs/red" ]
 }
 
 rtc_static_library("red") {
   sources = [
     "codecs/red/audio_encoder_copy_red.cc",
     "codecs/red/audio_encoder_copy_red.h",
   ]
 
   public_configs = [ ":red_config" ]
 
   deps = [
-    ":audio_encoder_interface",
+    "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
     "../../common_audio",
   ]
 }
 
 config("g711_config") {
   include_dirs = [
     "../../..",
     "codecs/g711/include",
   ]
 }
 
 rtc_static_library("g711") {
   sources = [
     "codecs/g711/audio_decoder_pcm.cc",
     "codecs/g711/audio_decoder_pcm.h",
     "codecs/g711/audio_encoder_pcm.cc",
     "codecs/g711/audio_encoder_pcm.h",
   ]
 
   public_configs = [ ":g711_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
   ]
   public_deps = [
     ":g711_c",
   ]
 }
 
@@ skipping 21 matching lines @@
   sources = [
     "codecs/g722/audio_decoder_g722.cc",
     "codecs/g722/audio_decoder_g722.h",
     "codecs/g722/audio_encoder_g722.cc",
     "codecs/g722/audio_encoder_g722.h",
   ]
 
   public_configs = [ ":g722_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
   ]
   public_deps = [
     ":g722_c",
   ]
 }
 
@@ skipping 22 matching lines @@
   sources = [
     "codecs/ilbc/audio_decoder_ilbc.cc",
     "codecs/ilbc/audio_decoder_ilbc.h",
     "codecs/ilbc/audio_encoder_ilbc.cc",
     "codecs/ilbc/audio_encoder_ilbc.h",
   ]
 
   public_configs = [ ":ilbc_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
     "../../common_audio",
   ]
   public_deps = [
     ":ilbc_c",
   ]
 }
@@ skipping 138 matching lines @@
     "codecs/ilbc/vq4.h",
     "codecs/ilbc/window32_w32.c",
     "codecs/ilbc/window32_w32.h",
     "codecs/ilbc/xcorr_coef.c",
     "codecs/ilbc/xcorr_coef.h",
   ]
 
   public_configs = [ ":ilbc_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
     "../../common_audio",
   ]
 }
 
 rtc_static_library("isac_common") {
   sources = [
     "codecs/isac/audio_encoder_isac_t.h",
     "codecs/isac/audio_encoder_isac_t_impl.h",
     "codecs/isac/locked_bandwidth_info.cc",
     "codecs/isac/locked_bandwidth_info.h",
   ]
   deps = [
-    ":audio_encoder_interface",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
   ]
 }
 
 config("isac_config") {
   include_dirs = [
     "../../..",
     "codecs/isac/main/include",
   ]
 }
 
 rtc_static_library("isac") {
   sources = [
     "codecs/isac/main/include/audio_decoder_isac.h",
     "codecs/isac/main/include/audio_encoder_isac.h",
     "codecs/isac/main/source/audio_decoder_isac.cc",
     "codecs/isac/main/source/audio_encoder_isac.cc",
   ]
 
   deps = [
-    ":audio_encoder_interface",
     ":isac_common",
     "../../api/audio_codecs:audio_codecs_api",
   ]
   public_deps = [
     ":isac_c",
   ]
 }
 
 rtc_static_library("isac_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
@@ skipping 73 matching lines @@
 
 rtc_static_library("isac_fix") {
   sources = [
     "codecs/isac/fix/source/audio_decoder_isacfix.cc",
     "codecs/isac/fix/source/audio_encoder_isacfix.cc",
   ]
 
   public_configs = [ ":isac_fix_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     ":isac_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../common_audio",
     "../../system_wrappers",
   ]
   public_deps = [
     ":isac_fix_c",
   ]
 
   if (rtc_build_with_neon) {
@@ skipping 55 matching lines @@
     "codecs/isac/fix/source/spectrum_ar_model_tables.c",
     "codecs/isac/fix/source/spectrum_ar_model_tables.h",
     "codecs/isac/fix/source/structs.h",
     "codecs/isac/fix/source/transform.c",
     "codecs/isac/fix/source/transform_tables.c",
   ]
 
   public_configs = [ ":isac_fix_config" ]
 
   deps = [
-    ":audio_encoder_interface",
     ":isac_common",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
     "../../common_audio",
     "../../system_wrappers",
   ]
 
   public_deps = [
     ":isac_fix_common",
@@ skipping 83 matching lines @@
 
 rtc_static_library("pcm16b") {
   sources = [
     "codecs/pcm16b/audio_decoder_pcm16b.cc",
     "codecs/pcm16b/audio_decoder_pcm16b.h",
     "codecs/pcm16b/audio_encoder_pcm16b.cc",
     "codecs/pcm16b/audio_encoder_pcm16b.h",
   ]
 
   deps = [
-    ":audio_encoder_interface",
     ":g711",
     ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../base:rtc_base_approved",
   ]
   public_deps = [
     ":pcm16b_c",
   ]
   public_configs = [ ":pcm16b_config" ]
@@ skipping 18 matching lines @@
 
 rtc_static_library("webrtc_opus") {
   sources = [
     "codecs/opus/audio_decoder_opus.cc",
     "codecs/opus/audio_decoder_opus.h",
     "codecs/opus/audio_encoder_opus.cc",
     "codecs/opus/audio_encoder_opus.h",
   ]
 
   deps = [
-    ":audio_encoder_interface",
     ":audio_network_adaptor",
     "../..:webrtc_common",
     "../../api/audio_codecs:audio_codecs_api",
     "../../base:protobuf_utils",
     "../../base:rtc_base_approved",
     "../../base:rtc_numerics",
     "../../common_audio",
     "../../system_wrappers",
   ]
   public_deps = [
@@ skipping 249 matching lines @@
     "neteq/tools/packet_source.cc",
     "neteq/tools/packet_source.h",
   ]
 
   if (!build_with_chromium && is_clang) {
     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 
   deps = [
-    ":audio_encoder_interface",
     ":neteq",
     "..:module_api",
     "../..:webrtc_common",
+    "../../api/audio_codecs:audio_codecs_api",
     "../../api/audio_codecs:builtin_audio_decoder_factory",
     "../../base:rtc_base_approved",
     "../rtp_rtcp",
   ]
 }
 
 if (rtc_include_tests) {
   group("audio_coding_tests") {
     testonly = true
     public_deps = [
@@ skipping 136 matching lines @@
     testonly = true
     sources = [
       "acm2/acm_send_test.cc",
       "acm2/acm_send_test.h",
     ]
 
     defines = audio_coding_defines
 
     deps = audio_coding_deps + [
              ":audio_coding",
+             ":neteq_tools",
              "../../api/audio_codecs:audio_codecs_api",
-             ":audio_encoder_interface",
-             ":neteq_tools",
              "../../base:rtc_base_approved",
              "../../test:test_support",
              "//testing/gtest",
            ]
   }
 
   rtc_executable("delay_test") {
     testonly = true
     sources = [
       "test/Channel.cc",
@@ skipping 788 matching lines @@
       "codecs/cng/cng_unittest.cc",
       "codecs/ilbc/ilbc_unittest.cc",
       "codecs/isac/fix/source/filterbanks_unittest.cc",
       "codecs/isac/fix/source/filters_unittest.cc",
       "codecs/isac/fix/source/lpc_masking_model_unittest.cc",
       "codecs/isac/fix/source/transform_unittest.cc",
       "codecs/isac/main/source/audio_encoder_isac_unittest.cc",
       "codecs/isac/main/source/isac_unittest.cc",
       "codecs/isac/unittest.cc",
       "codecs/legacy_encoded_audio_frame_unittest.cc",
-      "codecs/mock/mock_audio_encoder.cc",
       "codecs/opus/audio_encoder_opus_unittest.cc",
       "codecs/opus/opus_unittest.cc",
       "codecs/red/audio_encoder_copy_red_unittest.cc",
       "neteq/audio_multi_vector_unittest.cc",
       "neteq/audio_vector_unittest.cc",
       "neteq/background_noise_unittest.cc",
       "neteq/buffer_level_filter_unittest.cc",
       "neteq/comfort_noise_unittest.cc",
       "neteq/decision_logic_unittest.cc",
       "neteq/decoder_database_unittest.cc",
@@ skipping 31 matching lines @@
       "neteq/timestamp_scaler_unittest.cc",
       "neteq/tools/input_audio_file_unittest.cc",
       "neteq/tools/packet_unittest.cc",
     ]
 
     deps = [
       ":acm_receive_test",
       ":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",
       ":isac",
       ":isac_c",
       ":isac_fix",
       ":legacy_encoded_audio_frame",
       ":neteq",
       ":neteq_test_support",
       ":neteq_test_tools",
       ":pcm16b",
       ":red",
       ":rent_a_codec",
       ":webrtc_opus",
       "..:module_api",
       "../..:webrtc_common",
       "../../api/audio_codecs:audio_codecs_api",
       "../../api/audio_codecs:builtin_audio_decoder_factory",
+      "../../api/audio_codecs:builtin_audio_encoder_factory",
       "../../base:protobuf_utils",
       "../../base:rtc_base",
       "../../base:rtc_base_approved",
       "../../base:rtc_base_tests_utils",
       "../../common_audio",
       "../../system_wrappers:system_wrappers",
       "../../test:audio_codec_mocks",
       "../../test:field_trial",
       "../../test:rtp_test_utils",
       "../../test:test_common",
@@ skipping 29 matching lines @@
 rtc_source_set("audio_decoder_interface") {
   sources = [
     "codecs/audio_decoder.h",
   ]
   deps = [
     "../../api/audio_codecs:audio_codecs_api",
   ]
 }
 
 # For backwards compatibility only! Use
+# webrtc/api/audio_codecs:audio_codecs_api instead.
+# TODO(ossu): Remove this.
+rtc_source_set("audio_encoder_interface") {
+  sources = [
+    "codecs/audio_encoder.h",
+  ]
+  deps = [
+    "../../api/audio_codecs:audio_codecs_api",
+  ]
+}
+
+# For backwards compatibility only! Use
 # webrtc/api/audio_codecs:builtin_audio_decoder_factory instead.
 # TODO(kwiberg): Remove this.
 rtc_source_set("builtin_audio_decoder_factory") {
   sources = [
     "codecs/builtin_audio_decoder_factory.h",
   ]
   deps = [
     "../../api/audio_codecs:builtin_audio_decoder_factory",
   ]
 }
+
+# For backwards compatibility only! Use
+# webrtc/api/audio_codecs:builtin_audio_decoder_factory instead.
+# TODO(ossu): Remove this.
+rtc_source_set("builtin_audio_encoder_factory") {
+  sources = [
+    "codecs/builtin_audio_encoder_factory.h",
+  ]
+  deps = [
+    "../../api/audio_codecs:builtin_audio_encoder_factory",
+  ]
+}