Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
# Copyright (c) 2016 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("//build/config/linux/pkg_config.gni")
|
2017-01-24 05:14:35 -08:00
|
|
|
import("../build/webrtc.gni")
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
|
|
|
|
|
group("media") {
|
2016-09-15 00:53:26 -07:00
|
|
|
public_deps = [
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
":rtc_media",
|
2016-11-25 00:40:18 -08:00
|
|
|
":rtc_media_base",
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
config("rtc_media_defines_config") {
|
|
|
|
|
defines = [
|
|
|
|
|
"HAVE_WEBRTC_VIDEO",
|
|
|
|
|
"HAVE_WEBRTC_VOICE",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
config("rtc_media_warnings_config") {
|
|
|
|
|
# GN orders flags on a target before flags from configs. The default config
|
|
|
|
|
# adds these flags so to cancel them out they need to come from a config and
|
|
|
|
|
# cannot be on the target directly.
|
|
|
|
|
if (!is_win) {
|
|
|
|
|
cflags = [ "-Wno-deprecated-declarations" ]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-11-25 00:40:18 -08:00
|
|
|
rtc_static_library("rtc_media_base") {
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
defines = []
|
|
|
|
|
libs = []
|
|
|
|
|
deps = []
|
|
|
|
|
sources = [
|
2016-09-22 01:25:59 -07:00
|
|
|
"base/adaptedvideotracksource.cc",
|
|
|
|
|
"base/adaptedvideotracksource.h",
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
"base/audiosource.h",
|
|
|
|
|
"base/codec.cc",
|
|
|
|
|
"base/codec.h",
|
|
|
|
|
"base/cryptoparams.h",
|
|
|
|
|
"base/device.h",
|
|
|
|
|
"base/mediachannel.h",
|
|
|
|
|
"base/mediaconstants.cc",
|
|
|
|
|
"base/mediaconstants.h",
|
|
|
|
|
"base/mediaengine.cc",
|
|
|
|
|
"base/mediaengine.h",
|
|
|
|
|
"base/rtpdataengine.cc",
|
|
|
|
|
"base/rtpdataengine.h",
|
|
|
|
|
"base/rtputils.cc",
|
|
|
|
|
"base/rtputils.h",
|
|
|
|
|
"base/streamparams.cc",
|
|
|
|
|
"base/streamparams.h",
|
|
|
|
|
"base/turnutils.cc",
|
|
|
|
|
"base/turnutils.h",
|
|
|
|
|
"base/videoadapter.cc",
|
|
|
|
|
"base/videoadapter.h",
|
|
|
|
|
"base/videobroadcaster.cc",
|
|
|
|
|
"base/videobroadcaster.h",
|
|
|
|
|
"base/videocapturer.cc",
|
|
|
|
|
"base/videocapturer.h",
|
|
|
|
|
"base/videocapturerfactory.h",
|
|
|
|
|
"base/videocommon.cc",
|
|
|
|
|
"base/videocommon.h",
|
|
|
|
|
"base/videoframe.h",
|
|
|
|
|
"base/videosourcebase.cc",
|
|
|
|
|
"base/videosourcebase.h",
|
2016-11-25 00:40:18 -08:00
|
|
|
]
|
|
|
|
|
|
|
|
|
|
configs += [ ":rtc_media_warnings_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" ]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
include_dirs = []
|
|
|
|
|
if (rtc_build_libyuv) {
|
|
|
|
|
deps += [ "$rtc_libyuv_dir" ]
|
|
|
|
|
public_deps = [
|
|
|
|
|
"$rtc_libyuv_dir",
|
|
|
|
|
]
|
|
|
|
|
} else {
|
|
|
|
|
# Need to add a directory normally exported by libyuv.
|
|
|
|
|
include_dirs += [ "$rtc_libyuv_dir/include" ]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
deps += [
|
|
|
|
|
"..:webrtc_common",
|
|
|
|
|
"../base:rtc_base_approved",
|
|
|
|
|
"../p2p",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc_static_library("rtc_media") {
|
|
|
|
|
defines = []
|
|
|
|
|
libs = []
|
|
|
|
|
deps = []
|
|
|
|
|
sources = [
|
2016-12-01 00:27:27 -08:00
|
|
|
"engine/internaldecoderfactory.cc",
|
|
|
|
|
"engine/internaldecoderfactory.h",
|
Reland of Stop using hardcoded payload types for video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2513633002/ )
Reason for revert:
The WebRtcBrowserTest.NegotiateUnsupportedVideoCodec test has been fixed in Chromium with the following change:
function removeVideoCodec(offerSdp) {
- offerSdp = offerSdp.replace('a=rtpmap:100 VP8/90000\r\n',
- 'a=rtpmap:100 XVP8/90000\r\n');
+ offerSdp = offerSdp.replace(/a=rtpmap:(\d+)\ VP8\/90000\r\n/,
+ 'a=rtpmap:$1 XVP8/90000\r\n');
return offerSdp;
}
Original issue's description:
> Revert of Stop using hardcoded payload types for video codecs (patchset #6 id:210001 of https://codereview.webrtc.org/2493133002/ )
>
> Reason for revert:
> Breaks chromium.fyi test:
> WebRtcBrowserTest.NegotiateUnsupportedVideoCodec
>
> Original issue's description:
> > Stop using hardcoded payload types for video codecs
> >
> > This CL stops using hardcoded payload types for different video codecs
> > and will dynamically assign them payload types incrementally from 96 to
> > 127 instead.
> >
> > This CL:
> > * Replaces 'std::vector<VideoCodec> DefaultVideoCodecList()' in
> > webrtcvideoengine2.cc with an explicit WebRtcVideoEncoderFactory for
> > internally supported software codecs instead. The purpose is to
> > streamline the payload type assignment in webrtcvideoengine2.cc which
> > will now have two encoder factories of the same
> > WebRtcVideoEncoderFactory type; one internal and one external.
> > * Removes webrtc::VideoEncoder::EncoderType and use cricket::VideoCodec
> > instead.
> > * Removes 'static VideoEncoder* Create(EncoderType codec_type)' and
> > moves the create function to the internal encoder factory instead.
> > * Removes video_encoder.cc. webrtc::VideoEncoder is now just an
> > interface without any static functions.
> > * The function GetSupportedCodecs in webrtcvideoengine2.cc unifies
> > the internal and external codecs and assigns them payload types
> > incrementally from 96 to 127.
> > * Updates webrtcvideoengine2_unittest.cc and removes assumptions about
> > what payload types will be used.
> >
> > BUG=webrtc:6677,webrtc:6705
> > R=hta@webrtc.org, ossu@webrtc.org, stefan@webrtc.org
> >
> > Committed: https://crrev.com/42043b95872b51321f508bf255d804ce3dff366b
> > Cr-Commit-Position: refs/heads/master@{#15135}
>
> TBR=hta@webrtc.org,stefan@webrtc.org,ossu@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:6677,webrtc:6705
>
> Committed: https://crrev.com/eacbaea920797ff751ca83050d140821f5055591
> Cr-Commit-Position: refs/heads/master@{#15140}
TBR=hta@webrtc.org,stefan@webrtc.org,ossu@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6677,webrtc:6705
Review-Url: https://codereview.webrtc.org/2511933002
Cr-Commit-Position: refs/heads/master@{#15148}
2016-11-18 01:34:11 -08:00
|
|
|
"engine/internalencoderfactory.cc",
|
|
|
|
|
"engine/internalencoderfactory.h",
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
"engine/nullwebrtcvideoengine.h",
|
2016-07-13 10:06:22 -07:00
|
|
|
"engine/payload_type_mapper.cc",
|
|
|
|
|
"engine/payload_type_mapper.h",
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
"engine/simulcast.cc",
|
|
|
|
|
"engine/simulcast.h",
|
2016-11-22 01:43:03 -08:00
|
|
|
"engine/videodecodersoftwarefallbackwrapper.cc",
|
|
|
|
|
"engine/videodecodersoftwarefallbackwrapper.h",
|
2016-11-15 06:30:54 -08:00
|
|
|
"engine/videoencodersoftwarefallbackwrapper.cc",
|
|
|
|
|
"engine/videoencodersoftwarefallbackwrapper.h",
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
"engine/webrtccommon.h",
|
|
|
|
|
"engine/webrtcmediaengine.cc",
|
|
|
|
|
"engine/webrtcmediaengine.h",
|
|
|
|
|
"engine/webrtcvideocapturer.cc",
|
|
|
|
|
"engine/webrtcvideocapturer.h",
|
|
|
|
|
"engine/webrtcvideocapturerfactory.cc",
|
|
|
|
|
"engine/webrtcvideocapturerfactory.h",
|
|
|
|
|
"engine/webrtcvideodecoderfactory.h",
|
2016-10-28 07:43:45 -07:00
|
|
|
"engine/webrtcvideoencoderfactory.cc",
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
"engine/webrtcvideoencoderfactory.h",
|
|
|
|
|
"engine/webrtcvideoengine2.cc",
|
|
|
|
|
"engine/webrtcvideoengine2.h",
|
|
|
|
|
"engine/webrtcvideoframe.h",
|
|
|
|
|
"engine/webrtcvoe.h",
|
|
|
|
|
"engine/webrtcvoiceengine.cc",
|
|
|
|
|
"engine/webrtcvoiceengine.h",
|
2017-01-09 14:53:41 -08:00
|
|
|
"sctp/sctptransportinternal.h",
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
]
|
|
|
|
|
|
2016-12-22 10:53:38 -08:00
|
|
|
if (rtc_enable_sctp) {
|
|
|
|
|
sources += [
|
2017-01-09 14:53:41 -08:00
|
|
|
"sctp/sctptransport.cc",
|
|
|
|
|
"sctp/sctptransport.h",
|
2016-12-22 10:53:38 -08:00
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2016-09-05 01:35:44 -07:00
|
|
|
configs += [ ":rtc_media_warnings_config" ]
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
|
2016-10-16 23:56:12 -07:00
|
|
|
if (!build_with_chromium && is_clang) {
|
2016-06-12 22:12:01 -07:00
|
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
2016-09-26 06:11:53 -07:00
|
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (is_win) {
|
|
|
|
|
cflags = [
|
|
|
|
|
"/wd4245", # conversion from "int" to "size_t", signed/unsigned mismatch.
|
|
|
|
|
"/wd4267", # conversion from "size_t" to "int", possible loss of data.
|
|
|
|
|
"/wd4389", # signed/unsigned mismatch.
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-26 07:16:04 -07:00
|
|
|
if (rtc_enable_intelligibility_enhancer) {
|
|
|
|
|
defines += [ "WEBRTC_INTELLIGIBILITY_ENHANCER=1" ]
|
|
|
|
|
} else {
|
|
|
|
|
defines += [ "WEBRTC_INTELLIGIBILITY_ENHANCER=0" ]
|
|
|
|
|
}
|
|
|
|
|
|
2016-08-19 01:07:30 -07:00
|
|
|
include_dirs = []
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
if (rtc_build_libyuv) {
|
|
|
|
|
deps += [ "$rtc_libyuv_dir" ]
|
|
|
|
|
public_deps = [
|
|
|
|
|
"$rtc_libyuv_dir",
|
|
|
|
|
]
|
|
|
|
|
} else {
|
|
|
|
|
# Need to add a directory normally exported by libyuv.
|
|
|
|
|
include_dirs += [ "$rtc_libyuv_dir/include" ]
|
|
|
|
|
}
|
|
|
|
|
|
2016-12-22 10:53:38 -08:00
|
|
|
if (rtc_enable_sctp && rtc_build_usrsctp) {
|
2016-08-19 01:07:30 -07:00
|
|
|
include_dirs += [
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
# TODO(jiayl): move this into the public_configs of
|
|
|
|
|
# //third_party/usrsctp/BUILD.gn.
|
|
|
|
|
"//third_party/usrsctp/usrsctplib",
|
|
|
|
|
]
|
|
|
|
|
deps += [ "//third_party/usrsctp" ]
|
|
|
|
|
}
|
|
|
|
|
|
2016-09-05 06:10:18 -07:00
|
|
|
public_configs = []
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
if (build_with_chromium) {
|
|
|
|
|
deps += [ "../modules/video_capture:video_capture" ]
|
|
|
|
|
} else {
|
|
|
|
|
public_configs += [ ":rtc_media_defines_config" ]
|
|
|
|
|
deps += [ "../modules/video_capture:video_capture_internal_impl" ]
|
|
|
|
|
}
|
|
|
|
|
deps += [
|
2016-11-25 00:40:18 -08:00
|
|
|
":rtc_media_base",
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
"..:webrtc_common",
|
2016-08-31 07:33:05 -07:00
|
|
|
"../api:call_api",
|
2016-11-28 07:02:13 -08:00
|
|
|
"../api:transport_api",
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
"../base:rtc_base_approved",
|
2016-06-12 22:12:01 -07:00
|
|
|
"../call",
|
2016-11-17 06:48:48 -08:00
|
|
|
"../modules/audio_mixer:audio_mixer_impl",
|
2016-06-12 22:12:01 -07:00
|
|
|
"../modules/video_coding",
|
Reland of GN: Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc}
The only thing that differs from the previous attempt in
https://codereview.webrtc.org/1979933002/ is that none of
the new targets are not hooked up to the webrtc target in
webrtc/BUILD.gn, which should make it not break the
chromium.webrtc.fyi bots.
Add BUILD.gn files for webrtc/{api,media,libjingle,p2p,pc} in
preparation for removing src/third_party/libjingle in Chromium.
Changes between previous attempt and the one before that
(https://codereview.webrtc.org/1973313002) are:
* Added libstunprober target
* Adjusted warnings for Chromium's clang plugins
* webrtc/pc/externalhmac.{h,cc} added for Chromium builds.
BUG=webrtc:4256
NOTRY=True
NOPRESUBMIT=True
TBR=perkj@webrtc.org, tommi@webrtc.org
Review-Url: https://codereview.webrtc.org/2037983002
Cr-Commit-Position: refs/heads/master@{#13030}
2016-06-03 03:09:32 -07:00
|
|
|
"../system_wrappers",
|
|
|
|
|
"../voice_engine",
|
|
|
|
|
]
|
|
|
|
|
}
|
2016-06-12 22:12:01 -07:00
|
|
|
|
|
|
|
|
if (rtc_include_tests) {
|
|
|
|
|
config("rtc_unittest_main_config") {
|
|
|
|
|
# GN orders flags on a target before flags from configs. The default config
|
|
|
|
|
# adds -Wall, and this flag have to be after -Wall -- so they need to
|
|
|
|
|
# come from a config and can"t be on the target directly.
|
|
|
|
|
if (is_clang && is_ios) {
|
|
|
|
|
cflags = [ "-Wno-unused-variable" ]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-09-02 04:10:34 -07:00
|
|
|
rtc_source_set("rtc_unittest_main") {
|
2016-06-12 22:12:01 -07:00
|
|
|
testonly = true
|
|
|
|
|
|
2016-08-19 01:07:30 -07:00
|
|
|
include_dirs = []
|
|
|
|
|
public_deps = []
|
2016-06-12 22:12:01 -07:00
|
|
|
deps = []
|
|
|
|
|
sources = [
|
|
|
|
|
"base/fakemediaengine.h",
|
|
|
|
|
"base/fakenetworkinterface.h",
|
|
|
|
|
"base/fakertp.h",
|
|
|
|
|
"base/fakevideocapturer.h",
|
|
|
|
|
"base/fakevideorenderer.h",
|
2016-08-16 01:19:43 -07:00
|
|
|
"base/test/mock_mediachannel.h",
|
2016-06-12 22:12:01 -07:00
|
|
|
"base/testutils.cc",
|
|
|
|
|
"base/testutils.h",
|
|
|
|
|
"engine/fakewebrtccall.cc",
|
|
|
|
|
"engine/fakewebrtccall.h",
|
|
|
|
|
"engine/fakewebrtcdeviceinfo.h",
|
|
|
|
|
"engine/fakewebrtcvcmfactory.h",
|
|
|
|
|
"engine/fakewebrtcvideocapturemodule.h",
|
|
|
|
|
"engine/fakewebrtcvideoengine.h",
|
|
|
|
|
"engine/fakewebrtcvoiceengine.h",
|
|
|
|
|
]
|
|
|
|
|
|
2016-09-05 01:35:44 -07:00
|
|
|
configs += [ ":rtc_unittest_main_config" ]
|
2016-06-12 22:12:01 -07:00
|
|
|
|
|
|
|
|
if (rtc_build_libyuv) {
|
|
|
|
|
deps += [ "$rtc_libyuv_dir" ]
|
2016-08-19 01:07:30 -07:00
|
|
|
public_deps += [ "$rtc_libyuv_dir" ]
|
2016-06-12 22:12:01 -07:00
|
|
|
} else {
|
|
|
|
|
# Need to add a directory normally exported by libyuv.
|
|
|
|
|
include_dirs += [ "$rtc_libyuv_dir/include" ]
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-16 23:56:12 -07:00
|
|
|
if (!build_with_chromium && is_clang) {
|
|
|
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
2016-09-02 04:10:34 -07:00
|
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
2016-06-12 22:12:01 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
deps += [
|
2017-01-12 10:17:38 -08:00
|
|
|
"../base:rtc_base_tests_main",
|
2016-06-12 22:12:01 -07:00
|
|
|
"//testing/gtest",
|
|
|
|
|
]
|
|
|
|
|
public_deps += [ "//testing/gmock" ]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
config("rtc_media_unittests_config") {
|
|
|
|
|
# GN orders flags on a target before flags from configs. The default config
|
|
|
|
|
# adds -Wall, and this flag have to be after -Wall -- so they need to
|
|
|
|
|
# come from a config and can"t be on the target directly.
|
|
|
|
|
# TODO(kjellander): Make the code compile without disabling these flags.
|
|
|
|
|
# See https://bugs.webrtc.org/3307.
|
|
|
|
|
if (is_clang && is_win) {
|
2016-08-26 13:31:24 -07:00
|
|
|
cflags = [
|
|
|
|
|
# See https://bugs.chromium.org/p/webrtc/issues/detail?id=6266
|
|
|
|
|
# for -Wno-sign-compare
|
|
|
|
|
"-Wno-sign-compare",
|
|
|
|
|
"-Wno-unused-function",
|
|
|
|
|
]
|
2016-06-12 22:12:01 -07:00
|
|
|
}
|
|
|
|
|
if (!is_win) {
|
|
|
|
|
cflags = [ "-Wno-sign-compare" ]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-09-14 05:10:01 -07:00
|
|
|
rtc_media_unittests_resources = [
|
|
|
|
|
"//resources/media/captured-320x240-2s-48.frames",
|
|
|
|
|
"//resources/media/faces.1280x720_P420.yuv",
|
|
|
|
|
"//resources/media/faces_I420.jpg",
|
|
|
|
|
"//resources/media/faces_I422.jpg",
|
|
|
|
|
"//resources/media/faces_I444.jpg",
|
|
|
|
|
"//resources/media/faces_I411.jpg",
|
|
|
|
|
"//resources/media/faces_I400.jpg",
|
|
|
|
|
]
|
2016-08-30 02:53:49 -07:00
|
|
|
|
|
|
|
|
if (is_ios) {
|
|
|
|
|
bundle_data("rtc_media_unittests_bundle_data") {
|
|
|
|
|
testonly = true
|
|
|
|
|
sources = rtc_media_unittests_resources
|
|
|
|
|
outputs = [
|
|
|
|
|
"{{bundle_resources_dir}}/{{source_file_part}}",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-09-02 04:10:34 -07:00
|
|
|
rtc_test("rtc_media_unittests") {
|
2016-06-12 22:12:01 -07:00
|
|
|
testonly = true
|
|
|
|
|
|
2016-08-26 02:59:47 -07:00
|
|
|
defines = []
|
2016-06-12 22:12:01 -07:00
|
|
|
deps = []
|
|
|
|
|
sources = [
|
|
|
|
|
"base/codec_unittest.cc",
|
|
|
|
|
"base/rtpdataengine_unittest.cc",
|
|
|
|
|
"base/rtputils_unittest.cc",
|
|
|
|
|
"base/streamparams_unittest.cc",
|
|
|
|
|
"base/turnutils_unittest.cc",
|
|
|
|
|
"base/videoadapter_unittest.cc",
|
|
|
|
|
"base/videobroadcaster_unittest.cc",
|
|
|
|
|
"base/videocapturer_unittest.cc",
|
|
|
|
|
"base/videocommon_unittest.cc",
|
|
|
|
|
"base/videoengine_unittest.h",
|
2016-12-01 00:27:27 -08:00
|
|
|
"engine/internaldecoderfactory_unittest.cc",
|
2016-06-12 22:12:01 -07:00
|
|
|
"engine/nullwebrtcvideoengine_unittest.cc",
|
2016-08-17 02:45:41 -07:00
|
|
|
"engine/payload_type_mapper_unittest.cc",
|
2016-06-12 22:12:01 -07:00
|
|
|
"engine/simulcast_unittest.cc",
|
2016-11-22 01:43:03 -08:00
|
|
|
"engine/videodecodersoftwarefallbackwrapper_unittest.cc",
|
2016-11-15 06:30:54 -08:00
|
|
|
"engine/videoencodersoftwarefallbackwrapper_unittest.cc",
|
2016-06-12 22:12:01 -07:00
|
|
|
"engine/webrtcmediaengine_unittest.cc",
|
|
|
|
|
"engine/webrtcvideocapturer_unittest.cc",
|
2017-01-20 01:07:26 -08:00
|
|
|
"engine/webrtcvideoencoderfactory_unittest.cc",
|
2016-06-12 22:12:01 -07:00
|
|
|
"engine/webrtcvideoengine2_unittest.cc",
|
|
|
|
|
"engine/webrtcvoiceengine_unittest.cc",
|
|
|
|
|
]
|
|
|
|
|
|
2016-12-22 10:53:38 -08:00
|
|
|
if (rtc_enable_sctp) {
|
2017-01-09 14:53:41 -08:00
|
|
|
sources += [ "sctp/sctptransport_unittest.cc" ]
|
2016-12-22 10:53:38 -08:00
|
|
|
}
|
|
|
|
|
|
2016-09-05 01:35:44 -07:00
|
|
|
configs += [ ":rtc_media_unittests_config" ]
|
2016-06-12 22:12:01 -07:00
|
|
|
|
2016-08-26 02:59:47 -07:00
|
|
|
if (rtc_use_h264) {
|
|
|
|
|
defines += [ "WEBRTC_USE_H264" ]
|
|
|
|
|
}
|
2016-06-12 22:12:01 -07:00
|
|
|
if (is_win) {
|
|
|
|
|
cflags = [
|
|
|
|
|
"/wd4245", # conversion from int to size_t, signed/unsigned mismatch.
|
|
|
|
|
"/wd4373", # virtual function override.
|
|
|
|
|
"/wd4389", # signed/unsigned mismatch.
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-16 23:56:12 -07:00
|
|
|
if (!build_with_chromium && is_clang) {
|
2016-09-02 04:10:34 -07:00
|
|
|
suppressed_configs += [
|
2016-06-12 22:12:01 -07:00
|
|
|
"//build/config/clang:extra_warnings",
|
2016-10-16 23:56:12 -07:00
|
|
|
|
|
|
|
|
# Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
|
2016-06-12 22:12:01 -07:00
|
|
|
"//build/config/clang:find_bad_constructs",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2016-09-14 05:10:01 -07:00
|
|
|
data = rtc_media_unittests_resources
|
|
|
|
|
|
2016-06-12 22:12:01 -07:00
|
|
|
if (is_android) {
|
|
|
|
|
deps += [ "//testing/android/native_test:native_test_support" ]
|
2016-08-24 07:48:42 -07:00
|
|
|
shard_timeout = 900
|
|
|
|
|
}
|
2016-08-30 02:53:49 -07:00
|
|
|
|
|
|
|
|
if (is_ios) {
|
|
|
|
|
deps += [ ":rtc_media_unittests_bundle_data" ]
|
2016-06-12 22:12:01 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
deps += [
|
|
|
|
|
# TODO(kjellander): Move as part of work in bugs.webrtc.org/4243.
|
|
|
|
|
":rtc_media",
|
|
|
|
|
":rtc_unittest_main",
|
|
|
|
|
"../audio",
|
|
|
|
|
"../base:rtc_base_tests_utils",
|
2016-11-10 01:05:34 -08:00
|
|
|
"../modules/audio_device:mock_audio_device",
|
2016-06-12 22:12:01 -07:00
|
|
|
"../system_wrappers:metrics_default",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
}
|