cbe7435288
Reason for revert:
Fix gyp build
Original issue's description:
> Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (patchset #2 id:20001 of https://codereview.webrtc.org/2463313002/ )
>
> Reason for revert:
> Broke dependent project because the .gn changes weren't accompanied by corresponding .gyp changes.
>
> Original issue's description:
> > Add a webrtc{en,de}coderfactory implementation for VideoToolbox
> >
> > This CL removes the coupling of the VideoToolbox h264 implementation
> > to the generic h264 code. The files have been moved into sdb/obj/Framework
> > and all dependency on them has been removed from the rest of WebRTC.
> > We now add it as an external encoder via a factory supplied to the
> > CreatePeerConnectionFactory call. This also brings the iOS implementation
> > closer to what we do on Android for MediaCodec.
> >
> > BUG=webrtc:6619
> >
> > Committed: https://crrev.com/6a5047dad31f14f53dd9f8bc1ecde19e1dede2e4
> > Cr-Commit-Position: refs/heads/master@{#14953}
>
> TBR=magjed@webrtc.org,stefan@webrtc.org,kthelgason@webrtc.org
> BUG=webrtc:6619
>
> Committed: https://crrev.com/d69ad84420d9c0e1c11450c352f6c92e7c9583f1
> Cr-Commit-Position: refs/heads/master@{#14985}
R=magjed@webrtc.org
TBR=kwiberg@webrtc.org, magjed@webrtc.org, stefan@webrtc.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:6619
Review URL: https://codereview.webrtc.org/2487723004 .
Cr-Commit-Position: refs/heads/master@{#14992}
52 lines
1.5 KiB
Python
52 lines
1.5 KiB
Python
# Copyright (c) 2015 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.
|
|
|
|
{
|
|
'includes': [
|
|
'../../../../build/common.gypi',
|
|
],
|
|
'targets': [
|
|
{
|
|
'target_name': 'webrtc_h264',
|
|
'type': 'static_library',
|
|
'conditions': [
|
|
# TODO(hbos): Consider renaming this flag and the below macro to
|
|
# something which helps distinguish OpenH264/FFmpeg from other H264
|
|
# implementations.
|
|
['rtc_use_h264==1', {
|
|
'defines': [
|
|
'WEBRTC_USE_H264',
|
|
],
|
|
'conditions': [
|
|
['rtc_initialize_ffmpeg==1', {
|
|
'defines': [
|
|
'WEBRTC_INITIALIZE_FFMPEG',
|
|
],
|
|
}],
|
|
],
|
|
'dependencies': [
|
|
'<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
|
|
'<(DEPTH)/third_party/openh264/openh264.gyp:openh264_encoder',
|
|
'<(webrtc_root)/common_video/common_video.gyp:common_video',
|
|
],
|
|
'sources': [
|
|
'h264_decoder_impl.cc',
|
|
'h264_decoder_impl.h',
|
|
'h264_encoder_impl.cc',
|
|
'h264_encoder_impl.h',
|
|
],
|
|
}],
|
|
],
|
|
'sources': [
|
|
'h264.cc',
|
|
'include/h264.h',
|
|
],
|
|
}, # webrtc_h264
|
|
],
|
|
}
|