Reland of Add a webrtc{en,de}coderfactory implementation for VideoToolbox

webrtc/modules/video_coding/codecs/h264/h264.gypi

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..2a103843ef18610e2c295bf0a7c1364799c2e298 100644
--- a/webrtc/modules/video_coding/codecs/h264/h264.gypi
+++ b/webrtc/modules/video_coding/codecs/h264/h264.gypi
@@ -15,14 +15,6 @@
       'target_name': 'webrtc_h264',
       'type': 'static_library',
       'conditions': [
-        ['OS=="ios"', {
-          'dependencies': [
-            'webrtc_h264_video_toolbox',
-          ],
-          'sources': [
-            'h264_objc.mm',
-          ],
-        }],
         # TODO(hbos): Consider renaming this flag and the below macro to
         # something which helps distinguish OpenH264/FFmpeg from other H264
         # implementations.
@@ -56,41 +48,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
 }