Move AudioDecoder and related stuff to the api/ directory

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 21 matching lines @@
 }
 if (!build_with_mozilla && !build_with_chromium) {
   audio_codec_deps += [ ":red" ]
 }
 audio_coding_deps = audio_codec_deps + [
                       "../..:webrtc_common",
                       "../../common_audio",
                       "../../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") {
+rtc_static_library("internal_builtin_audio_decoder_factory") {
   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") {
-  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
 }
 
 rtc_static_library("rent_a_codec") {
   # TODO(kjellander): Remove (bugs.webrtc.org/6828)
   # Gives cyclic dependency with :neteq and :audio_coding if enabled.
   check_includes = false
 
   sources = [
     "acm2/acm_codec_database.cc",
     "acm2/acm_codec_database.h",
     "acm2/rent_a_codec.cc",
     "acm2/rent_a_codec.h",
   ]
   deps = [
-           ":audio_decoder_interface",
+           "../../api/audio_codec:audio_decoder_interface",
            "../..:webrtc_common",
            "../../base:rtc_base_approved",
          ] + audio_codec_deps
   defines = audio_codec_defines
 }
 
 config("audio_coding_config") {
   include_dirs = [
     "include",
     "../include",
@@ skipping 27 matching lines @@
   }
 
   if (is_win) {
     cflags = [
       # TODO(kjellander): Bug 261: fix this warning.
       "/wd4373",  # virtual function override.
     ]
   }
 
   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",
            "../../logging:rtc_event_log_api",
          ]
   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",
   ]
 }
 
 rtc_static_library("audio_encoder_interface") {
   sources = [
     "codecs/audio_encoder.cc",
     "codecs/audio_encoder.h",
   ]
   deps = [
@@ skipping 57 matching lines @@
   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_decoder_interface",
     ":audio_encoder_interface",
+    ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../base:rtc_base_approved",
   ]
   public_deps = [
     ":g711_c",
   ]
 }
 
 rtc_source_set("g711_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
@@ skipping 18 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_decoder_interface",
     ":audio_encoder_interface",
+    ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../base:rtc_base_approved",
   ]
   public_deps = [
     ":g722_c",
   ]
 }
 
 rtc_source_set("g722_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
@@ skipping 19 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_decoder_interface",
     ":audio_encoder_interface",
+    ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../base:rtc_base_approved",
     "../../common_audio",
   ]
   public_deps = [
     ":ilbc_c",
   ]
 }
 
 rtc_source_set("ilbc_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
@@ skipping 135 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_decoder_interface",
     ":audio_encoder_interface",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../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",
@@ skipping 15 matching lines @@
 
 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_decoder_interface",
     ":audio_encoder_interface",
     ":isac_common",
+    "../../api/audio_codec:audio_decoder_interface",
   ]
   public_deps = [
     ":isac_c",
   ]
 }
 
 rtc_static_library("isac_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
   sources = [
     "codecs/isac/main/include/isac.h",
@@ skipping 71 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_decoder_interface",
     ":audio_encoder_interface",
     ":isac_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../common_audio",
     "../../system_wrappers",
   ]
   public_deps = [
     ":isac_fix_c",
   ]
 
   if (rtc_build_with_neon) {
     deps += [ ":isac_neon" ]
   }
@@ skipping 53 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_decoder_interface",
     ":audio_encoder_interface",
     ":isac_common",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../base:rtc_base_approved",
     "../../common_audio",
     "../../system_wrappers",
   ]
 
   public_deps = [
     ":isac_fix_common",
   ]
 
   if (rtc_build_with_neon) {
@@ skipping 80 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_decoder_interface",
     ":audio_encoder_interface",
     ":g711",
+    ":legacy_encoded_audio_frame",
     "../..:webrtc_common",
+    "../../api/audio_codec:audio_decoder_interface",
     "../../base:rtc_base_approved",
   ]
   public_deps = [
     ":pcm16b_c",
   ]
   public_configs = [ ":pcm16b_config" ]
 }
 
 rtc_source_set("pcm16b_c") {
   visibility = [ ":*" ]  # Only targets in this file can depend on this.
@@ skipping 14 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_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",
     "../../system_wrappers",
   ]
   public_deps = [
     ":webrtc_opus_c",
   ]
 
   defines = []
