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

Unified Diff: webrtc/sdk/sdk.gyp

Issue 2488663003: Revert of Add a webrtc{en,de}coderfactory implementation for VideoToolbox (Closed)
Patch Set: Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/sdk/sdk.gyp
diff --git a/webrtc/sdk/sdk.gyp b/webrtc/sdk/sdk.gyp
index ea4454c4125a67982ca5a347e4bc0f977ab4c85e..908d544abba5a45b7744c430313ebf4858670576 100644
--- a/webrtc/sdk/sdk.gyp
+++ b/webrtc/sdk/sdk.gyp
@@ -84,7 +84,6 @@
'dependencies': [
'<(webrtc_root)/api/api.gyp:libjingle_peerconnection',
'rtc_sdk_common_objc',
- 'webrtc_h264_video_toolbox',
],
'include_dirs': [
'objc/Framework/Classes',
@@ -339,42 +338,5 @@
}, # rtc_sdk_framework_objc
], # targets
}], # OS=="ios" or (OS=="mac" and mac_deployment_target=="10.7")
- ['OS=="ios"', {
- 'targets': [
- {
- 'target_name': 'webrtc_h264_video_toolbox',
- 'type': 'static_library',
- 'includes': [ '../build/objc_common.gypi' ],
- 'dependencies': [
- 'rtc_sdk_common_objc',
- ],
- 'link_settings': {
- 'xcode_settings': {
- 'OTHER_LDFLAGS': [
- '-framework CoreFoundation',
- '-framework CoreMedia',
- '-framework CoreVideo',
- '-framework VideoToolbox',
- ],
- },
- },
- 'sources': [
- 'objc/Framework/Classes/h264_video_toolbox_decoder.cc',
- 'objc/Framework/Classes/h264_video_toolbox_decoder.h',
- 'objc/Framework/Classes/h264_video_toolbox_encoder.h',
- 'objc/Framework/Classes/h264_video_toolbox_encoder.mm',
- 'objc/Framework/Classes/h264_video_toolbox_nalu.cc',
- 'objc/Framework/Classes/h264_video_toolbox_nalu.h',
- 'objc/Framework/Classes/videotoolboxvideocodecfactory.cc',
- 'objc/Framework/Classes/videotoolboxvideocodecfactory.h',
- ],
- 'conditions': [
- ['build_libyuv==1', {
- 'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv'],
- }],
- ],
- }, # webrtc_h264_video_toolbox
- ], # targets
- }], # OS=="ios"
],
}
« no previous file with comments | « webrtc/sdk/objc/Framework/Classes/videotoolboxvideocodecfactory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698