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

webrtc/sdk/BUILD.gn

 # 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.
 
 import("../build/webrtc.gni")
 if (is_mac) {
@@ skipping 12 matching lines @@
   }
 }
 
 if (is_ios || (is_mac && mac_deployment_target == "10.7")) {
   config("rtc_sdk_common_objc_config") {
     include_dirs = [
       "objc/Framework/Classes",
       "objc/Framework/Headers",
     ]
   }
-  config("webrtc_h264_video_toolbox_warnings_config") {
-    if (is_clang) {
-      # TODO(tkchin): Make webrtc_h264_video_toolbox compile with the standard set
-      # of warnings.
-      # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6307
-      cflags = [ "-Wno-thread-safety-analysis" ]
-    }
-  }
 
   rtc_static_library("rtc_sdk_common_objc") {
     deps = [
       "../base:rtc_base",
     ]
     configs += [
       "..:common_objc",
       "//build/config/compiler:enable_arc",
     ]
     public_configs = [ ":rtc_sdk_common_objc_config" ]
@@ skipping 93 matching lines @@
       "objc/Framework/Classes/RTCVideoFrame.mm",
       "objc/Framework/Classes/RTCVideoRendererAdapter+Private.h",
       "objc/Framework/Classes/RTCVideoRendererAdapter.h",
       "objc/Framework/Classes/RTCVideoRendererAdapter.mm",
       "objc/Framework/Classes/RTCVideoSource+Private.h",
       "objc/Framework/Classes/RTCVideoSource.mm",
       "objc/Framework/Classes/RTCVideoTrack+Private.h",
       "objc/Framework/Classes/RTCVideoTrack.mm",
       "objc/Framework/Classes/avfoundationvideocapturer.h",
       "objc/Framework/Classes/avfoundationvideocapturer.mm",
-      "objc/Framework/Classes/videotoolboxvideocodecfactory.cc",
-      "objc/Framework/Classes/videotoolboxvideocodecfactory.h",
       "objc/Framework/Headers/WebRTC/RTCAVFoundationVideoSource.h",
       "objc/Framework/Headers/WebRTC/RTCAudioSource.h",
       "objc/Framework/Headers/WebRTC/RTCAudioTrack.h",
       "objc/Framework/Headers/WebRTC/RTCConfiguration.h",
       "objc/Framework/Headers/WebRTC/RTCDataChannel.h",
       "objc/Framework/Headers/WebRTC/RTCDataChannelConfiguration.h",
       "objc/Framework/Headers/WebRTC/RTCIceCandidate.h",
       "objc/Framework/Headers/WebRTC/RTCIceServer.h",
       "objc/Framework/Headers/WebRTC/RTCLegacyStatsReport.h",
       "objc/Framework/Headers/WebRTC/RTCMediaConstraints.h",
@@ skipping 19 matching lines @@
         "objc/Framework/Classes/RTCEAGLVideoView.m",
         "objc/Framework/Classes/RTCNativeNV12Shader.mm",
         "objc/Framework/Headers/WebRTC/RTCEAGLVideoView.h",
       ]
       libs = [
         "CoreGraphics.framework",
         "GLKit.framework",
         "OpenGLES.framework",
         "QuartzCore.framework",
       ]
-      deps = [
-        ":webrtc_h264_video_toolbox",
-      ]
     }
 
     if (is_mac) {
       sources += [
         "objc/Framework/Classes/RTCNSGLVideoView.m",
         "objc/Framework/Headers/WebRTC/RTCNSGLVideoView.h",
       ]
       libs = [
         "CoreMedia.framework",
         "OpenGL.framework",
       ]
-      deps = []
     }
 
     configs += [
       "..:common_objc",
       "//build/config/compiler:enable_arc",
     ]
 
     public_configs = [ ":rtc_sdk_common_objc_config" ]
 
     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" ]
     }
 
     libs += [ "AVFoundation.framework" ]
 
-    deps += [
+    deps = [
       ":rtc_sdk_common_objc",
       "../api:libjingle_peerconnection",
     ]
 
     if (rtc_build_libyuv) {
       deps += [ "$rtc_libyuv_dir" ]
       public_deps = [
         "$rtc_libyuv_dir",
       ]
     }
@@ skipping 121 matching lines @@
         # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163)
         configs -= [ "//build/config/clang:find_bad_constructs" ]
       }
     }
   }
 
   rtc_static_library("rtc_sdk_objc") {
     complete_static_lib = true
     deps = [
       ":rtc_sdk_peerconnection_objc",
-      "//webrtc/system_wrappers:field_trial_default",
-      "//webrtc/system_wrappers:metrics_default",
+      "../system_wrappers:field_trial_default",
+      "../system_wrappers:metrics_default",
     ]
   }
-
-  rtc_static_library("webrtc_h264_video_toolbox") {
-    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",
-    ]
-
-    configs += [
-      ":webrtc_h264_video_toolbox_warnings_config",
-      "//webrtc:common_objc",
-      "//build/config/compiler:enable_arc",
-    ]
-
-    deps = [
-      ":rtc_sdk_common_objc",
-    ]
-
-    libs = [
-      "CoreFoundation.framework",
-      "CoreMedia.framework",
-      "CoreVideo.framework",
-      "VideoToolbox.framework",
-    ]
-
-    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" ]
-    }
-
-    if (rtc_build_libyuv) {
-      deps += [ "$rtc_libyuv_dir" ]
-      public_deps = [
-        "$rtc_libyuv_dir",
-      ]
-    } else {
-      # Need to add a directory normally exported by libyuv.
-      include_dirs = [ "$rtc_libyuv_dir/include" ]
-    }
-  }
 }