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

Side by Side Diff: webrtc/media/BUILD.gn

Issue 2691343008: Fixed a couple of build-flag dependent tests of webrtcvoiceengine. (Closed)
Patch Set: Cleaned up Opus min overhead calculations. Created 3 years, 10 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
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvoiceengine_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2016 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/config/linux/pkg_config.gni") 9 import("//build/config/linux/pkg_config.gni")
10 import("../webrtc.gni") 10 import("../webrtc.gni")
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 334
335 if (rtc_enable_sctp) { 335 if (rtc_enable_sctp) {
336 sources += [ "sctp/sctptransport_unittest.cc" ] 336 sources += [ "sctp/sctptransport_unittest.cc" ]
337 } 337 }
338 338
339 configs += [ ":rtc_media_unittests_config" ] 339 configs += [ ":rtc_media_unittests_config" ]
340 340
341 if (rtc_use_h264) { 341 if (rtc_use_h264) {
342 defines += [ "WEBRTC_USE_H264" ] 342 defines += [ "WEBRTC_USE_H264" ]
343 } 343 }
344
345 if (rtc_opus_support_120ms_ptime) {
346 defines += [ "WEBRTC_OPUS_SUPPORT_120MS_PTIME=1" ]
347 } else {
348 defines += [ "WEBRTC_OPUS_SUPPORT_120MS_PTIME=0" ]
349 }
350
344 if (is_win) { 351 if (is_win) {
345 cflags = [ 352 cflags = [
346 "/wd4245", # conversion from int to size_t, signed/unsigned mismatch. 353 "/wd4245", # conversion from int to size_t, signed/unsigned mismatch.
347 "/wd4373", # virtual function override. 354 "/wd4373", # virtual function override.
348 "/wd4389", # signed/unsigned mismatch. 355 "/wd4389", # signed/unsigned mismatch.
349 ] 356 ]
350 } 357 }
351 358
352 if (!build_with_chromium && is_clang) { 359 if (!build_with_chromium && is_clang) {
353 suppressed_configs += [ 360 suppressed_configs += [
(...skipping 19 matching lines...) Expand all
373 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243. 380 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243.
374 ":rtc_media", 381 ":rtc_media",
375 ":rtc_unittest_main", 382 ":rtc_unittest_main",
376 "../audio", 383 "../audio",
377 "../base:rtc_base_tests_utils", 384 "../base:rtc_base_tests_utils",
378 "../modules/audio_device:mock_audio_device", 385 "../modules/audio_device:mock_audio_device",
379 "../system_wrappers:metrics_default", 386 "../system_wrappers:metrics_default",
380 ] 387 ]
381 } 388 }
382 } 389 }
OLDNEW
« no previous file with comments | « no previous file | webrtc/media/engine/webrtcvoiceengine_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698