Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(646)

Side by Side Diff: webrtc/modules/audio_coding/BUILD.gn

Issue 2631703002: Revert of Log audio network adapter decisions in event log. (Closed)
Patch Set: Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 import("../../build/webrtc.gni") 9 import("../../build/webrtc.gni")
10 import("audio_coding.gni") 10 import("audio_coding.gni")
(...skipping 868 matching lines...) Expand 10 before | Expand all | Expand 10 after
879 "../..:webrtc_common", 879 "../..:webrtc_common",
880 "../../base:rtc_base_approved", 880 "../../base:rtc_base_approved",
881 ] 881 ]
882 } 882 }
883 883
884 if (rtc_enable_protobuf) { 884 if (rtc_enable_protobuf) {
885 proto_library("ana_debug_dump_proto") { 885 proto_library("ana_debug_dump_proto") {
886 sources = [ 886 sources = [
887 "audio_network_adaptor/debug_dump.proto", 887 "audio_network_adaptor/debug_dump.proto",
888 ] 888 ]
889 proto_in_dir = "//" 889 proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor"
890 proto_out_dir = "."
891 } 890 }
892 proto_library("ana_config_proto") { 891 proto_library("ana_config_proto") {
893 sources = [ 892 sources = [
894 "audio_network_adaptor/config.proto", 893 "audio_network_adaptor/config.proto",
895 ] 894 ]
896 proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor" 895 proto_out_dir = "webrtc/modules/audio_coding/audio_network_adaptor"
897 } 896 }
898 } 897 }
899 898
900 rtc_static_library("audio_network_adaptor") { 899 rtc_static_library("audio_network_adaptor") {
901 sources = [ 900 sources = [
902 "audio_network_adaptor/audio_network_adaptor.cc", 901 "audio_network_adaptor/audio_network_adaptor.cc",
903 "audio_network_adaptor/audio_network_adaptor_impl.cc", 902 "audio_network_adaptor/audio_network_adaptor_impl.cc",
904 "audio_network_adaptor/audio_network_adaptor_impl.h", 903 "audio_network_adaptor/audio_network_adaptor_impl.h",
905 "audio_network_adaptor/bitrate_controller.cc", 904 "audio_network_adaptor/bitrate_controller.cc",
906 "audio_network_adaptor/bitrate_controller.h", 905 "audio_network_adaptor/bitrate_controller.h",
907 "audio_network_adaptor/channel_controller.cc", 906 "audio_network_adaptor/channel_controller.cc",
908 "audio_network_adaptor/channel_controller.h", 907 "audio_network_adaptor/channel_controller.h",
909 "audio_network_adaptor/controller.cc", 908 "audio_network_adaptor/controller.cc",
910 "audio_network_adaptor/controller.h", 909 "audio_network_adaptor/controller.h",
911 "audio_network_adaptor/controller_manager.cc", 910 "audio_network_adaptor/controller_manager.cc",
912 "audio_network_adaptor/controller_manager.h", 911 "audio_network_adaptor/controller_manager.h",
913 "audio_network_adaptor/debug_dump_writer.cc", 912 "audio_network_adaptor/debug_dump_writer.cc",
914 "audio_network_adaptor/debug_dump_writer.h", 913 "audio_network_adaptor/debug_dump_writer.h",
915 "audio_network_adaptor/dtx_controller.cc", 914 "audio_network_adaptor/dtx_controller.cc",
916 "audio_network_adaptor/dtx_controller.h", 915 "audio_network_adaptor/dtx_controller.h",
917 "audio_network_adaptor/event_log_writer.cc",
918 "audio_network_adaptor/event_log_writer.h",
919 "audio_network_adaptor/fec_controller.cc", 916 "audio_network_adaptor/fec_controller.cc",
920 "audio_network_adaptor/fec_controller.h", 917 "audio_network_adaptor/fec_controller.h",
921 "audio_network_adaptor/frame_length_controller.cc", 918 "audio_network_adaptor/frame_length_controller.cc",
922 "audio_network_adaptor/frame_length_controller.h", 919 "audio_network_adaptor/frame_length_controller.h",
923 "audio_network_adaptor/include/audio_network_adaptor.h", 920 "audio_network_adaptor/include/audio_network_adaptor.h",
924 ] 921 ]
925 922
926 deps = [ 923 deps = [
927 "../..:webrtc_common", 924 "../..:webrtc_common",
928 "../../base:rtc_base_approved", 925 "../../base:rtc_base_approved",
929 "../../common_audio", 926 "../../common_audio",
930 "../../logging:rtc_event_log_api",
931 "../../system_wrappers", 927 "../../system_wrappers",
932 ] 928 ]
933 929
934 if (rtc_enable_protobuf) { 930 if (rtc_enable_protobuf) {
935 deps += [ 931 deps += [
936 ":ana_config_proto", 932 ":ana_config_proto",
937 ":ana_debug_dump_proto", 933 ":ana_debug_dump_proto",
938 ] 934 ]
939 defines = [ "WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP" ] 935 defines = [ "WEBRTC_AUDIO_NETWORK_ADAPTOR_DEBUG_DUMP" ]
940 } 936 }
941
942 if (!build_with_chromium && is_clang) {
943 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
944 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
945 }
946 } 937 }
947 938
948 rtc_static_library("neteq") { 939 rtc_static_library("neteq") {
949 # TODO(kjellander): Remove (bugs.webrtc.org/6828) 940 # TODO(kjellander): Remove (bugs.webrtc.org/6828)
950 # Cyclic dependency with :audio_coding if enabled. 941 # Cyclic dependency with :audio_coding if enabled.
951 check_includes = false 942 check_includes = false
952 943
953 sources = [ 944 sources = [
954 "neteq/accelerate.cc", 945 "neteq/accelerate.cc",
955 "neteq/accelerate.h", 946 "neteq/accelerate.h",
(...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after
1920 "../../test:test_main", 1911 "../../test:test_main",
1921 "//testing/gtest", 1912 "//testing/gtest",
1922 ] 1913 ]
1923 1914
1924 if (!build_with_chromium && is_clang) { 1915 if (!build_with_chromium && is_clang) {
1925 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). 1916 # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
1926 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] 1917 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
1927 } 1918 }
1928 } 1919 }
1929 } 1920 }
OLDNEW
« no previous file with comments | « webrtc/modules/BUILD.gn ('k') | webrtc/modules/audio_coding/audio_network_adaptor/audio_network_adaptor_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698