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

Unified Diff: webrtc/modules/video_coding/BUILD.gn

Issue 2463313002: Add a webrtc{en,de}coderfactory implementation for VideoToolbox (Closed)
Patch Set: Code review comments 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/modules/BUILD.gn ('k') | webrtc/modules/video_coding/codecs/h264/h264.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/modules/video_coding/BUILD.gn
diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn
index a21a79bbd9233aef2545954a73e2a524f997a7a4..8f0dfb8be91814e3d012f41cde592703261cdc3a 100644
--- a/webrtc/modules/video_coding/BUILD.gn
+++ b/webrtc/modules/video_coding/BUILD.gn
@@ -139,11 +139,6 @@ rtc_static_library("webrtc_h264") {
"../../system_wrappers",
]
- if (is_ios) {
- sources += [ "codecs/h264/h264_objc.mm" ]
- deps += [ ":webrtc_h264_video_toolbox" ]
- }
-
if (rtc_use_h264) {
defines += [ "WEBRTC_USE_H264" ]
if (rtc_initialize_ffmpeg) {
@@ -163,60 +158,6 @@ rtc_static_library("webrtc_h264") {
}
}
-if (is_ios) {
- 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("webrtc_h264_video_toolbox") {
- sources = [
- "codecs/h264/h264_video_toolbox_decoder.cc",
- "codecs/h264/h264_video_toolbox_decoder.h",
- "codecs/h264/h264_video_toolbox_encoder.h",
- "codecs/h264/h264_video_toolbox_encoder.mm",
- "codecs/h264/h264_video_toolbox_nalu.cc",
- "codecs/h264/h264_video_toolbox_nalu.h",
- ]
-
- configs += [
- ":webrtc_h264_video_toolbox_warnings_config",
- "../..:common_objc",
- "//build/config/compiler:enable_arc",
- ]
-
- deps = [
- "../../sdk: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" ]
- }
- }
-}
-
rtc_static_library("webrtc_i420") {
sources = [
"codecs/i420/i420.cc",
« no previous file with comments | « webrtc/modules/BUILD.gn ('k') | webrtc/modules/video_coding/codecs/h264/h264.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698