@@ skipping 168 matching lines @@
     "neteq/sync_buffer.h",
     "neteq/tick_timer.cc",
     "neteq/tick_timer.h",
     "neteq/time_stretch.cc",
     "neteq/time_stretch.h",
     "neteq/timestamp_scaler.cc",
     "neteq/timestamp_scaler.h",
   ]
 
   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",
     "../../system_wrappers",
   ]
 
   defines = []
 
   if (rtc_include_ilbc) {
     defines += [ "WEBRTC_CODEC_ILBC" ]
@@ skipping 34 matching lines @@
     "neteq/tools/neteq_test.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",
-    ":builtin_audio_decoder_factory",
     ":neteq",
     "../..:webrtc_common",
+    "../../api/audio_codec:builtin_audio_decoder_factory",
     "../../base:rtc_base_approved",
   ]
 }
 
 if (rtc_include_tests) {
   group("audio_coding_tests") {
     testonly = true
     public_deps = [
       ":RTPchange",
       ":RTPencode",
@@ skipping 43 matching lines @@
       "test/Tester.cc",
       "test/TwoWayCommunication.cc",
       "test/iSACTest.cc",
       "test/opus_test.cc",
       "test/target_delay_unittest.cc",
       "test/utility.cc",
     ]
     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",
       "../../test:test_support",
     ]
     defines = audio_coding_defines
     if (is_win) {
       cflags = [
         # TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
         "/wd4373",  # virtual function override.
@@ skipping 31 matching lines @@
     sources = [
       "acm2/acm_receive_test.cc",
       "acm2/acm_receive_test.h",
     ]
 
     defines = audio_coding_defines
 
     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",
              "//testing/gtest",
            ]
   }
 
   rtc_source_set("acm_send_test") {
     testonly = true
     sources = [
       "acm2/acm_send_test.cc",
       "acm2/acm_send_test.h",
     ]
 
     defines = audio_coding_defines
 
     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",
              "../../test:test_support",
              "//testing/gtest",
            ]
   }
 
   rtc_executable("delay_test") {
     testonly = true
@@ skipping 68 matching lines @@
       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
     }
 
     deps = []
 
     defines = neteq_defines
 
     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",
     ]
 
     data = audio_decoder_unittests_resources
 
     if (is_android) {
       deps += [ "//testing/android/native_test:native_test_native_code" ]
       shard_timeout = 900
@@ skipping 110 matching lines @@
       "neteq/tools/neteq_performance_test.cc",
       "neteq/tools/neteq_performance_test.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_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",
       "//testing/gtest",
     ]
   }
 
   rtc_source_set("neteq_quality_test_support") {
     testonly = true
     sources = [
       "neteq/tools/neteq_quality_test.cc",
       "neteq/tools/neteq_quality_test.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 = [
-      ":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",
       "//third_party/gflags",
     ]
   }
 
   config("neteq_unittest_tools_config") {
     include_dirs = [ "tools" ]
   }
@@ skipping 30 matching lines @@
     ]
 
     public_configs = [ ":neteq_unittest_tools_config" ]
 
     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_decoder_interface",
       ":audio_encoder_interface",
       ":pcm16b",
       "../..:webrtc_common",
+      "../../api/audio_codec:audio_decoder_interface",
       "../../base:rtc_base_approved",
       "../../common_audio",
       "../../test:rtp_test_utils",
       "../rtp_rtcp",
     ]
 
     public_deps = [
       ":neteq_test_minimal",
     ]
 
@@ skipping 499 matching lines @@
       "neteq/time_stretch_unittest.cc",
       "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_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",
       ":pcm16b",
       ":red",
       ":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",
       "../../common_audio",
       "../../system_wrappers:system_wrappers",
       "../../test:field_trial",
       "../../test:rtp_test_utils",
       "../../test:test_common",
       "../../test:test_support",
       "//testing/gmock",
@@ skipping 13 matching lines @@
         ":neteq_unittest_proto",
       ]
     }
 
     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" ]
     }
   }
 }
+
+# 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",
+  ]
+}