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

Unified Diff: webrtc/modules/video_coding/codecs/h264/h264.gypi

Issue 2463313002: 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
Index: webrtc/modules/video_coding/codecs/h264/h264.gypi
diff --git a/webrtc/modules/video_coding/codecs/h264/h264.gypi b/webrtc/modules/video_coding/codecs/h264/h264.gypi
index 5d9282371f6228778e437a8ea155a68f125a0b23..8970482d12bc92a0b402a73613ce50c9fd115673 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264.gypi
+++ b/webrtc/modules/video_coding/codecs/h264/h264.gypi
@@ -16,9 +16,6 @@
'type': 'static_library',
'conditions': [
['OS=="ios"', {
- 'dependencies': [
- 'webrtc_h264_video_toolbox',
- ],
'sources': [
'h264_objc.mm',
magjed_webrtc 2016/11/01 14:00:20 Is it possible to nuke h264_objc.mm and remove thi
kthelgason 2016/11/01 15:14:30 Yup, great, thanks for pointing that out!
],
@@ -56,41 +53,4 @@
],
}, # webrtc_h264
],
- 'conditions': [
- ['OS=="ios"', {
- 'targets': [
- {
- 'target_name': 'webrtc_h264_video_toolbox',
- 'type': 'static_library',
- 'includes': [ '../../../../build/objc_common.gypi' ],
- 'dependencies': [
- '<(webrtc_root)/sdk/sdk.gyp:rtc_sdk_common_objc',
- ],
- 'link_settings': {
- 'xcode_settings': {
- 'OTHER_LDFLAGS': [
- '-framework CoreFoundation',
- '-framework CoreMedia',
- '-framework CoreVideo',
- '-framework VideoToolbox',
- ],
- },
- },
- 'sources': [
- 'h264_video_toolbox_decoder.cc',
- 'h264_video_toolbox_decoder.h',
- 'h264_video_toolbox_encoder.h',
- 'h264_video_toolbox_encoder.mm',
- 'h264_video_toolbox_nalu.cc',
- 'h264_video_toolbox_nalu.h',
- ],
- 'conditions': [
- ['build_libyuv==1', {
- 'dependencies': ['<(DEPTH)/third_party/libyuv/libyuv.gyp:libyuv'],
- }],
- ],
- }, # webrtc_h264_video_toolbox
- ], # targets
- }], # OS=="ios"
- ], # conditions
}

Powered by Google App Engine
This is Rietveld 408576698