2016-04-27 01:54:20 -07:00
|
|
|
# Copyright 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.
|
|
|
|
|
|
2017-01-24 06:58:22 -08:00
|
|
|
import("../webrtc.gni")
|
2016-09-15 04:30:18 -07:00
|
|
|
if (is_ios) {
|
|
|
|
|
import("//build/config/ios/rules.gni")
|
2017-06-22 01:47:20 -07:00
|
|
|
import("//build/config/ios/ios_sdk.gni")
|
2016-09-15 04:30:18 -07:00
|
|
|
}
|
2016-04-27 01:54:20 -07:00
|
|
|
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
declare_args() {
|
|
|
|
|
# Determine whether or not to include metal rendering
|
|
|
|
|
rtc_use_metal_rendering = is_mac || (is_ios && current_cpu == "arm64")
|
|
|
|
|
}
|
|
|
|
|
|
2016-10-28 05:44:03 -07:00
|
|
|
group("sdk") {
|
2017-06-27 08:56:46 +02:00
|
|
|
public_deps = []
|
|
|
|
|
if (!build_with_chromium) {
|
|
|
|
|
if (is_android) {
|
|
|
|
|
public_deps += [ "android" ]
|
|
|
|
|
}
|
|
|
|
|
if (is_ios) {
|
2017-08-24 05:43:45 -07:00
|
|
|
public_deps += [ ":framework_objc" ]
|
2017-06-27 08:56:46 +02:00
|
|
|
}
|
2016-10-28 05:44:03 -07:00
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2016-11-09 07:44:27 -08:00
|
|
|
if (is_ios || is_mac) {
|
2017-08-24 05:43:45 -07:00
|
|
|
config("common_config_objc") {
|
2016-05-25 11:37:11 -07:00
|
|
|
include_dirs = [
|
|
|
|
|
"objc/Framework/Classes",
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
"objc/Framework/Classes/Audio",
|
|
|
|
|
"objc/Framework/Classes/Common",
|
|
|
|
|
"objc/Framework/Classes/Metal",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection",
|
|
|
|
|
"objc/Framework/Classes/UI",
|
|
|
|
|
"objc/Framework/Classes/Video",
|
|
|
|
|
"objc/Framework/Classes/VideoToolbox",
|
2016-05-25 11:37:11 -07:00
|
|
|
"objc/Framework/Headers",
|
|
|
|
|
]
|
2017-10-24 15:28:51 +02:00
|
|
|
cflags = [
|
|
|
|
|
"-Wstrict-overflow",
|
|
|
|
|
"-Wmissing-field-initializers",
|
|
|
|
|
]
|
2016-05-25 11:37:11 -07:00
|
|
|
}
|
|
|
|
|
|
2018-06-04 10:24:37 +02:00
|
|
|
config("used_from_extension") {
|
|
|
|
|
if (is_ios && rtc_apprtcmobile_broadcast_extension) {
|
|
|
|
|
cflags = [ "-fapplication-extension" ]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-24 05:43:45 -07:00
|
|
|
rtc_static_library("common_objc") {
|
2018-08-09 10:54:40 +02:00
|
|
|
visibility = [ "*" ]
|
2016-04-27 01:54:20 -07:00
|
|
|
sources = [
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
"objc/Framework/Classes/Common/NSString+StdString.h",
|
|
|
|
|
"objc/Framework/Classes/Common/NSString+StdString.mm",
|
|
|
|
|
"objc/Framework/Classes/Common/RTCDispatcher+Private.h",
|
|
|
|
|
"objc/Framework/Classes/Common/RTCDispatcher.m",
|
|
|
|
|
"objc/Framework/Classes/Common/RTCFieldTrials.mm",
|
|
|
|
|
"objc/Framework/Classes/Common/RTCLogging.mm",
|
2017-06-12 14:16:20 +02:00
|
|
|
"objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.h",
|
|
|
|
|
"objc/Framework/Classes/Common/RTCUIApplicationStatusObserver.m",
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
"objc/Framework/Classes/Common/helpers.h",
|
|
|
|
|
"objc/Framework/Classes/Common/helpers.mm",
|
2017-09-28 19:28:52 +02:00
|
|
|
"objc/Framework/Classes/Common/scoped_cftyperef.h",
|
2016-04-27 01:54:20 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCDispatcher.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCFieldTrials.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCLogging.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMacros.h",
|
|
|
|
|
]
|
2017-04-28 02:14:54 -07:00
|
|
|
|
2017-04-21 00:02:02 -07:00
|
|
|
deps = [
|
2017-12-13 16:05:42 +01:00
|
|
|
"../rtc_base:checks",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base",
|
2017-04-21 00:02:02 -07:00
|
|
|
]
|
2018-06-04 10:24:37 +02:00
|
|
|
configs += [
|
|
|
|
|
"..:common_objc",
|
|
|
|
|
":used_from_extension",
|
|
|
|
|
]
|
2017-04-24 00:57:16 -07:00
|
|
|
|
2017-08-24 05:43:45 -07:00
|
|
|
public_configs = [ ":common_config_objc" ]
|
2017-04-28 02:14:54 -07:00
|
|
|
|
2016-06-08 01:14:15 -07:00
|
|
|
if (is_ios) {
|
|
|
|
|
sources += [
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
"objc/Framework/Classes/Common/UIDevice+RTCDevice.mm",
|
2016-07-28 14:52:55 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h",
|
2016-06-08 01:14:15 -07:00
|
|
|
]
|
2017-04-28 02:14:54 -07:00
|
|
|
}
|
|
|
|
|
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
if (!build_with_chromium) {
|
|
|
|
|
sources += [
|
2018-01-30 15:46:13 +01:00
|
|
|
"objc/Framework/Classes/Common/RTCCallbackLogger.mm",
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
"objc/Framework/Classes/Common/RTCFileLogger.mm",
|
2018-01-30 15:46:13 +01:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCCallbackLogger.h",
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCFileLogger.h",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2017-05-31 05:14:26 -07:00
|
|
|
if (!build_with_chromium) {
|
2018-02-16 10:49:22 +01:00
|
|
|
if (is_ios) {
|
2018-05-15 10:22:36 +02:00
|
|
|
rtc_static_library("native_api_audio_device_module") {
|
|
|
|
|
visibility = [ "*" ]
|
|
|
|
|
|
|
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Native/api/audio_device_module.h",
|
|
|
|
|
"objc/Framework/Native/api/audio_device_module.mm",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
deps = [
|
|
|
|
|
":audio_device",
|
|
|
|
|
"../modules/audio_device:audio_device_api",
|
|
|
|
|
"../modules/audio_device:audio_device_generic",
|
|
|
|
|
"../rtc_base:checks",
|
|
|
|
|
"../rtc_base:rtc_base_approved",
|
|
|
|
|
"../system_wrappers",
|
|
|
|
|
"../system_wrappers:metrics_api",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
if (is_clang) {
|
|
|
|
|
# Suppress warnings from the Chromium Clang plugin
|
|
|
|
|
# (bugs.webrtc.org/163).
|
|
|
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc_source_set("audio_session_observer") {
|
|
|
|
|
visibility = [ ":*" ]
|
|
|
|
|
|
|
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Native/src/audio/audio_session_observer.h",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
deps = [
|
|
|
|
|
"../rtc_base:rtc_base",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc_static_library("audio_device") {
|
|
|
|
|
visibility = [ "*" ]
|
|
|
|
|
|
|
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Native/src/audio/audio_device_ios.h",
|
|
|
|
|
"objc/Framework/Native/src/audio/audio_device_ios.mm",
|
|
|
|
|
"objc/Framework/Native/src/audio/audio_device_module_ios.h",
|
|
|
|
|
"objc/Framework/Native/src/audio/audio_device_module_ios.mm",
|
|
|
|
|
"objc/Framework/Native/src/audio/voice_processing_audio_unit.h",
|
|
|
|
|
"objc/Framework/Native/src/audio/voice_processing_audio_unit.mm",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
deps = [
|
|
|
|
|
":audio_objc",
|
|
|
|
|
":audio_session_observer",
|
|
|
|
|
":common_objc",
|
|
|
|
|
"../api:array_view",
|
|
|
|
|
"../modules/audio_device:audio_device_api",
|
|
|
|
|
"../modules/audio_device:audio_device_buffer",
|
|
|
|
|
"../modules/audio_device:audio_device_generic",
|
|
|
|
|
"../rtc_base:checks",
|
|
|
|
|
"../rtc_base:rtc_base",
|
|
|
|
|
"../rtc_base/system:fallthrough",
|
|
|
|
|
"../sdk:common_objc",
|
|
|
|
|
"../system_wrappers:metrics_api",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
if (is_clang) {
|
|
|
|
|
# Suppress warnings from the Chromium Clang plugin
|
|
|
|
|
# (bugs.webrtc.org/163).
|
|
|
|
|
suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
2018-02-16 10:49:22 +01:00
|
|
|
rtc_static_library("audio_objc") {
|
|
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/Audio/RTCAudioSession+Configuration.mm",
|
|
|
|
|
"objc/Framework/Classes/Audio/RTCAudioSession+Private.h",
|
|
|
|
|
"objc/Framework/Classes/Audio/RTCAudioSession.mm",
|
|
|
|
|
"objc/Framework/Classes/Audio/RTCAudioSessionConfiguration.m",
|
2018-05-15 10:22:36 +02:00
|
|
|
"objc/Framework/Classes/Audio/RTCNativeAudioSessionDelegateAdapter.h",
|
|
|
|
|
"objc/Framework/Classes/Audio/RTCNativeAudioSessionDelegateAdapter.mm",
|
2018-02-16 10:49:22 +01:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCAudioSession.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h",
|
|
|
|
|
]
|
2018-06-04 10:24:37 +02:00
|
|
|
configs += [
|
|
|
|
|
"..:common_objc",
|
|
|
|
|
":used_from_extension",
|
|
|
|
|
]
|
2017-06-05 05:48:47 -07:00
|
|
|
|
2018-02-16 10:49:22 +01:00
|
|
|
public_configs = [ ":common_config_objc" ]
|
2017-09-15 14:07:30 +02:00
|
|
|
|
2018-02-16 10:49:22 +01:00
|
|
|
deps = [
|
2018-05-15 10:22:36 +02:00
|
|
|
":audio_session_observer",
|
2018-02-16 10:49:22 +01:00
|
|
|
":common_objc",
|
|
|
|
|
"../rtc_base:checks",
|
2018-05-15 10:22:36 +02:00
|
|
|
"../rtc_base:rtc_base",
|
2018-02-16 10:49:22 +01:00
|
|
|
"../rtc_base:rtc_base_approved",
|
|
|
|
|
]
|
2017-06-05 05:48:47 -07:00
|
|
|
}
|
|
|
|
|
}
|
2017-06-28 14:05:44 -07:00
|
|
|
|
2018-03-07 10:32:03 +01:00
|
|
|
rtc_static_library("videosource_objc") {
|
2017-06-28 14:05:44 -07:00
|
|
|
sources = [
|
2018-03-07 10:32:03 +01:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoSource+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoSource.mm",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoSource.h",
|
2017-06-28 14:05:44 -07:00
|
|
|
]
|
|
|
|
|
|
|
|
|
|
deps = [
|
2017-08-24 05:43:45 -07:00
|
|
|
":common_objc",
|
2018-03-07 10:32:03 +01:00
|
|
|
":mediasource_objc",
|
|
|
|
|
":native_video",
|
2018-02-16 10:49:22 +01:00
|
|
|
":videoframebuffer_objc",
|
2017-06-28 14:05:44 -07:00
|
|
|
"../api:libjingle_peerconnection_api",
|
2018-05-11 11:15:30 +02:00
|
|
|
"../api/video:video_frame",
|
|
|
|
|
"../api/video:video_frame_i420",
|
2017-06-28 14:05:44 -07:00
|
|
|
"../common_video",
|
|
|
|
|
"../media:rtc_media_base",
|
2017-12-13 16:05:42 +01:00
|
|
|
"../rtc_base:checks",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base",
|
2017-12-14 11:24:00 +01:00
|
|
|
"//third_party/libyuv",
|
2017-06-28 14:05:44 -07:00
|
|
|
]
|
|
|
|
|
|
2018-06-04 10:24:37 +02:00
|
|
|
configs += [
|
|
|
|
|
"..:common_objc",
|
|
|
|
|
":used_from_extension",
|
|
|
|
|
]
|
2017-06-28 14:05:44 -07:00
|
|
|
}
|
|
|
|
|
|
2018-02-16 10:49:22 +01:00
|
|
|
rtc_static_library("videoframebuffer_objc") {
|
2018-08-09 10:54:40 +02:00
|
|
|
visibility = [ "*" ]
|
2018-02-16 10:49:22 +01:00
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoFrame.mm",
|
|
|
|
|
"objc/Framework/Classes/Video/RTCCVPixelBuffer.mm",
|
|
|
|
|
"objc/Framework/Classes/Video/RTCI420Buffer+Private.h",
|
|
|
|
|
"objc/Framework/Classes/Video/RTCI420Buffer.mm",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoFrame.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h",
|
|
|
|
|
]
|
|
|
|
|
deps = [
|
|
|
|
|
":common_objc",
|
2018-05-11 11:15:30 +02:00
|
|
|
"//api/video:video_frame",
|
|
|
|
|
"//api/video:video_frame_i420",
|
2018-02-16 10:49:22 +01:00
|
|
|
"//common_video",
|
|
|
|
|
"//rtc_base:checks",
|
|
|
|
|
"//rtc_base:rtc_base_approved",
|
|
|
|
|
"//third_party/libyuv",
|
|
|
|
|
]
|
2018-06-04 10:24:37 +02:00
|
|
|
configs += [
|
|
|
|
|
"..:common_objc",
|
|
|
|
|
":used_from_extension",
|
|
|
|
|
]
|
2018-02-16 10:49:22 +01:00
|
|
|
}
|
|
|
|
|
|
2017-08-24 05:43:45 -07:00
|
|
|
rtc_static_library("video_objc") {
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
sources = [
|
2017-07-25 15:48:39 -07:00
|
|
|
"objc/Framework/Classes/Video/AVCaptureSession+DevicePosition.h",
|
|
|
|
|
"objc/Framework/Classes/Video/AVCaptureSession+DevicePosition.mm",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Classes/Video/RTCDefaultShader.h",
|
|
|
|
|
"objc/Framework/Classes/Video/RTCDefaultShader.mm",
|
|
|
|
|
"objc/Framework/Classes/Video/RTCI420TextureCache.h",
|
|
|
|
|
"objc/Framework/Classes/Video/RTCI420TextureCache.mm",
|
|
|
|
|
"objc/Framework/Classes/Video/RTCOpenGLDefines.h",
|
|
|
|
|
"objc/Framework/Classes/Video/RTCShader.h",
|
|
|
|
|
"objc/Framework/Classes/Video/RTCShader.mm",
|
2018-02-16 10:49:22 +01:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoViewShading.h",
|
2017-04-28 02:14:54 -07:00
|
|
|
]
|
2017-05-31 05:14:26 -07:00
|
|
|
libs = []
|
2017-04-28 02:14:54 -07:00
|
|
|
if (is_ios) {
|
Reland of Add metal view, shaders and renderer. (patchset #1 id:1 of https://codereview.webrtc.org/2711003004/ )
Reason for revert:
Re-land
Original issue's description:
> Revert of Add metal view, shaders and renderer. (patchset #18 id:340001 of https://codereview.webrtc.org/2651743007/ )
>
> Reason for revert:
> Reverting due to breakage in the Google3 import
>
> Original issue's description:
> > Add metal view, shaders and renderer.
> >
> > This CL submits standalone Metal view, renderer and shader.
> >
> > BUG=webrtc:7079
> >
> > Review-Url: https://codereview.webrtc.org/2651743007
> > Cr-Commit-Position: refs/heads/master@{#16787}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/fc8c97f950a4fead4a5debe3c838942db1834010
>
> TBR=magjed@webrtc.org,kthelgason@webrtc.org,tkchin@webrtc.org,haysc@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:7079
>
> Review-Url: https://codereview.webrtc.org/2711003004
> Cr-Commit-Position: refs/heads/master@{#16788}
> Committed: https://chromium.googlesource.com/external/webrtc/+/b681aabdfcdcb22de049df3916f2dd8c40dcbf57
TBR=magjed@webrtc.org,kthelgason@webrtc.org,tkchin@webrtc.org,haysc@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7079
Review-Url: https://codereview.webrtc.org/2716703004
Cr-Commit-Position: refs/heads/master@{#16846}
2017-02-26 11:44:13 -08:00
|
|
|
sources += [
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Classes/Video/RTCNV12TextureCache.h",
|
|
|
|
|
"objc/Framework/Classes/Video/RTCNV12TextureCache.m",
|
Reland of Add metal view, shaders and renderer. (patchset #1 id:1 of https://codereview.webrtc.org/2711003004/ )
Reason for revert:
Re-land
Original issue's description:
> Revert of Add metal view, shaders and renderer. (patchset #18 id:340001 of https://codereview.webrtc.org/2651743007/ )
>
> Reason for revert:
> Reverting due to breakage in the Google3 import
>
> Original issue's description:
> > Add metal view, shaders and renderer.
> >
> > This CL submits standalone Metal view, renderer and shader.
> >
> > BUG=webrtc:7079
> >
> > Review-Url: https://codereview.webrtc.org/2651743007
> > Cr-Commit-Position: refs/heads/master@{#16787}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/fc8c97f950a4fead4a5debe3c838942db1834010
>
> TBR=magjed@webrtc.org,kthelgason@webrtc.org,tkchin@webrtc.org,haysc@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:7079
>
> Review-Url: https://codereview.webrtc.org/2711003004
> Cr-Commit-Position: refs/heads/master@{#16788}
> Committed: https://chromium.googlesource.com/external/webrtc/+/b681aabdfcdcb22de049df3916f2dd8c40dcbf57
TBR=magjed@webrtc.org,kthelgason@webrtc.org,tkchin@webrtc.org,haysc@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7079
Review-Url: https://codereview.webrtc.org/2716703004
Cr-Commit-Position: refs/heads/master@{#16846}
2017-02-26 11:44:13 -08:00
|
|
|
]
|
2017-05-31 05:14:26 -07:00
|
|
|
libs += [
|
|
|
|
|
"GLKit.framework",
|
|
|
|
|
"OpenGLES.framework",
|
|
|
|
|
"QuartzCore.framework",
|
|
|
|
|
]
|
|
|
|
|
} else if (is_mac) {
|
|
|
|
|
libs += [
|
|
|
|
|
"CoreMedia.framework",
|
|
|
|
|
"CoreVideo.framework",
|
|
|
|
|
"OpenGL.framework",
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
]
|
Reland of Add metal view, shaders and renderer. (patchset #1 id:1 of https://codereview.webrtc.org/2711003004/ )
Reason for revert:
Re-land
Original issue's description:
> Revert of Add metal view, shaders and renderer. (patchset #18 id:340001 of https://codereview.webrtc.org/2651743007/ )
>
> Reason for revert:
> Reverting due to breakage in the Google3 import
>
> Original issue's description:
> > Add metal view, shaders and renderer.
> >
> > This CL submits standalone Metal view, renderer and shader.
> >
> > BUG=webrtc:7079
> >
> > Review-Url: https://codereview.webrtc.org/2651743007
> > Cr-Commit-Position: refs/heads/master@{#16787}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/fc8c97f950a4fead4a5debe3c838942db1834010
>
> TBR=magjed@webrtc.org,kthelgason@webrtc.org,tkchin@webrtc.org,haysc@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:7079
>
> Review-Url: https://codereview.webrtc.org/2711003004
> Cr-Commit-Position: refs/heads/master@{#16788}
> Committed: https://chromium.googlesource.com/external/webrtc/+/b681aabdfcdcb22de049df3916f2dd8c40dcbf57
TBR=magjed@webrtc.org,kthelgason@webrtc.org,tkchin@webrtc.org,haysc@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7079
Review-Url: https://codereview.webrtc.org/2716703004
Cr-Commit-Position: refs/heads/master@{#16846}
2017-02-26 11:44:13 -08:00
|
|
|
}
|
2017-05-31 05:14:26 -07:00
|
|
|
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
deps = [
|
2017-08-24 05:43:45 -07:00
|
|
|
":common_objc",
|
2018-02-16 10:49:22 +01:00
|
|
|
":mediaconstraints_objc",
|
2018-02-01 15:47:05 +01:00
|
|
|
":native_video",
|
2018-02-16 10:49:22 +01:00
|
|
|
":videoframebuffer_objc",
|
2018-03-07 10:32:03 +01:00
|
|
|
":videosource_objc",
|
2017-05-31 05:14:26 -07:00
|
|
|
"../api:libjingle_peerconnection_api",
|
2018-05-11 11:15:30 +02:00
|
|
|
"../api/video:video_frame",
|
2017-05-31 05:14:26 -07:00
|
|
|
"../common_video",
|
|
|
|
|
"../media:rtc_media_base",
|
2017-12-13 16:05:42 +01:00
|
|
|
"../rtc_base:checks",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base",
|
2018-06-21 10:17:24 +02:00
|
|
|
"//third_party/abseil-cpp/absl/types:optional",
|
2016-04-27 01:54:20 -07:00
|
|
|
]
|
|
|
|
|
|
2018-06-04 10:24:37 +02:00
|
|
|
configs += [
|
|
|
|
|
"..:common_objc",
|
|
|
|
|
":used_from_extension",
|
|
|
|
|
]
|
2016-08-25 03:25:04 -07:00
|
|
|
}
|
2017-04-25 04:04:50 -07:00
|
|
|
|
2017-08-24 05:43:45 -07:00
|
|
|
rtc_static_library("ui_objc") {
|
2018-01-10 15:54:53 +00:00
|
|
|
visibility = [ "*" ]
|
2018-04-24 16:39:05 +02:00
|
|
|
allow_poison = [
|
|
|
|
|
"audio_codecs", # TODO(bugs.webrtc.org/8396): Remove.
|
|
|
|
|
"software_video_codecs", # TODO(bugs.webrtc.org/7925): Remove.
|
|
|
|
|
]
|
2017-05-31 05:14:26 -07:00
|
|
|
if (is_ios) {
|
|
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/UI/RTCCameraPreviewView.m",
|
|
|
|
|
"objc/Framework/Classes/UI/RTCEAGLVideoView.m",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h",
|
|
|
|
|
]
|
2017-04-25 04:04:50 -07:00
|
|
|
}
|
2017-05-31 05:14:26 -07:00
|
|
|
if (is_mac) {
|
|
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/UI/RTCNSGLVideoView.m",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
configs += [ "..:common_objc" ]
|
2017-04-21 00:02:02 -07:00
|
|
|
deps = [
|
2017-08-24 05:43:45 -07:00
|
|
|
":common_objc",
|
2018-02-16 10:49:22 +01:00
|
|
|
":video_objc",
|
|
|
|
|
":videocapture_objc",
|
|
|
|
|
":videoframebuffer_objc",
|
2017-04-21 00:02:02 -07:00
|
|
|
]
|
2017-05-31 05:14:26 -07:00
|
|
|
}
|
2017-04-21 00:02:02 -07:00
|
|
|
|
2017-05-31 05:14:26 -07:00
|
|
|
if (rtc_use_metal_rendering) {
|
2017-08-24 05:43:45 -07:00
|
|
|
rtc_static_library("metal_objc") {
|
2018-02-16 17:55:36 +01:00
|
|
|
visibility = [ "*" ]
|
2018-04-24 16:39:05 +02:00
|
|
|
allow_poison = [
|
|
|
|
|
"audio_codecs", # TODO(bugs.webrtc.org/8396): Remove.
|
|
|
|
|
"software_video_codecs", # TODO(bugs.webrtc.org/7925): Remove.
|
|
|
|
|
]
|
2017-05-31 05:14:26 -07:00
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/Metal/RTCMTLI420Renderer.h",
|
|
|
|
|
"objc/Framework/Classes/Metal/RTCMTLI420Renderer.mm",
|
|
|
|
|
"objc/Framework/Classes/Metal/RTCMTLRenderer+Private.h",
|
|
|
|
|
"objc/Framework/Classes/Metal/RTCMTLRenderer.h",
|
|
|
|
|
"objc/Framework/Classes/Metal/RTCMTLRenderer.mm",
|
|
|
|
|
]
|
|
|
|
|
if (is_ios) {
|
|
|
|
|
sources += [
|
|
|
|
|
"objc/Framework/Classes/Metal/RTCMTLNV12Renderer.h",
|
|
|
|
|
"objc/Framework/Classes/Metal/RTCMTLNV12Renderer.mm",
|
2018-05-03 14:06:04 +02:00
|
|
|
"objc/Framework/Classes/Metal/RTCMTLRGBRenderer.h",
|
|
|
|
|
"objc/Framework/Classes/Metal/RTCMTLRGBRenderer.mm",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Classes/Metal/RTCMTLVideoView.m",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMTLVideoView.h",
|
|
|
|
|
]
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
}
|
2017-05-31 05:14:26 -07:00
|
|
|
if (is_mac) {
|
|
|
|
|
sources += [
|
|
|
|
|
"objc/Framework/Classes/Metal/RTCMTLNSVideoView.m",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMTLNSVideoView.h",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
libs = [
|
|
|
|
|
"CoreVideo.framework",
|
|
|
|
|
"Metal.framework",
|
|
|
|
|
"MetalKit.framework",
|
|
|
|
|
]
|
|
|
|
|
deps = [
|
2018-02-16 10:49:22 +01:00
|
|
|
":common_objc",
|
|
|
|
|
":peerconnectionfactory_base_objc",
|
2017-08-24 05:43:45 -07:00
|
|
|
":video_objc",
|
2018-02-16 10:49:22 +01:00
|
|
|
":videoframebuffer_objc",
|
2018-03-07 10:32:03 +01:00
|
|
|
":videorenderer_objc",
|
2018-05-11 11:15:30 +02:00
|
|
|
"../api/video:video_frame",
|
2017-12-13 16:05:42 +01:00
|
|
|
"../rtc_base:checks",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base_approved",
|
2017-05-31 05:14:26 -07:00
|
|
|
]
|
|
|
|
|
configs += [ "..:common_objc" ]
|
2017-08-24 05:43:45 -07:00
|
|
|
public_configs = [ ":common_config_objc" ]
|
2017-01-04 07:11:23 -08:00
|
|
|
}
|
|
|
|
|
}
|
2016-09-15 04:30:18 -07:00
|
|
|
|
2018-03-15 09:41:03 +01:00
|
|
|
rtc_static_library("videocapturebase_objc") {
|
|
|
|
|
visibility = [ "*" ]
|
|
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoCapturer.m",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoCapturer.h",
|
|
|
|
|
]
|
|
|
|
|
libs = [ "AVFoundation.framework" ]
|
|
|
|
|
|
|
|
|
|
configs += [ "..:common_objc" ]
|
|
|
|
|
|
|
|
|
|
public_configs = [ ":common_config_objc" ]
|
|
|
|
|
|
|
|
|
|
deps = [
|
|
|
|
|
":common_objc",
|
|
|
|
|
":videoframebuffer_objc",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2018-02-16 10:49:22 +01:00
|
|
|
rtc_static_library("videocapture_objc") {
|
2018-01-10 15:54:53 +00:00
|
|
|
visibility = [ "*" ]
|
2018-04-24 16:39:05 +02:00
|
|
|
allow_poison = [
|
|
|
|
|
"audio_codecs", # TODO(bugs.webrtc.org/8396): Remove.
|
|
|
|
|
"software_video_codecs", # TODO(bugs.webrtc.org/7925): Remove.
|
|
|
|
|
]
|
2017-05-31 05:14:26 -07:00
|
|
|
sources = [
|
2017-06-28 14:05:44 -07:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCCameraVideoCapturer.m",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h",
|
|
|
|
|
]
|
|
|
|
|
if (is_ios) {
|
|
|
|
|
sources += [
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCFileVideoCapturer.m",
|
2017-11-15 13:15:24 +01:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h",
|
2017-06-28 14:05:44 -07:00
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
libs = [ "AVFoundation.framework" ]
|
|
|
|
|
|
|
|
|
|
configs += [ "..:common_objc" ]
|
|
|
|
|
|
2017-08-24 05:43:45 -07:00
|
|
|
public_configs = [ ":common_config_objc" ]
|
2017-06-28 14:05:44 -07:00
|
|
|
|
|
|
|
|
deps = [
|
2017-08-24 05:43:45 -07:00
|
|
|
":common_objc",
|
|
|
|
|
":video_objc",
|
2018-03-15 09:41:03 +01:00
|
|
|
":videocapturebase_objc",
|
2018-02-16 10:49:22 +01:00
|
|
|
":videoframebuffer_objc",
|
2017-06-28 14:05:44 -07:00
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2018-02-16 10:49:22 +01:00
|
|
|
rtc_static_library("videocodec_objc") {
|
2018-04-22 19:55:00 +02:00
|
|
|
visibility = [ "*" ]
|
2018-02-16 10:49:22 +01:00
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCEncodedImage.mm",
|
2018-06-01 12:51:09 +02:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCH264ProfileLevelId.mm",
|
2018-02-16 10:49:22 +01:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpFragmentationHeader.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoCodec+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoCodec.mm",
|
Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2980173002/ )
Reason for revert:
Relanding after fixing issues with no video.
Original issue's description:
> Revert of Injectable Obj-C video codecs (patchset #2 id:370001 of https://codereview.webrtc.org/2979983002/ )
>
> Reason for revert:
> Still having problems with no video. Reverting.
> Once no video is visible, no video is available from then on even if the callee app is in the foreground.
>
>
> Original issue's description:
> > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2979973002/ )
> >
> > Reason for revert:
> > Fix the broken build file
> >
> > Original issue's description:
> > > Revert of Injectable Obj-C video codecs (patchset #3 id:400001 of https://codereview.webrtc.org/2981583002/ )
> > >
> > > Reason for revert:
> > > Breaks bots. Build file incorrect.
> > >
> > > Original issue's description:
> > > > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2975963002/ )
> > > >
> > > > Reason for revert:
> > > > New CL for fixing the issues
> > > >
> > > > Original issue's description:
> > > > > Revert of Injectable Obj-C video codecs (patchset #8 id:140001 of https://codereview.webrtc.org/2966023002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Causes no video in certain scenarios. Please come up with a test plan or unit test to prevent such problems in the future.
> > > > >
> > > > > Original issue's description:
> > > > > > Injectable Obj-C video codecs
> > > > > >
> > > > > > Initial CL for this effort, with a working RTCVideoEncoder/Decoder for H264
> > > > > > (wrapping the VideoToolbox codec).
> > > > > >
> > > > > > Some notes / things left to do:
> > > > > > - There are some hard-coded references to codec types that are supported by
> > > > > > webrtc::VideoCodec, cricket::VideoCodec, webrtc::CodecSpecificInfo etc
> > > > > > since we need to convert to/from these types in ObjCVideoEncoder/Decoder.
> > > > > > These types would need to be more codec agnostic to avoid this.
> > > > > > - Most interfaces are borrowed from the design document for injectable
> > > > > > codecs in Android. Some data in the corresponding C++ classes is discarded
> > > > > > when converting to the Obj-C version, since it has fewer fields. I have not
> > > > > > verified whether all data that we do keep is needed, or whether we might be
> > > > > > losing anything useful in these conversions.
> > > > > > - Implement the VideoToolbox codec code directly in the RTCVideoEncoderH264
> > > > > > classes, instead of wrapping webrtc::H264VideoToolboxEncoder / decoder.
> > > > > > Eliminates converting between ObjC/C++ types outside the ObjCVideoEncoder/
> > > > > > Decoder wrapper classes.
> > > > > > - List the injected codec factory's supported codecs in the list of codecs in
> > > > > > AppRTCMobile.
> > > > > >
> > > > > > BUG=webrtc:7924
> > > > > > R=magjed@webrtc.org
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2966023002 .
> > > > > > Cr-Commit-Position: refs/heads/master@{#18928}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a0349c138db62c52435be84b6c837f5f4758e264
> > > > >
> > > > > TBR=magjed@webrtc.org,andersc@webrtc.org
> > > > > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > > > > BUG=webrtc:7924
> > > > > NOTRY=true
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2975963002
> > > > > Cr-Commit-Position: refs/heads/master@{#18979}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/1095ada7ad56fe29b7b2bbc560a8f6475a7978ce
> > > >
> > > > R=magjed@webrtc.org
> > > > TBR=tkchin@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:7924
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2981583002 .
> > > > Cr-Commit-Position: refs/heads/master@{#19002}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a5f1de1e6541de03f944bcbf49be87c01f57a18b
> > >
> > > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,andersc@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:7924
> > >
> > > Review-Url: https://codereview.webrtc.org/2979973002
> > > Cr-Commit-Position: refs/heads/master@{#19004}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/81d40ee1491d5229c2677cc04b1f40d67c2babef
> >
> > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,sprang@webrtc.org
> > BUG=webrtc:7924
> >
> > Review-Url: https://codereview.webrtc.org/2979983002
> > Cr-Commit-Position: refs/heads/master@{#19005}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/732a3437da4db7b452758b8e1cf26fce0ce3bf65
>
> TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7924
>
> Review-Url: https://codereview.webrtc.org/2980173002
> Cr-Commit-Position: refs/heads/master@{#19036}
> Committed: https://chromium.googlesource.com/external/webrtc/+/860f7298166084d966749e22b69aa2fdcf4d4ed6
TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org,jtteh@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7924
Review-Url: https://codereview.webrtc.org/2977213002
Cr-Commit-Position: refs/heads/master@{#19135}
2017-07-25 07:55:58 -07:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoCodecH264.mm",
|
2018-02-16 10:49:22 +01:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoEncoderSettings.mm",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoCodec.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h",
|
2017-06-28 14:05:44 -07:00
|
|
|
]
|
2018-04-26 15:41:01 +03:00
|
|
|
if (is_ios) {
|
|
|
|
|
sources += [
|
|
|
|
|
"objc/Framework/Classes/Video/UIDevice+H264Profile.h",
|
|
|
|
|
"objc/Framework/Classes/Video/UIDevice+H264Profile.mm",
|
|
|
|
|
]
|
|
|
|
|
}
|
2017-06-28 14:05:44 -07:00
|
|
|
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" ]
|
|
|
|
|
}
|
2018-02-16 10:49:22 +01:00
|
|
|
public_configs = [ ":common_config_objc" ]
|
|
|
|
|
deps = [
|
2017-08-24 05:43:45 -07:00
|
|
|
":common_objc",
|
Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2980173002/ )
Reason for revert:
Relanding after fixing issues with no video.
Original issue's description:
> Revert of Injectable Obj-C video codecs (patchset #2 id:370001 of https://codereview.webrtc.org/2979983002/ )
>
> Reason for revert:
> Still having problems with no video. Reverting.
> Once no video is visible, no video is available from then on even if the callee app is in the foreground.
>
>
> Original issue's description:
> > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2979973002/ )
> >
> > Reason for revert:
> > Fix the broken build file
> >
> > Original issue's description:
> > > Revert of Injectable Obj-C video codecs (patchset #3 id:400001 of https://codereview.webrtc.org/2981583002/ )
> > >
> > > Reason for revert:
> > > Breaks bots. Build file incorrect.
> > >
> > > Original issue's description:
> > > > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2975963002/ )
> > > >
> > > > Reason for revert:
> > > > New CL for fixing the issues
> > > >
> > > > Original issue's description:
> > > > > Revert of Injectable Obj-C video codecs (patchset #8 id:140001 of https://codereview.webrtc.org/2966023002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Causes no video in certain scenarios. Please come up with a test plan or unit test to prevent such problems in the future.
> > > > >
> > > > > Original issue's description:
> > > > > > Injectable Obj-C video codecs
> > > > > >
> > > > > > Initial CL for this effort, with a working RTCVideoEncoder/Decoder for H264
> > > > > > (wrapping the VideoToolbox codec).
> > > > > >
> > > > > > Some notes / things left to do:
> > > > > > - There are some hard-coded references to codec types that are supported by
> > > > > > webrtc::VideoCodec, cricket::VideoCodec, webrtc::CodecSpecificInfo etc
> > > > > > since we need to convert to/from these types in ObjCVideoEncoder/Decoder.
> > > > > > These types would need to be more codec agnostic to avoid this.
> > > > > > - Most interfaces are borrowed from the design document for injectable
> > > > > > codecs in Android. Some data in the corresponding C++ classes is discarded
> > > > > > when converting to the Obj-C version, since it has fewer fields. I have not
> > > > > > verified whether all data that we do keep is needed, or whether we might be
> > > > > > losing anything useful in these conversions.
> > > > > > - Implement the VideoToolbox codec code directly in the RTCVideoEncoderH264
> > > > > > classes, instead of wrapping webrtc::H264VideoToolboxEncoder / decoder.
> > > > > > Eliminates converting between ObjC/C++ types outside the ObjCVideoEncoder/
> > > > > > Decoder wrapper classes.
> > > > > > - List the injected codec factory's supported codecs in the list of codecs in
> > > > > > AppRTCMobile.
> > > > > >
> > > > > > BUG=webrtc:7924
> > > > > > R=magjed@webrtc.org
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2966023002 .
> > > > > > Cr-Commit-Position: refs/heads/master@{#18928}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a0349c138db62c52435be84b6c837f5f4758e264
> > > > >
> > > > > TBR=magjed@webrtc.org,andersc@webrtc.org
> > > > > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > > > > BUG=webrtc:7924
> > > > > NOTRY=true
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2975963002
> > > > > Cr-Commit-Position: refs/heads/master@{#18979}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/1095ada7ad56fe29b7b2bbc560a8f6475a7978ce
> > > >
> > > > R=magjed@webrtc.org
> > > > TBR=tkchin@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:7924
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2981583002 .
> > > > Cr-Commit-Position: refs/heads/master@{#19002}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a5f1de1e6541de03f944bcbf49be87c01f57a18b
> > >
> > > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,andersc@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:7924
> > >
> > > Review-Url: https://codereview.webrtc.org/2979973002
> > > Cr-Commit-Position: refs/heads/master@{#19004}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/81d40ee1491d5229c2677cc04b1f40d67c2babef
> >
> > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,sprang@webrtc.org
> > BUG=webrtc:7924
> >
> > Review-Url: https://codereview.webrtc.org/2979983002
> > Cr-Commit-Position: refs/heads/master@{#19005}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/732a3437da4db7b452758b8e1cf26fce0ce3bf65
>
> TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7924
>
> Review-Url: https://codereview.webrtc.org/2980173002
> Cr-Commit-Position: refs/heads/master@{#19036}
> Committed: https://chromium.googlesource.com/external/webrtc/+/860f7298166084d966749e22b69aa2fdcf4d4ed6
TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org,jtteh@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7924
Review-Url: https://codereview.webrtc.org/2977213002
Cr-Commit-Position: refs/heads/master@{#19135}
2017-07-25 07:55:58 -07:00
|
|
|
"../api/video_codecs:video_codecs_api",
|
2018-02-16 10:49:22 +01:00
|
|
|
"../common_video",
|
2018-04-26 15:41:01 +03:00
|
|
|
"../media:rtc_h264_profile_id",
|
2017-06-28 14:05:44 -07:00
|
|
|
"../media:rtc_media_base",
|
2018-02-16 10:49:22 +01:00
|
|
|
"../modules:module_api",
|
|
|
|
|
"../modules/video_coding:video_codec_interface",
|
|
|
|
|
"../rtc_base:rtc_base_approved",
|
Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2980173002/ )
Reason for revert:
Relanding after fixing issues with no video.
Original issue's description:
> Revert of Injectable Obj-C video codecs (patchset #2 id:370001 of https://codereview.webrtc.org/2979983002/ )
>
> Reason for revert:
> Still having problems with no video. Reverting.
> Once no video is visible, no video is available from then on even if the callee app is in the foreground.
>
>
> Original issue's description:
> > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2979973002/ )
> >
> > Reason for revert:
> > Fix the broken build file
> >
> > Original issue's description:
> > > Revert of Injectable Obj-C video codecs (patchset #3 id:400001 of https://codereview.webrtc.org/2981583002/ )
> > >
> > > Reason for revert:
> > > Breaks bots. Build file incorrect.
> > >
> > > Original issue's description:
> > > > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2975963002/ )
> > > >
> > > > Reason for revert:
> > > > New CL for fixing the issues
> > > >
> > > > Original issue's description:
> > > > > Revert of Injectable Obj-C video codecs (patchset #8 id:140001 of https://codereview.webrtc.org/2966023002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Causes no video in certain scenarios. Please come up with a test plan or unit test to prevent such problems in the future.
> > > > >
> > > > > Original issue's description:
> > > > > > Injectable Obj-C video codecs
> > > > > >
> > > > > > Initial CL for this effort, with a working RTCVideoEncoder/Decoder for H264
> > > > > > (wrapping the VideoToolbox codec).
> > > > > >
> > > > > > Some notes / things left to do:
> > > > > > - There are some hard-coded references to codec types that are supported by
> > > > > > webrtc::VideoCodec, cricket::VideoCodec, webrtc::CodecSpecificInfo etc
> > > > > > since we need to convert to/from these types in ObjCVideoEncoder/Decoder.
> > > > > > These types would need to be more codec agnostic to avoid this.
> > > > > > - Most interfaces are borrowed from the design document for injectable
> > > > > > codecs in Android. Some data in the corresponding C++ classes is discarded
> > > > > > when converting to the Obj-C version, since it has fewer fields. I have not
> > > > > > verified whether all data that we do keep is needed, or whether we might be
> > > > > > losing anything useful in these conversions.
> > > > > > - Implement the VideoToolbox codec code directly in the RTCVideoEncoderH264
> > > > > > classes, instead of wrapping webrtc::H264VideoToolboxEncoder / decoder.
> > > > > > Eliminates converting between ObjC/C++ types outside the ObjCVideoEncoder/
> > > > > > Decoder wrapper classes.
> > > > > > - List the injected codec factory's supported codecs in the list of codecs in
> > > > > > AppRTCMobile.
> > > > > >
> > > > > > BUG=webrtc:7924
> > > > > > R=magjed@webrtc.org
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2966023002 .
> > > > > > Cr-Commit-Position: refs/heads/master@{#18928}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a0349c138db62c52435be84b6c837f5f4758e264
> > > > >
> > > > > TBR=magjed@webrtc.org,andersc@webrtc.org
> > > > > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > > > > BUG=webrtc:7924
> > > > > NOTRY=true
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2975963002
> > > > > Cr-Commit-Position: refs/heads/master@{#18979}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/1095ada7ad56fe29b7b2bbc560a8f6475a7978ce
> > > >
> > > > R=magjed@webrtc.org
> > > > TBR=tkchin@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:7924
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2981583002 .
> > > > Cr-Commit-Position: refs/heads/master@{#19002}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a5f1de1e6541de03f944bcbf49be87c01f57a18b
> > >
> > > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,andersc@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:7924
> > >
> > > Review-Url: https://codereview.webrtc.org/2979973002
> > > Cr-Commit-Position: refs/heads/master@{#19004}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/81d40ee1491d5229c2677cc04b1f40d67c2babef
> >
> > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,sprang@webrtc.org
> > BUG=webrtc:7924
> >
> > Review-Url: https://codereview.webrtc.org/2979983002
> > Cr-Commit-Position: refs/heads/master@{#19005}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/732a3437da4db7b452758b8e1cf26fce0ce3bf65
>
> TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7924
>
> Review-Url: https://codereview.webrtc.org/2980173002
> Cr-Commit-Position: refs/heads/master@{#19036}
> Committed: https://chromium.googlesource.com/external/webrtc/+/860f7298166084d966749e22b69aa2fdcf4d4ed6
TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org,jtteh@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7924
Review-Url: https://codereview.webrtc.org/2977213002
Cr-Commit-Position: refs/heads/master@{#19135}
2017-07-25 07:55:58 -07:00
|
|
|
"../system_wrappers:field_trial_api",
|
2017-06-28 14:05:44 -07:00
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2018-01-30 10:32:13 +01:00
|
|
|
rtc_static_library("default_codec_factory_objc") {
|
|
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCDefaultVideoDecoderFactory.m",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCDefaultVideoEncoderFactory.m",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
deps = [
|
|
|
|
|
":common_objc",
|
2018-02-16 10:49:22 +01:00
|
|
|
":native_video",
|
|
|
|
|
":videocodec_objc",
|
2018-04-13 15:36:43 +02:00
|
|
|
":vp8",
|
|
|
|
|
":vp9",
|
2018-01-30 10:32:13 +01:00
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc_static_library("vp8") {
|
2018-02-16 10:49:22 +01:00
|
|
|
visibility = [ "*" ]
|
2018-04-27 04:31:53 +02:00
|
|
|
allow_poison = [ "software_video_codecs" ]
|
2018-01-30 10:32:13 +01:00
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoCodecVP8.mm",
|
2018-02-16 10:49:22 +01:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h",
|
2018-01-30 10:32:13 +01:00
|
|
|
]
|
|
|
|
|
|
|
|
|
|
deps = [
|
2018-03-07 10:32:03 +01:00
|
|
|
":wrapped_native_codec_objc",
|
2018-01-30 10:32:13 +01:00
|
|
|
"../modules/video_coding:webrtc_vp8",
|
|
|
|
|
"../system_wrappers:metrics_default",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc_static_library("vp9") {
|
2018-02-16 10:49:22 +01:00
|
|
|
visibility = [ "*" ]
|
2018-04-27 04:31:53 +02:00
|
|
|
allow_poison = [ "software_video_codecs" ]
|
2018-01-30 10:32:13 +01:00
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoCodecVP9.mm",
|
2018-02-16 10:49:22 +01:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h",
|
2018-01-30 10:32:13 +01:00
|
|
|
]
|
|
|
|
|
|
|
|
|
|
deps = [
|
2018-03-07 10:32:03 +01:00
|
|
|
":wrapped_native_codec_objc",
|
2018-01-30 10:32:13 +01:00
|
|
|
"../modules/video_coding:webrtc_vp9",
|
|
|
|
|
"../system_wrappers:metrics_default",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2017-06-28 14:05:44 -07:00
|
|
|
# Build the PeerConnectionFactory without audio/video support.
|
|
|
|
|
# This target depends on the objc_peeerconnectionfactory_base which still
|
|
|
|
|
# includes some audio/video related objects such as RTCAudioSource because
|
|
|
|
|
# these objects are just thin wrappers of native C++ interfaces required
|
|
|
|
|
# when implementing webrtc::PeerConnectionFactoryInterface and
|
|
|
|
|
# webrtc::PeerConnectionInterface.
|
2018-03-06 10:18:43 +01:00
|
|
|
# The applications which only use WebRTC DataChannel can depend on this.
|
2017-08-24 05:43:45 -07:00
|
|
|
rtc_static_library("peerconnectionfactory_no_media_objc") {
|
2018-01-10 15:54:53 +00:00
|
|
|
visibility = [ "*" ]
|
2018-04-24 16:39:05 +02:00
|
|
|
allow_poison = [
|
|
|
|
|
"audio_codecs", # TODO(bugs.webrtc.org/8396): Remove.
|
|
|
|
|
"software_video_codecs", # TODO(bugs.webrtc.org/7925): Remove.
|
|
|
|
|
]
|
2017-06-28 14:05:44 -07:00
|
|
|
defines = [ "HAVE_NO_MEDIA" ]
|
|
|
|
|
|
|
|
|
|
sources = [
|
2018-02-16 10:49:22 +01:00
|
|
|
"objc/Framework/Classes/Common/noop.mm",
|
2017-06-28 14:05:44 -07:00
|
|
|
]
|
|
|
|
|
|
2017-08-24 05:43:45 -07:00
|
|
|
public_configs = [ ":common_config_objc" ]
|
2017-06-28 14:05:44 -07:00
|
|
|
|
|
|
|
|
deps = [
|
2018-02-01 15:47:05 +01:00
|
|
|
":native_api",
|
|
|
|
|
":native_video",
|
2017-08-24 05:43:45 -07:00
|
|
|
":peerconnectionfactory_base_objc",
|
2017-06-28 14:05:44 -07:00
|
|
|
"../api:libjingle_peerconnection_api",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base",
|
2017-06-28 14:05:44 -07:00
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2018-02-16 10:49:22 +01:00
|
|
|
rtc_static_library("mediaconstraints_objc") {
|
|
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCMediaConstraints+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCMediaConstraints.mm",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMediaConstraints.h",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
public_configs = [ ":common_config_objc" ]
|
|
|
|
|
deps = [
|
|
|
|
|
":common_objc",
|
|
|
|
|
"../api:libjingle_peerconnection_api",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2018-03-07 10:32:03 +01:00
|
|
|
rtc_source_set("videorenderer_objc") {
|
|
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoRenderer.h",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
configs += [ "..:common_objc" ]
|
|
|
|
|
visibility = [ "*" ]
|
|
|
|
|
public_configs = [ ":common_config_objc" ]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc_static_library("videorendereradapter_objc") {
|
2018-04-22 19:55:00 +02:00
|
|
|
visibility = [ "*" ]
|
2018-04-24 16:39:05 +02:00
|
|
|
allow_poison = [
|
|
|
|
|
"audio_codecs", # TODO(bugs.webrtc.org/8396): Remove.
|
|
|
|
|
"software_video_codecs", # TODO(bugs.webrtc.org/7925): Remove.
|
|
|
|
|
]
|
2018-03-07 10:32:03 +01:00
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoRendererAdapter.mm",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
configs += [ "..:common_objc" ]
|
|
|
|
|
public_configs = [ ":common_config_objc" ]
|
|
|
|
|
|
|
|
|
|
deps = [
|
|
|
|
|
":common_objc",
|
|
|
|
|
":native_api",
|
|
|
|
|
":videoframebuffer_objc",
|
|
|
|
|
":videorenderer_objc",
|
|
|
|
|
"../api:libjingle_peerconnection_api",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc_static_library("mediasource_objc") {
|
|
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCMediaSource+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCMediaSource.mm",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMediaSource.h",
|
|
|
|
|
]
|
|
|
|
|
|
2018-06-04 10:24:37 +02:00
|
|
|
configs += [
|
|
|
|
|
"..:common_objc",
|
|
|
|
|
":used_from_extension",
|
|
|
|
|
]
|
2018-03-07 10:32:03 +01:00
|
|
|
public_configs = [ ":common_config_objc" ]
|
|
|
|
|
|
|
|
|
|
deps = [
|
|
|
|
|
":common_objc",
|
|
|
|
|
"../api:libjingle_peerconnection_api",
|
|
|
|
|
"../rtc_base:checks",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-24 05:43:45 -07:00
|
|
|
rtc_static_library("peerconnectionfactory_base_objc") {
|
2018-04-22 19:55:00 +02:00
|
|
|
visibility = [ "*" ]
|
2018-04-24 16:39:05 +02:00
|
|
|
allow_poison = [
|
|
|
|
|
"audio_codecs", # TODO(bugs.webrtc.org/8396): Remove.
|
|
|
|
|
"software_video_codecs", # TODO(bugs.webrtc.org/7925): Remove.
|
|
|
|
|
]
|
2017-06-28 14:05:44 -07:00
|
|
|
sources = [
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCAudioSource+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCAudioSource.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCAudioTrack+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCAudioTrack.mm",
|
2018-07-05 15:28:24 +02:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCCertificate.mm",
|
2017-10-27 15:42:08 -07:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCConfiguration+Native.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCConfiguration+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCConfiguration.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCDataChannel+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCDataChannel.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCDataChannelConfiguration.mm",
|
2018-01-02 14:44:35 +03:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCDtmfSender+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCDtmfSender.mm",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCIceCandidate+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCIceCandidate.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCIceServer+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCIceServer.mm",
|
2017-07-14 16:06:41 -07:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCIntervalRange+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCIntervalRange.mm",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCLegacyStatsReport.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCMediaStream+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCMediaStream.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCMediaStreamTrack.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCMetrics.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCMetricsSampleInfo.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnection+DataChannel.mm",
|
2017-10-28 16:26:55 +02:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnection+Native.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnection+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnection+Stats.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnection.mm",
|
2018-02-16 10:49:22 +01:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Native.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactory.mm",
|
2018-06-20 16:18:59 -07:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactoryBuilder+DefaultComponents.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactoryBuilder+DefaultComponents.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactoryBuilder.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactoryBuilder.mm",
|
2018-01-02 13:33:16 +03:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactoryOptions+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCPeerConnectionFactoryOptions.mm",
|
2018-05-24 16:24:21 +02:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtcpParameters+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtcpParameters.mm",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpCodecParameters.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpEncodingParameters.mm",
|
2018-06-12 18:33:49 +02:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpHeaderExtension+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpHeaderExtension.mm",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpParameters+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpParameters.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpReceiver+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpReceiver.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpSender+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpSender.mm",
|
2018-02-27 15:34:53 -08:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpTransceiver+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCRtpTransceiver.mm",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Classes/PeerConnection/RTCSSLAdapter.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCSessionDescription+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCSessionDescription.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCTracing.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoTrack+Private.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCVideoTrack.mm",
|
2017-05-31 10:04:55 +02:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCAudioSource.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCAudioTrack.h",
|
2018-07-05 15:28:24 +02:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCCertificate.h",
|
2016-12-05 11:27:30 -08:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCConfiguration.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCDataChannel.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h",
|
2018-01-02 14:44:35 +03:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCDtmfSender.h",
|
2016-12-05 11:27:30 -08:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCIceCandidate.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCIceServer.h",
|
2017-07-14 16:06:41 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCIntervalRange.h",
|
2016-12-05 11:27:30 -08:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMediaStream.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMetrics.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCPeerConnection.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h",
|
2018-01-02 13:33:16 +03:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h",
|
2018-05-24 16:24:21 +02:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtcpParameters.h",
|
2016-12-05 11:27:30 -08:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h",
|
2018-06-12 18:33:49 +02:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h",
|
2016-12-05 11:27:30 -08:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpParameters.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpReceiver.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpSender.h",
|
2018-02-27 15:34:53 -08:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h",
|
2016-12-05 11:27:30 -08:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCSSLAdapter.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCSessionDescription.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCTracing.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoTrack.h",
|
|
|
|
|
]
|
2016-09-15 04:30:18 -07:00
|
|
|
|
2018-06-04 10:24:37 +02:00
|
|
|
configs += [
|
|
|
|
|
"..:common_objc",
|
|
|
|
|
":used_from_extension",
|
|
|
|
|
]
|
2017-08-24 05:43:45 -07:00
|
|
|
public_configs = [ ":common_config_objc" ]
|
2017-05-31 05:14:26 -07:00
|
|
|
|
2016-09-15 04:30:18 -07:00
|
|
|
deps = [
|
2017-08-24 05:43:45 -07:00
|
|
|
":common_objc",
|
2018-02-16 10:49:22 +01:00
|
|
|
":mediaconstraints_objc",
|
2018-03-07 10:32:03 +01:00
|
|
|
":mediasource_objc",
|
2018-02-01 15:47:05 +01:00
|
|
|
":native_api",
|
|
|
|
|
":native_video",
|
2018-02-16 10:49:22 +01:00
|
|
|
":video_objc",
|
|
|
|
|
":videocodec_objc",
|
|
|
|
|
":videoframebuffer_objc",
|
2018-03-07 10:32:03 +01:00
|
|
|
":videorenderer_objc",
|
|
|
|
|
":videorendereradapter_objc",
|
|
|
|
|
":videosource_objc",
|
2017-12-06 11:23:19 +01:00
|
|
|
"../api:libjingle_peerconnection_api",
|
2018-06-20 16:18:59 -07:00
|
|
|
"../api/audio_codecs:audio_codecs_api",
|
2018-04-06 10:06:42 +02:00
|
|
|
"../api/audio_codecs:builtin_audio_decoder_factory",
|
2018-06-20 16:18:59 -07:00
|
|
|
"../api/audio_codecs:builtin_audio_encoder_factory",
|
2018-05-11 11:15:30 +02:00
|
|
|
"../api/video:video_frame",
|
2017-10-05 16:55:38 +02:00
|
|
|
"../api/video_codecs:video_codecs_api",
|
2017-06-22 15:26:30 +02:00
|
|
|
"../common_video",
|
2017-05-31 05:14:26 -07:00
|
|
|
"../media:rtc_media_base",
|
Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2980173002/ )
Reason for revert:
Relanding after fixing issues with no video.
Original issue's description:
> Revert of Injectable Obj-C video codecs (patchset #2 id:370001 of https://codereview.webrtc.org/2979983002/ )
>
> Reason for revert:
> Still having problems with no video. Reverting.
> Once no video is visible, no video is available from then on even if the callee app is in the foreground.
>
>
> Original issue's description:
> > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2979973002/ )
> >
> > Reason for revert:
> > Fix the broken build file
> >
> > Original issue's description:
> > > Revert of Injectable Obj-C video codecs (patchset #3 id:400001 of https://codereview.webrtc.org/2981583002/ )
> > >
> > > Reason for revert:
> > > Breaks bots. Build file incorrect.
> > >
> > > Original issue's description:
> > > > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2975963002/ )
> > > >
> > > > Reason for revert:
> > > > New CL for fixing the issues
> > > >
> > > > Original issue's description:
> > > > > Revert of Injectable Obj-C video codecs (patchset #8 id:140001 of https://codereview.webrtc.org/2966023002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Causes no video in certain scenarios. Please come up with a test plan or unit test to prevent such problems in the future.
> > > > >
> > > > > Original issue's description:
> > > > > > Injectable Obj-C video codecs
> > > > > >
> > > > > > Initial CL for this effort, with a working RTCVideoEncoder/Decoder for H264
> > > > > > (wrapping the VideoToolbox codec).
> > > > > >
> > > > > > Some notes / things left to do:
> > > > > > - There are some hard-coded references to codec types that are supported by
> > > > > > webrtc::VideoCodec, cricket::VideoCodec, webrtc::CodecSpecificInfo etc
> > > > > > since we need to convert to/from these types in ObjCVideoEncoder/Decoder.
> > > > > > These types would need to be more codec agnostic to avoid this.
> > > > > > - Most interfaces are borrowed from the design document for injectable
> > > > > > codecs in Android. Some data in the corresponding C++ classes is discarded
> > > > > > when converting to the Obj-C version, since it has fewer fields. I have not
> > > > > > verified whether all data that we do keep is needed, or whether we might be
> > > > > > losing anything useful in these conversions.
> > > > > > - Implement the VideoToolbox codec code directly in the RTCVideoEncoderH264
> > > > > > classes, instead of wrapping webrtc::H264VideoToolboxEncoder / decoder.
> > > > > > Eliminates converting between ObjC/C++ types outside the ObjCVideoEncoder/
> > > > > > Decoder wrapper classes.
> > > > > > - List the injected codec factory's supported codecs in the list of codecs in
> > > > > > AppRTCMobile.
> > > > > >
> > > > > > BUG=webrtc:7924
> > > > > > R=magjed@webrtc.org
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2966023002 .
> > > > > > Cr-Commit-Position: refs/heads/master@{#18928}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a0349c138db62c52435be84b6c837f5f4758e264
> > > > >
> > > > > TBR=magjed@webrtc.org,andersc@webrtc.org
> > > > > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > > > > BUG=webrtc:7924
> > > > > NOTRY=true
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2975963002
> > > > > Cr-Commit-Position: refs/heads/master@{#18979}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/1095ada7ad56fe29b7b2bbc560a8f6475a7978ce
> > > >
> > > > R=magjed@webrtc.org
> > > > TBR=tkchin@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:7924
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2981583002 .
> > > > Cr-Commit-Position: refs/heads/master@{#19002}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a5f1de1e6541de03f944bcbf49be87c01f57a18b
> > >
> > > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,andersc@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:7924
> > >
> > > Review-Url: https://codereview.webrtc.org/2979973002
> > > Cr-Commit-Position: refs/heads/master@{#19004}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/81d40ee1491d5229c2677cc04b1f40d67c2babef
> >
> > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,sprang@webrtc.org
> > BUG=webrtc:7924
> >
> > Review-Url: https://codereview.webrtc.org/2979983002
> > Cr-Commit-Position: refs/heads/master@{#19005}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/732a3437da4db7b452758b8e1cf26fce0ce3bf65
>
> TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7924
>
> Review-Url: https://codereview.webrtc.org/2980173002
> Cr-Commit-Position: refs/heads/master@{#19036}
> Committed: https://chromium.googlesource.com/external/webrtc/+/860f7298166084d966749e22b69aa2fdcf4d4ed6
TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org,jtteh@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7924
Review-Url: https://codereview.webrtc.org/2977213002
Cr-Commit-Position: refs/heads/master@{#19135}
2017-07-25 07:55:58 -07:00
|
|
|
"../modules:module_api",
|
2018-06-20 16:18:59 -07:00
|
|
|
"../modules/audio_device:audio_device_api",
|
|
|
|
|
"../modules/audio_processing:audio_processing",
|
2018-01-08 11:05:10 +01:00
|
|
|
"../modules/video_coding:video_codec_interface",
|
2018-02-16 10:49:22 +01:00
|
|
|
"../pc:create_pc_factory",
|
2017-06-28 14:05:44 -07:00
|
|
|
"../pc:peerconnection",
|
2017-12-13 16:05:42 +01:00
|
|
|
"../rtc_base:checks",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base",
|
2018-07-11 09:18:37 +02:00
|
|
|
"//third_party/abseil-cpp/absl/memory",
|
2016-09-15 04:30:18 -07:00
|
|
|
]
|
2018-05-15 10:22:36 +02:00
|
|
|
|
|
|
|
|
if (is_ios) {
|
|
|
|
|
deps += [ ":native_api_audio_device_module" ]
|
|
|
|
|
}
|
2017-05-31 05:14:26 -07:00
|
|
|
}
|
2017-04-24 00:57:16 -07:00
|
|
|
|
2017-05-31 05:14:26 -07:00
|
|
|
if (rtc_include_tests) {
|
2017-11-15 13:15:24 +01:00
|
|
|
if (is_ios) {
|
2017-10-12 13:46:00 +02:00
|
|
|
rtc_source_set("sdk_unittests_sources") {
|
|
|
|
|
testonly = true
|
|
|
|
|
include_dirs = [
|
|
|
|
|
"objc/Framework/Headers",
|
|
|
|
|
"objc/Framework/Classes",
|
|
|
|
|
]
|
2017-11-15 13:15:24 +01:00
|
|
|
|
2017-10-12 13:46:00 +02:00
|
|
|
sources = [
|
2018-04-03 11:40:39 +02:00
|
|
|
"objc/Framework/UnitTests/ObjCVideoTrackSource_xctest.mm",
|
|
|
|
|
"objc/Framework/UnitTests/RTCCVPixelBuffer_xctest.mm",
|
2018-01-30 15:46:13 +01:00
|
|
|
"objc/Framework/UnitTests/RTCCallbackLogger_xctest.m",
|
2018-01-09 14:26:41 +01:00
|
|
|
"objc/Framework/UnitTests/RTCDoNotPutCPlusPlusInFrameworkHeaders_xctest.m",
|
2017-11-15 13:15:24 +01:00
|
|
|
"objc/Framework/UnitTests/RTCFileVideoCapturer_xctest.mm",
|
2018-06-01 12:51:09 +02:00
|
|
|
"objc/Framework/UnitTests/RTCH264ProfileLevelId_xctest.m",
|
2018-06-19 12:51:51 +03:00
|
|
|
"objc/Framework/UnitTests/RTCPeerConnectionFactory_xctest.m",
|
2018-04-03 11:40:39 +02:00
|
|
|
"objc/Framework/UnitTests/frame_buffer_helpers.h",
|
|
|
|
|
"objc/Framework/UnitTests/frame_buffer_helpers.mm",
|
2017-10-12 13:46:00 +02:00
|
|
|
]
|
2017-11-15 13:15:24 +01:00
|
|
|
|
2018-05-15 10:22:36 +02:00
|
|
|
# TODO(peterhanspers): Reenable these tests on simulator.
|
|
|
|
|
# See bugs.webrtc.org/7812
|
|
|
|
|
if (!use_ios_simulator) {
|
|
|
|
|
sources += [
|
|
|
|
|
"objc/Framework/UnitTests/RTCAudioDeviceModule_xctest.mm",
|
|
|
|
|
"objc/Framework/UnitTests/RTCAudioDevice_xctest.mm",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2017-10-12 13:46:00 +02:00
|
|
|
deps = [
|
2018-05-15 10:22:36 +02:00
|
|
|
":audio_device",
|
|
|
|
|
":audio_objc",
|
2017-10-12 13:46:00 +02:00
|
|
|
":common_objc",
|
2018-01-15 13:31:03 +01:00
|
|
|
":framework_objc",
|
2018-04-03 11:40:39 +02:00
|
|
|
":native_api",
|
2018-05-15 10:22:36 +02:00
|
|
|
":native_api_audio_device_module",
|
2018-04-03 11:40:39 +02:00
|
|
|
":native_video",
|
2018-02-16 10:49:22 +01:00
|
|
|
":videocapture_objc",
|
2018-06-01 12:51:09 +02:00
|
|
|
":videocodec_objc",
|
2018-04-03 11:40:39 +02:00
|
|
|
":videoframebuffer_objc",
|
2018-03-07 10:32:03 +01:00
|
|
|
":videosource_objc",
|
2017-10-12 13:46:00 +02:00
|
|
|
":videotoolbox_objc",
|
2018-05-11 11:15:30 +02:00
|
|
|
"../api/video:video_frame_i420",
|
2018-04-03 11:40:39 +02:00
|
|
|
"../common_video:common_video",
|
2017-10-12 13:46:00 +02:00
|
|
|
"../media:rtc_media_base",
|
2018-04-03 11:40:39 +02:00
|
|
|
"../media:rtc_media_tests_utils",
|
2017-10-12 13:46:00 +02:00
|
|
|
"../modules:module_api",
|
|
|
|
|
"../rtc_base:rtc_base",
|
|
|
|
|
"../rtc_base:rtc_base_tests_utils",
|
2018-07-23 10:04:12 +02:00
|
|
|
"../system_wrappers:system_wrappers",
|
|
|
|
|
"../system_wrappers:system_wrappers_default",
|
2018-04-03 11:40:39 +02:00
|
|
|
"//third_party/libyuv",
|
2017-10-12 13:46:00 +02:00
|
|
|
]
|
2018-02-16 10:49:22 +01:00
|
|
|
|
|
|
|
|
if (rtc_use_metal_rendering) {
|
2018-04-19 17:38:05 +02:00
|
|
|
sources += [ "objc/Framework/UnitTests/RTCMTLVideoView_xctest.m" ]
|
2018-02-16 10:49:22 +01:00
|
|
|
deps += [ ":metal_objc" ]
|
|
|
|
|
}
|
|
|
|
|
|
2017-10-12 13:46:00 +02:00
|
|
|
public_deps = [
|
|
|
|
|
"//build/config/ios:xctest",
|
|
|
|
|
"//third_party/ocmock",
|
|
|
|
|
]
|
2018-02-16 10:49:22 +01:00
|
|
|
|
2018-01-15 13:31:03 +01:00
|
|
|
include_dirs += [ "$root_out_dir/WebRTC.framework/Headers/" ]
|
2017-10-12 13:46:00 +02:00
|
|
|
}
|
|
|
|
|
|
2017-11-15 13:15:24 +01:00
|
|
|
bundle_data("sdk_unittests_bundle_data") {
|
|
|
|
|
sources = [
|
2018-05-15 10:22:36 +02:00
|
|
|
"objc/Framework/UnitTests/audio_short16.pcm",
|
|
|
|
|
"objc/Framework/UnitTests/audio_short44.pcm",
|
|
|
|
|
"objc/Framework/UnitTests/audio_short48.pcm",
|
|
|
|
|
|
|
|
|
|
# Sample video taken from https://media.xiph.org/video/derf/
|
2017-11-15 13:15:24 +01:00
|
|
|
"objc/Framework/UnitTests/foreman.mp4",
|
|
|
|
|
]
|
|
|
|
|
outputs = [
|
|
|
|
|
"{{bundle_resources_dir}}/{{source_file_part}}",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2017-10-12 13:46:00 +02:00
|
|
|
rtc_ios_xctest_test("sdk_unittests") {
|
|
|
|
|
info_plist = "//test/ios/Info.plist"
|
|
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/UnitTests/main.m",
|
|
|
|
|
]
|
2017-11-15 13:15:24 +01:00
|
|
|
|
2017-10-12 13:46:00 +02:00
|
|
|
_bundle_id_suffix = ios_generic_test_bundle_id_suffix
|
|
|
|
|
extra_substitutions = [ "GTEST_BUNDLE_ID_SUFFIX=$_bundle_id_suffix" ]
|
|
|
|
|
deps = [
|
2018-06-19 12:51:51 +03:00
|
|
|
":peerconnectionfactory_base_objc",
|
2017-11-15 13:15:24 +01:00
|
|
|
":sdk_unittests_bundle_data",
|
2017-10-12 13:46:00 +02:00
|
|
|
":sdk_unittests_sources",
|
|
|
|
|
]
|
|
|
|
|
ldflags = [ "-all_load" ]
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
# TODO(denicija): once all tests are migrated to xctest remove this source set.
|
2018-07-27 12:34:54 +02:00
|
|
|
rtc_source_set("rtc_unittests_objc") {
|
2017-05-31 05:14:26 -07:00
|
|
|
testonly = true
|
2017-04-24 00:57:16 -07:00
|
|
|
|
2017-05-31 05:14:26 -07:00
|
|
|
sources = [
|
2018-07-05 15:28:24 +02:00
|
|
|
"objc/Framework/UnitTests/RTCCertificateTest.mm",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/UnitTests/RTCConfigurationTest.mm",
|
|
|
|
|
"objc/Framework/UnitTests/RTCDataChannelConfigurationTest.mm",
|
|
|
|
|
"objc/Framework/UnitTests/RTCIceCandidateTest.mm",
|
|
|
|
|
"objc/Framework/UnitTests/RTCIceServerTest.mm",
|
2017-07-14 16:06:41 -07:00
|
|
|
"objc/Framework/UnitTests/RTCIntervalRangeTests.mm",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/UnitTests/RTCMediaConstraintsTest.mm",
|
2018-06-20 16:18:59 -07:00
|
|
|
"objc/Framework/UnitTests/RTCPeerConnectionFactoryBuilderTest.mm",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/UnitTests/RTCPeerConnectionTest.mm",
|
|
|
|
|
"objc/Framework/UnitTests/RTCSessionDescriptionTest.mm",
|
2017-07-07 11:02:15 -07:00
|
|
|
"objc/Framework/UnitTests/RTCTracingTest.mm",
|
Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2980173002/ )
Reason for revert:
Relanding after fixing issues with no video.
Original issue's description:
> Revert of Injectable Obj-C video codecs (patchset #2 id:370001 of https://codereview.webrtc.org/2979983002/ )
>
> Reason for revert:
> Still having problems with no video. Reverting.
> Once no video is visible, no video is available from then on even if the callee app is in the foreground.
>
>
> Original issue's description:
> > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2979973002/ )
> >
> > Reason for revert:
> > Fix the broken build file
> >
> > Original issue's description:
> > > Revert of Injectable Obj-C video codecs (patchset #3 id:400001 of https://codereview.webrtc.org/2981583002/ )
> > >
> > > Reason for revert:
> > > Breaks bots. Build file incorrect.
> > >
> > > Original issue's description:
> > > > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2975963002/ )
> > > >
> > > > Reason for revert:
> > > > New CL for fixing the issues
> > > >
> > > > Original issue's description:
> > > > > Revert of Injectable Obj-C video codecs (patchset #8 id:140001 of https://codereview.webrtc.org/2966023002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Causes no video in certain scenarios. Please come up with a test plan or unit test to prevent such problems in the future.
> > > > >
> > > > > Original issue's description:
> > > > > > Injectable Obj-C video codecs
> > > > > >
> > > > > > Initial CL for this effort, with a working RTCVideoEncoder/Decoder for H264
> > > > > > (wrapping the VideoToolbox codec).
> > > > > >
> > > > > > Some notes / things left to do:
> > > > > > - There are some hard-coded references to codec types that are supported by
> > > > > > webrtc::VideoCodec, cricket::VideoCodec, webrtc::CodecSpecificInfo etc
> > > > > > since we need to convert to/from these types in ObjCVideoEncoder/Decoder.
> > > > > > These types would need to be more codec agnostic to avoid this.
> > > > > > - Most interfaces are borrowed from the design document for injectable
> > > > > > codecs in Android. Some data in the corresponding C++ classes is discarded
> > > > > > when converting to the Obj-C version, since it has fewer fields. I have not
> > > > > > verified whether all data that we do keep is needed, or whether we might be
> > > > > > losing anything useful in these conversions.
> > > > > > - Implement the VideoToolbox codec code directly in the RTCVideoEncoderH264
> > > > > > classes, instead of wrapping webrtc::H264VideoToolboxEncoder / decoder.
> > > > > > Eliminates converting between ObjC/C++ types outside the ObjCVideoEncoder/
> > > > > > Decoder wrapper classes.
> > > > > > - List the injected codec factory's supported codecs in the list of codecs in
> > > > > > AppRTCMobile.
> > > > > >
> > > > > > BUG=webrtc:7924
> > > > > > R=magjed@webrtc.org
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2966023002 .
> > > > > > Cr-Commit-Position: refs/heads/master@{#18928}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a0349c138db62c52435be84b6c837f5f4758e264
> > > > >
> > > > > TBR=magjed@webrtc.org,andersc@webrtc.org
> > > > > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > > > > BUG=webrtc:7924
> > > > > NOTRY=true
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2975963002
> > > > > Cr-Commit-Position: refs/heads/master@{#18979}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/1095ada7ad56fe29b7b2bbc560a8f6475a7978ce
> > > >
> > > > R=magjed@webrtc.org
> > > > TBR=tkchin@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:7924
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2981583002 .
> > > > Cr-Commit-Position: refs/heads/master@{#19002}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a5f1de1e6541de03f944bcbf49be87c01f57a18b
> > >
> > > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,andersc@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:7924
> > >
> > > Review-Url: https://codereview.webrtc.org/2979973002
> > > Cr-Commit-Position: refs/heads/master@{#19004}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/81d40ee1491d5229c2677cc04b1f40d67c2babef
> >
> > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,sprang@webrtc.org
> > BUG=webrtc:7924
> >
> > Review-Url: https://codereview.webrtc.org/2979983002
> > Cr-Commit-Position: refs/heads/master@{#19005}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/732a3437da4db7b452758b8e1cf26fce0ce3bf65
>
> TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7924
>
> Review-Url: https://codereview.webrtc.org/2980173002
> Cr-Commit-Position: refs/heads/master@{#19036}
> Committed: https://chromium.googlesource.com/external/webrtc/+/860f7298166084d966749e22b69aa2fdcf4d4ed6
TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org,jtteh@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7924
Review-Url: https://codereview.webrtc.org/2977213002
Cr-Commit-Position: refs/heads/master@{#19135}
2017-07-25 07:55:58 -07:00
|
|
|
"objc/Framework/UnitTests/objc_video_decoder_factory_tests.mm",
|
|
|
|
|
"objc/Framework/UnitTests/objc_video_encoder_factory_tests.mm",
|
2017-10-05 14:06:52 +02:00
|
|
|
"objc/Framework/UnitTests/scoped_cftyperef_tests.mm",
|
2017-05-31 05:14:26 -07:00
|
|
|
]
|
2018-01-19 11:28:44 +01:00
|
|
|
if (is_ios) {
|
2017-06-22 01:47:20 -07:00
|
|
|
sources +=
|
|
|
|
|
[ "objc/Framework/UnitTests/RTCCameraVideoCapturerTests.mm" ]
|
|
|
|
|
}
|
2017-05-31 05:14:26 -07:00
|
|
|
|
|
|
|
|
# |-ObjC| flag needed to make sure category method implementations
|
|
|
|
|
# are included:
|
|
|
|
|
# https://developer.apple.com/library/mac/qa/qa1490/_index.html
|
|
|
|
|
ldflags = [ "-ObjC" ]
|
|
|
|
|
|
|
|
|
|
deps = [
|
2017-10-05 14:06:52 +02:00
|
|
|
":common_objc",
|
2018-02-16 10:49:22 +01:00
|
|
|
":mediaconstraints_objc",
|
|
|
|
|
":native_api",
|
2018-02-01 15:47:05 +01:00
|
|
|
":native_video",
|
2018-02-16 10:49:22 +01:00
|
|
|
":peerconnectionfactory_base_objc",
|
|
|
|
|
":video_objc",
|
|
|
|
|
":videocapture_objc",
|
|
|
|
|
":videocodec_objc",
|
|
|
|
|
":videoframebuffer_objc",
|
2018-03-07 10:32:03 +01:00
|
|
|
":videosource_objc",
|
2017-08-24 05:43:45 -07:00
|
|
|
":videotoolbox_objc",
|
2018-06-20 16:18:59 -07:00
|
|
|
"../api/audio_codecs:audio_codecs_api",
|
|
|
|
|
"../api/audio_codecs:builtin_audio_decoder_factory",
|
|
|
|
|
"../api/audio_codecs:builtin_audio_encoder_factory",
|
2018-04-13 15:36:43 +02:00
|
|
|
"../api/video_codecs:video_codecs_api",
|
2017-09-04 04:36:21 -07:00
|
|
|
"../media:rtc_media_base",
|
Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2980173002/ )
Reason for revert:
Relanding after fixing issues with no video.
Original issue's description:
> Revert of Injectable Obj-C video codecs (patchset #2 id:370001 of https://codereview.webrtc.org/2979983002/ )
>
> Reason for revert:
> Still having problems with no video. Reverting.
> Once no video is visible, no video is available from then on even if the callee app is in the foreground.
>
>
> Original issue's description:
> > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2979973002/ )
> >
> > Reason for revert:
> > Fix the broken build file
> >
> > Original issue's description:
> > > Revert of Injectable Obj-C video codecs (patchset #3 id:400001 of https://codereview.webrtc.org/2981583002/ )
> > >
> > > Reason for revert:
> > > Breaks bots. Build file incorrect.
> > >
> > > Original issue's description:
> > > > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2975963002/ )
> > > >
> > > > Reason for revert:
> > > > New CL for fixing the issues
> > > >
> > > > Original issue's description:
> > > > > Revert of Injectable Obj-C video codecs (patchset #8 id:140001 of https://codereview.webrtc.org/2966023002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Causes no video in certain scenarios. Please come up with a test plan or unit test to prevent such problems in the future.
> > > > >
> > > > > Original issue's description:
> > > > > > Injectable Obj-C video codecs
> > > > > >
> > > > > > Initial CL for this effort, with a working RTCVideoEncoder/Decoder for H264
> > > > > > (wrapping the VideoToolbox codec).
> > > > > >
> > > > > > Some notes / things left to do:
> > > > > > - There are some hard-coded references to codec types that are supported by
> > > > > > webrtc::VideoCodec, cricket::VideoCodec, webrtc::CodecSpecificInfo etc
> > > > > > since we need to convert to/from these types in ObjCVideoEncoder/Decoder.
> > > > > > These types would need to be more codec agnostic to avoid this.
> > > > > > - Most interfaces are borrowed from the design document for injectable
> > > > > > codecs in Android. Some data in the corresponding C++ classes is discarded
> > > > > > when converting to the Obj-C version, since it has fewer fields. I have not
> > > > > > verified whether all data that we do keep is needed, or whether we might be
> > > > > > losing anything useful in these conversions.
> > > > > > - Implement the VideoToolbox codec code directly in the RTCVideoEncoderH264
> > > > > > classes, instead of wrapping webrtc::H264VideoToolboxEncoder / decoder.
> > > > > > Eliminates converting between ObjC/C++ types outside the ObjCVideoEncoder/
> > > > > > Decoder wrapper classes.
> > > > > > - List the injected codec factory's supported codecs in the list of codecs in
> > > > > > AppRTCMobile.
> > > > > >
> > > > > > BUG=webrtc:7924
> > > > > > R=magjed@webrtc.org
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2966023002 .
> > > > > > Cr-Commit-Position: refs/heads/master@{#18928}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a0349c138db62c52435be84b6c837f5f4758e264
> > > > >
> > > > > TBR=magjed@webrtc.org,andersc@webrtc.org
> > > > > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > > > > BUG=webrtc:7924
> > > > > NOTRY=true
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2975963002
> > > > > Cr-Commit-Position: refs/heads/master@{#18979}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/1095ada7ad56fe29b7b2bbc560a8f6475a7978ce
> > > >
> > > > R=magjed@webrtc.org
> > > > TBR=tkchin@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:7924
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2981583002 .
> > > > Cr-Commit-Position: refs/heads/master@{#19002}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a5f1de1e6541de03f944bcbf49be87c01f57a18b
> > >
> > > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,andersc@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:7924
> > >
> > > Review-Url: https://codereview.webrtc.org/2979973002
> > > Cr-Commit-Position: refs/heads/master@{#19004}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/81d40ee1491d5229c2677cc04b1f40d67c2babef
> >
> > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,sprang@webrtc.org
> > BUG=webrtc:7924
> >
> > Review-Url: https://codereview.webrtc.org/2979983002
> > Cr-Commit-Position: refs/heads/master@{#19005}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/732a3437da4db7b452758b8e1cf26fce0ce3bf65
>
> TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7924
>
> Review-Url: https://codereview.webrtc.org/2980173002
> Cr-Commit-Position: refs/heads/master@{#19036}
> Committed: https://chromium.googlesource.com/external/webrtc/+/860f7298166084d966749e22b69aa2fdcf4d4ed6
TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org,jtteh@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7924
Review-Url: https://codereview.webrtc.org/2977213002
Cr-Commit-Position: refs/heads/master@{#19135}
2017-07-25 07:55:58 -07:00
|
|
|
"../modules:module_api",
|
2018-06-20 16:18:59 -07:00
|
|
|
"../modules/audio_device:audio_device_api",
|
|
|
|
|
"../modules/audio_processing:audio_processing",
|
2018-01-08 11:05:10 +01:00
|
|
|
"../modules/video_coding:video_codec_interface",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base_tests_utils",
|
2018-07-25 16:05:48 +02:00
|
|
|
"../rtc_base/system:unused",
|
2018-07-23 10:04:12 +02:00
|
|
|
"../system_wrappers:system_wrappers_default",
|
2017-10-05 14:06:52 +02:00
|
|
|
"//test:test_support",
|
2017-05-31 05:14:26 -07:00
|
|
|
"//third_party/ocmock",
|
|
|
|
|
]
|
|
|
|
|
|
2017-06-05 05:48:47 -07:00
|
|
|
if (is_ios) {
|
|
|
|
|
sources += [ "objc/Framework/UnitTests/RTCAudioSessionTest.mm" ]
|
2018-02-16 10:49:22 +01:00
|
|
|
deps += [ ":audio_objc" ]
|
2017-05-31 05:14:26 -07:00
|
|
|
}
|
2016-09-15 04:30:18 -07:00
|
|
|
}
|
|
|
|
|
}
|
2016-10-11 13:27:26 -07:00
|
|
|
|
2017-05-31 05:14:26 -07:00
|
|
|
if (is_ios) {
|
2018-01-15 13:31:03 +01:00
|
|
|
ios_framework_bundle_with_umbrella_header("framework_objc") {
|
2017-05-31 05:14:26 -07:00
|
|
|
info_plist = "objc/Framework/Info.plist"
|
|
|
|
|
output_name = "WebRTC"
|
2017-08-29 09:49:43 +00:00
|
|
|
|
2017-05-31 05:14:26 -07:00
|
|
|
common_objc_headers = [
|
2017-06-05 05:48:47 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCAudioSession.h",
|
2017-08-29 09:49:43 +00:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoCodec.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoCodecFactory.h",
|
2017-06-05 05:48:47 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCAudioSessionConfiguration.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCAudioSource.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCAudioTrack.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCCameraVideoCapturer.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCCameraPreviewView.h",
|
2018-08-16 09:29:19 +02:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCCertificate.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCConfiguration.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCDataChannel.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCDispatcher.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCFieldTrials.h",
|
2017-11-15 13:15:24 +01:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCFileVideoCapturer.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCIceCandidate.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCIceServer.h",
|
2017-07-14 16:06:41 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCIntervalRange.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCLogging.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMacros.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMediaConstraints.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMediaSource.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMediaStream.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMediaStreamTrack.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMetrics.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCMetricsSampleInfo.h",
|
2018-07-31 15:39:25 +02:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCMTLVideoView.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCPeerConnection.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCPeerConnectionFactory.h",
|
2018-01-02 13:33:16 +03:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCPeerConnectionFactoryOptions.h",
|
2018-05-30 16:58:30 +02:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtcpParameters.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpCodecParameters.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpEncodingParameters.h",
|
2018-06-12 18:33:49 +02:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpHeaderExtension.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpParameters.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpReceiver.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpSender.h",
|
2018-02-27 15:34:53 -08:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCRtpTransceiver.h",
|
2018-01-02 14:44:35 +03:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCDtmfSender.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCSSLAdapter.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCSessionDescription.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCTracing.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoCapturer.h",
|
2017-10-05 16:55:38 +02:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoCodecH264.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoFrame.h",
|
2017-06-22 15:26:30 +02:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoFrameBuffer.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoRenderer.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoSource.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoTrack.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoViewShading.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/UIDevice+RTCDevice.h",
|
2018-04-13 15:36:43 +02:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoDecoderVP8.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoDecoderVP9.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoEncoderVP8.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCVideoEncoderVP9.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
]
|
2018-04-13 15:36:43 +02:00
|
|
|
|
2017-05-31 05:14:26 -07:00
|
|
|
if (!build_with_chromium) {
|
2018-02-16 10:49:22 +01:00
|
|
|
common_objc_headers += [
|
2018-01-30 15:46:13 +01:00
|
|
|
"objc/Framework/Headers/WebRTC/RTCCallbackLogger.h",
|
|
|
|
|
"objc/Framework/Headers/WebRTC/RTCFileLogger.h",
|
|
|
|
|
]
|
2017-05-31 05:14:26 -07:00
|
|
|
}
|
2017-05-30 01:50:35 -07:00
|
|
|
|
2018-02-16 10:49:22 +01:00
|
|
|
sources = common_objc_headers
|
|
|
|
|
public_headers = common_objc_headers
|
|
|
|
|
|
2017-05-31 05:14:26 -07:00
|
|
|
ldflags = [
|
|
|
|
|
"-all_load",
|
|
|
|
|
"-install_name",
|
|
|
|
|
"@rpath/$output_name.framework/$output_name",
|
|
|
|
|
]
|
2017-05-08 05:32:05 -07:00
|
|
|
|
2017-05-31 05:14:26 -07:00
|
|
|
deps = [
|
2017-08-24 05:43:45 -07:00
|
|
|
":audio_objc",
|
2018-02-16 10:49:22 +01:00
|
|
|
":common_objc",
|
|
|
|
|
":default_codec_factory_objc",
|
|
|
|
|
":native_api",
|
|
|
|
|
":native_video",
|
|
|
|
|
":peerconnectionfactory_base_objc",
|
2017-08-24 05:43:45 -07:00
|
|
|
":ui_objc",
|
2018-02-16 10:49:22 +01:00
|
|
|
":videocapture_objc",
|
|
|
|
|
":videocodec_objc",
|
|
|
|
|
":videotoolbox_objc",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base_approved",
|
2017-05-31 05:14:26 -07:00
|
|
|
"../system_wrappers:field_trial_default",
|
|
|
|
|
"../system_wrappers:metrics_default",
|
2018-01-17 19:57:24 +00:00
|
|
|
"../system_wrappers:runtime_enabled_features_default",
|
2017-05-31 05:14:26 -07:00
|
|
|
]
|
2018-02-16 10:49:22 +01:00
|
|
|
if (rtc_use_metal_rendering) {
|
|
|
|
|
deps += [ ":metal_objc" ]
|
|
|
|
|
}
|
2017-05-31 05:14:26 -07:00
|
|
|
|
|
|
|
|
libs = [
|
|
|
|
|
"AVFoundation.framework",
|
|
|
|
|
"CoreGraphics.framework",
|
|
|
|
|
"CoreMedia.framework",
|
|
|
|
|
"GLKit.framework",
|
|
|
|
|
]
|
|
|
|
|
|
2018-06-04 10:24:37 +02:00
|
|
|
configs += [
|
|
|
|
|
"..:common_objc",
|
|
|
|
|
":used_from_extension",
|
|
|
|
|
]
|
2017-05-08 05:32:05 -07:00
|
|
|
|
2017-08-24 05:43:45 -07:00
|
|
|
public_configs = [ ":common_config_objc" ]
|
2017-05-31 05:14:26 -07:00
|
|
|
}
|
Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2911053002/ )
Reason for revert:
Take three of relanding this after all internal issues have been resolved.
Original issue's description:
> Revert of Split iOS sdk in to separate targets (patchset #3 id:320001 of https://codereview.webrtc.org/2893843003/ )
>
> Reason for revert:
> Breaks downstream project.
>
> Original issue's description:
> > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2893593002/ )
> >
> > Reason for revert:
> > Take two of fixing downstream issues?
> >
> > Original issue's description:
> > > Revert of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890733003/ )
> > >
> > > Reason for revert:
> > > Still problems with downstream projects
> > >
> > > Original issue's description:
> > > > Reland of Split iOS sdk in to separate targets (patchset #1 id:1 of https://codereview.webrtc.org/2890513002/ )
> > > >
> > > > Reason for revert:
> > > > Fixing downstream breakages
> > > >
> > > > Original issue's description:
> > > > > Revert of Split iOS sdk in to separate targets (patchset #13 id:280001 of https://codereview.webrtc.org/2862543002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Breaking downstream projects.
> > > > >
> > > > > Original issue's description:
> > > > > > Split iOS sdk in to separate targets
> > > > > >
> > > > > > This CL splits the iOS sdk into separate static libraries for video,
> > > > > > audio, ui, common, and peerconnection-related code. This will in the
> > > > > > future make it easier to compile WebRTC without unneeded components.
> > > > > >
> > > > > > BUG=webrtc:4867
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2862543002
> > > > > > Cr-Commit-Position: refs/heads/master@{#18166}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/52c83fe7102f566cf35a7533092873d58b38f426
> > > > >
> > > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,kthelgason@webrtc.org
> > > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > > NOPRESUBMIT=true
> > > > > NOTREECHECKS=true
> > > > > NOTRY=true
> > > > > BUG=webrtc:4867
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2890513002
> > > > > Cr-Commit-Position: refs/heads/master@{#18170}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/9756238084707787f735e1294e896e462e459717
> > > >
> > > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:4867
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2890733003
> > > > Cr-Commit-Position: refs/heads/master@{#18174}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/d51e042492bedd057bc0cac7828979d5c7369cea
> > >
> > > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:4867
> > >
> > > Review-Url: https://codereview.webrtc.org/2893593002
> > > Cr-Commit-Position: refs/heads/master@{#18182}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/37144b214e2baf62ecb262ab878dde8c59cdd6a3
> >
> > TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org
> > # Skipping CQ checks because original CL landed less than 1 days ago.
> > NOPRESUBMIT=true
> > NOTREECHECKS=true
> > NOTRY=true
> > BUG=webrtc:4867
> >
> > Review-Url: https://codereview.webrtc.org/2893843003
> > Cr-Commit-Position: refs/heads/master@{#18303}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/580c3522d294c877adfe555048c675bd8d166657
>
> TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,kthelgason@webrtc.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=webrtc:4867
>
> Review-Url: https://codereview.webrtc.org/2911053002
> Cr-Commit-Position: refs/heads/master@{#18309}
> Committed: https://chromium.googlesource.com/external/webrtc/+/af5c05540cc8208f682cafe88c5c16a505479196
TBR=magjed@webrtc.org,denicija@webrtc.org,tkchin@webrtc.org,henrika@webrtc.org,charujain@webrtc.org,mbonadei@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4867
Review-Url: https://codereview.webrtc.org/2913753003
Cr-Commit-Position: refs/heads/master@{#18319}
2017-05-30 01:48:47 -07:00
|
|
|
}
|
|
|
|
|
|
2018-03-07 10:32:03 +01:00
|
|
|
rtc_static_library("wrapped_native_codec_objc") {
|
|
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoDecoder.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoDecoder.mm",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoEncoder.h",
|
|
|
|
|
"objc/Framework/Classes/PeerConnection/RTCWrappedNativeVideoEncoder.mm",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
configs += [ "..:common_objc" ]
|
|
|
|
|
public_configs = [ ":common_config_objc" ]
|
|
|
|
|
|
|
|
|
|
deps = [
|
|
|
|
|
":common_objc",
|
|
|
|
|
":videocodec_objc",
|
|
|
|
|
"../api/video_codecs:video_codecs_api",
|
|
|
|
|
"../media:rtc_media_base",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2018-02-01 15:47:05 +01:00
|
|
|
# The native API is currently experimental and may change without notice.
|
|
|
|
|
rtc_static_library("native_api") {
|
|
|
|
|
visibility = [ "*" ]
|
2018-04-24 16:39:05 +02:00
|
|
|
allow_poison = [
|
|
|
|
|
"audio_codecs", # TODO(bugs.webrtc.org/8396): Remove.
|
|
|
|
|
"software_video_codecs", # TODO(bugs.webrtc.org/7925): Remove.
|
|
|
|
|
]
|
2018-02-01 15:47:05 +01:00
|
|
|
sources = [
|
2018-03-15 09:41:03 +01:00
|
|
|
"objc/Framework/Native/api/video_capturer.h",
|
|
|
|
|
"objc/Framework/Native/api/video_capturer.mm",
|
2018-02-01 15:47:05 +01:00
|
|
|
"objc/Framework/Native/api/video_decoder_factory.h",
|
|
|
|
|
"objc/Framework/Native/api/video_decoder_factory.mm",
|
|
|
|
|
"objc/Framework/Native/api/video_encoder_factory.h",
|
|
|
|
|
"objc/Framework/Native/api/video_encoder_factory.mm",
|
2018-03-07 10:32:03 +01:00
|
|
|
"objc/Framework/Native/api/video_frame.h",
|
|
|
|
|
"objc/Framework/Native/api/video_frame.mm",
|
|
|
|
|
"objc/Framework/Native/api/video_frame_buffer.h",
|
|
|
|
|
"objc/Framework/Native/api/video_frame_buffer.mm",
|
|
|
|
|
"objc/Framework/Native/api/video_renderer.h",
|
|
|
|
|
"objc/Framework/Native/api/video_renderer.mm",
|
2018-02-01 15:47:05 +01:00
|
|
|
]
|
|
|
|
|
|
|
|
|
|
configs += [ "..:common_objc" ]
|
|
|
|
|
|
|
|
|
|
public_configs = [ ":common_config_objc" ]
|
|
|
|
|
|
|
|
|
|
deps = [
|
|
|
|
|
":native_video",
|
2018-03-15 09:41:03 +01:00
|
|
|
":videocapturebase_objc",
|
2018-02-16 10:49:22 +01:00
|
|
|
":videocodec_objc",
|
|
|
|
|
":videoframebuffer_objc",
|
2018-03-07 10:32:03 +01:00
|
|
|
":videorenderer_objc",
|
2018-03-15 09:41:03 +01:00
|
|
|
"../api:libjingle_peerconnection_api",
|
2018-05-11 11:15:30 +02:00
|
|
|
"../api/video:video_frame",
|
2018-02-01 15:47:05 +01:00
|
|
|
"../api/video_codecs:video_codecs_api",
|
|
|
|
|
"../common_video",
|
|
|
|
|
"../rtc_base:rtc_base",
|
2018-07-11 09:18:37 +02:00
|
|
|
"//third_party/abseil-cpp/absl/memory",
|
2018-02-01 15:47:05 +01:00
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc_static_library("native_video") {
|
|
|
|
|
sources = [
|
2018-03-07 10:32:03 +01:00
|
|
|
"objc/Framework/Native/src/objc_frame_buffer.h",
|
|
|
|
|
"objc/Framework/Native/src/objc_frame_buffer.mm",
|
2018-02-01 15:47:05 +01:00
|
|
|
"objc/Framework/Native/src/objc_video_decoder_factory.h",
|
|
|
|
|
"objc/Framework/Native/src/objc_video_decoder_factory.mm",
|
|
|
|
|
"objc/Framework/Native/src/objc_video_encoder_factory.h",
|
|
|
|
|
"objc/Framework/Native/src/objc_video_encoder_factory.mm",
|
2018-03-07 10:32:03 +01:00
|
|
|
"objc/Framework/Native/src/objc_video_frame.h",
|
|
|
|
|
"objc/Framework/Native/src/objc_video_frame.mm",
|
|
|
|
|
"objc/Framework/Native/src/objc_video_renderer.h",
|
|
|
|
|
"objc/Framework/Native/src/objc_video_renderer.mm",
|
|
|
|
|
"objc/Framework/Native/src/objc_video_track_source.h",
|
|
|
|
|
"objc/Framework/Native/src/objc_video_track_source.mm",
|
2018-02-01 15:47:05 +01:00
|
|
|
]
|
|
|
|
|
|
|
|
|
|
configs += [ "..:common_objc" ]
|
|
|
|
|
|
|
|
|
|
public_configs = [ ":common_config_objc" ]
|
|
|
|
|
|
|
|
|
|
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 = [
|
|
|
|
|
":common_objc",
|
2018-03-15 09:41:03 +01:00
|
|
|
":videocapturebase_objc",
|
2018-02-16 10:49:22 +01:00
|
|
|
":videocodec_objc",
|
|
|
|
|
":videoframebuffer_objc",
|
2018-03-07 10:32:03 +01:00
|
|
|
":videorenderer_objc",
|
|
|
|
|
":wrapped_native_codec_objc",
|
2018-05-11 11:15:30 +02:00
|
|
|
"../api/video:video_frame",
|
|
|
|
|
"../api/video:video_frame_i420",
|
2018-02-01 15:47:05 +01:00
|
|
|
"../api/video_codecs:video_codecs_api",
|
|
|
|
|
"../common_video",
|
|
|
|
|
"../media:rtc_audio_video",
|
|
|
|
|
"../media:rtc_media_base",
|
|
|
|
|
"../modules:module_api",
|
|
|
|
|
"../modules/video_coding:video_codec_interface",
|
|
|
|
|
"../rtc_base:checks",
|
|
|
|
|
"../rtc_base:rtc_base",
|
2018-07-11 09:18:37 +02:00
|
|
|
"//third_party/abseil-cpp/absl/memory",
|
2018-02-01 15:47:05 +01:00
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
2017-08-24 12:26:05 -07:00
|
|
|
rtc_static_library("video_toolbox_cc") {
|
2017-09-04 05:51:34 -07:00
|
|
|
visibility = [ ":videotoolbox_objc" ]
|
2017-05-31 05:14:26 -07:00
|
|
|
sources = [
|
2017-08-07 06:55:28 -07:00
|
|
|
"objc/Framework/Classes/VideoToolbox/helpers.cc",
|
|
|
|
|
"objc/Framework/Classes/VideoToolbox/helpers.h",
|
2017-05-31 05:14:26 -07:00
|
|
|
"objc/Framework/Classes/VideoToolbox/nalu_rewriter.cc",
|
|
|
|
|
"objc/Framework/Classes/VideoToolbox/nalu_rewriter.h",
|
2017-08-24 12:26:05 -07:00
|
|
|
]
|
|
|
|
|
deps = [
|
|
|
|
|
"../common_video",
|
|
|
|
|
"../modules:module_api",
|
|
|
|
|
"../modules/video_coding:webrtc_h264",
|
2017-12-13 16:05:42 +01:00
|
|
|
"../rtc_base:checks",
|
2017-08-24 12:26:05 -07:00
|
|
|
"../rtc_base:rtc_base_approved",
|
|
|
|
|
]
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
rtc_static_library("videotoolbox_objc") {
|
2018-02-16 10:49:22 +01:00
|
|
|
visibility = [ "*" ]
|
2018-04-24 16:39:05 +02:00
|
|
|
allow_poison = [
|
|
|
|
|
"audio_codecs", # TODO(bugs.webrtc.org/8396): Remove.
|
|
|
|
|
"software_video_codecs", # TODO(bugs.webrtc.org/7925): Remove.
|
|
|
|
|
]
|
2017-08-24 12:26:05 -07:00
|
|
|
sources = [
|
|
|
|
|
"objc/Framework/Classes/VideoToolbox/RTCVideoDecoderH264.mm",
|
|
|
|
|
"objc/Framework/Classes/VideoToolbox/RTCVideoEncoderH264.mm",
|
2016-11-09 10:43:26 +01:00
|
|
|
]
|
2017-05-31 05:14:26 -07:00
|
|
|
|
2018-06-04 10:24:37 +02:00
|
|
|
configs += [
|
|
|
|
|
"..:common_objc",
|
|
|
|
|
":used_from_extension",
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
if (is_ios && rtc_apprtcmobile_broadcast_extension) {
|
|
|
|
|
defines = [ "RTC_APPRTCMOBILE_BROADCAST_EXTENSION" ]
|
|
|
|
|
}
|
2017-05-31 05:14:26 -07:00
|
|
|
|
|
|
|
|
deps = [
|
2017-08-24 05:43:45 -07:00
|
|
|
":common_objc",
|
2018-02-01 15:47:05 +01:00
|
|
|
":native_api",
|
2017-08-24 05:43:45 -07:00
|
|
|
":video_objc",
|
2017-08-24 12:26:05 -07:00
|
|
|
":video_toolbox_cc",
|
2018-02-16 10:49:22 +01:00
|
|
|
":videocodec_objc",
|
|
|
|
|
":videoframebuffer_objc",
|
2018-03-07 10:32:03 +01:00
|
|
|
":videosource_objc",
|
2018-05-11 11:15:30 +02:00
|
|
|
"../api/video:video_frame",
|
Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2980173002/ )
Reason for revert:
Relanding after fixing issues with no video.
Original issue's description:
> Revert of Injectable Obj-C video codecs (patchset #2 id:370001 of https://codereview.webrtc.org/2979983002/ )
>
> Reason for revert:
> Still having problems with no video. Reverting.
> Once no video is visible, no video is available from then on even if the callee app is in the foreground.
>
>
> Original issue's description:
> > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2979973002/ )
> >
> > Reason for revert:
> > Fix the broken build file
> >
> > Original issue's description:
> > > Revert of Injectable Obj-C video codecs (patchset #3 id:400001 of https://codereview.webrtc.org/2981583002/ )
> > >
> > > Reason for revert:
> > > Breaks bots. Build file incorrect.
> > >
> > > Original issue's description:
> > > > Reland of Injectable Obj-C video codecs (patchset #1 id:1 of https://codereview.webrtc.org/2975963002/ )
> > > >
> > > > Reason for revert:
> > > > New CL for fixing the issues
> > > >
> > > > Original issue's description:
> > > > > Revert of Injectable Obj-C video codecs (patchset #8 id:140001 of https://codereview.webrtc.org/2966023002/ )
> > > > >
> > > > > Reason for revert:
> > > > > Causes no video in certain scenarios. Please come up with a test plan or unit test to prevent such problems in the future.
> > > > >
> > > > > Original issue's description:
> > > > > > Injectable Obj-C video codecs
> > > > > >
> > > > > > Initial CL for this effort, with a working RTCVideoEncoder/Decoder for H264
> > > > > > (wrapping the VideoToolbox codec).
> > > > > >
> > > > > > Some notes / things left to do:
> > > > > > - There are some hard-coded references to codec types that are supported by
> > > > > > webrtc::VideoCodec, cricket::VideoCodec, webrtc::CodecSpecificInfo etc
> > > > > > since we need to convert to/from these types in ObjCVideoEncoder/Decoder.
> > > > > > These types would need to be more codec agnostic to avoid this.
> > > > > > - Most interfaces are borrowed from the design document for injectable
> > > > > > codecs in Android. Some data in the corresponding C++ classes is discarded
> > > > > > when converting to the Obj-C version, since it has fewer fields. I have not
> > > > > > verified whether all data that we do keep is needed, or whether we might be
> > > > > > losing anything useful in these conversions.
> > > > > > - Implement the VideoToolbox codec code directly in the RTCVideoEncoderH264
> > > > > > classes, instead of wrapping webrtc::H264VideoToolboxEncoder / decoder.
> > > > > > Eliminates converting between ObjC/C++ types outside the ObjCVideoEncoder/
> > > > > > Decoder wrapper classes.
> > > > > > - List the injected codec factory's supported codecs in the list of codecs in
> > > > > > AppRTCMobile.
> > > > > >
> > > > > > BUG=webrtc:7924
> > > > > > R=magjed@webrtc.org
> > > > > >
> > > > > > Review-Url: https://codereview.webrtc.org/2966023002 .
> > > > > > Cr-Commit-Position: refs/heads/master@{#18928}
> > > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a0349c138db62c52435be84b6c837f5f4758e264
> > > > >
> > > > > TBR=magjed@webrtc.org,andersc@webrtc.org
> > > > > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > > > > BUG=webrtc:7924
> > > > > NOTRY=true
> > > > >
> > > > > Review-Url: https://codereview.webrtc.org/2975963002
> > > > > Cr-Commit-Position: refs/heads/master@{#18979}
> > > > > Committed: https://chromium.googlesource.com/external/webrtc/+/1095ada7ad56fe29b7b2bbc560a8f6475a7978ce
> > > >
> > > > R=magjed@webrtc.org
> > > > TBR=tkchin@webrtc.org
> > > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > > NOPRESUBMIT=true
> > > > NOTREECHECKS=true
> > > > NOTRY=true
> > > > BUG=webrtc:7924
> > > >
> > > > Review-Url: https://codereview.webrtc.org/2981583002 .
> > > > Cr-Commit-Position: refs/heads/master@{#19002}
> > > > Committed: https://chromium.googlesource.com/external/webrtc/+/a5f1de1e6541de03f944bcbf49be87c01f57a18b
> > >
> > > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,andersc@webrtc.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=webrtc:7924
> > >
> > > Review-Url: https://codereview.webrtc.org/2979973002
> > > Cr-Commit-Position: refs/heads/master@{#19004}
> > > Committed: https://chromium.googlesource.com/external/webrtc/+/81d40ee1491d5229c2677cc04b1f40d67c2babef
> >
> > TBR=magjed@webrtc.org,tkchin@webrtc.org,jtteh@webrtc.org,sprang@webrtc.org
> > BUG=webrtc:7924
> >
> > Review-Url: https://codereview.webrtc.org/2979983002
> > Cr-Commit-Position: refs/heads/master@{#19005}
> > Committed: https://chromium.googlesource.com/external/webrtc/+/732a3437da4db7b452758b8e1cf26fce0ce3bf65
>
> TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org
> # Not skipping CQ checks because original CL landed more than 1 days ago.
> BUG=webrtc:7924
>
> Review-Url: https://codereview.webrtc.org/2980173002
> Cr-Commit-Position: refs/heads/master@{#19036}
> Committed: https://chromium.googlesource.com/external/webrtc/+/860f7298166084d966749e22b69aa2fdcf4d4ed6
TBR=magjed@webrtc.org,tkchin@webrtc.org,sprang@webrtc.org,haysc@webrtc.org,andersc@webrtc.org,jtteh@webrtc.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=webrtc:7924
Review-Url: https://codereview.webrtc.org/2977213002
Cr-Commit-Position: refs/heads/master@{#19135}
2017-07-25 07:55:58 -07:00
|
|
|
"../api/video_codecs:video_codecs_api",
|
2017-05-31 05:14:26 -07:00
|
|
|
"../common_video",
|
2018-01-11 17:07:30 +01:00
|
|
|
"../media:rtc_audio_video",
|
2017-05-31 05:14:26 -07:00
|
|
|
"../media:rtc_media",
|
|
|
|
|
"../media:rtc_media_base",
|
|
|
|
|
"../modules:module_api",
|
2018-01-08 11:05:10 +01:00
|
|
|
"../modules/video_coding:video_codec_interface",
|
2017-05-31 05:14:26 -07:00
|
|
|
"../modules/video_coding:video_coding_utility",
|
2017-12-13 16:05:42 +01:00
|
|
|
"../rtc_base:checks",
|
2017-07-19 10:40:47 -07:00
|
|
|
"../rtc_base:rtc_base_approved",
|
2017-12-14 11:24:00 +01:00
|
|
|
"//third_party/libyuv",
|
2017-05-31 05:14:26 -07:00
|
|
|
]
|
|
|
|
|
|
|
|
|
|
libs = [
|
|
|
|
|
"CoreFoundation.framework",
|
|
|
|
|
"CoreMedia.framework",
|
|
|
|
|
"CoreVideo.framework",
|
|
|
|
|
"VideoToolbox.framework",
|
|
|
|
|
]
|
2016-11-09 10:43:26 +01:00
|
|
|
}
|
2016-10-11 13:27:26 -07:00
|
|
|
}
|
2016-04-27 01:54:20 -07:00
|
|
|
}
|