| OLD | NEW | 
|---|
| 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. | 
| 2 # | 2 # | 
| 3 # Use of this source code is governed by a BSD-style license | 3 # Use of this source code is governed by a BSD-style license | 
| 4 # that can be found in the LICENSE file in the root of the source | 4 # that can be found in the LICENSE file in the root of the source | 
| 5 # tree. An additional intellectual property rights grant can be found | 5 # tree. An additional intellectual property rights grant can be found | 
| 6 # in the file PATENTS.  All contributing project authors may | 6 # in the file PATENTS.  All contributing project authors may | 
| 7 # be found in the AUTHORS file in the root of the source tree. | 7 # be found in the AUTHORS file in the root of the source tree. | 
| 8 | 8 | 
| 9 import("../../webrtc.gni") | 9 import("../../webrtc.gni") | 
| 10 | 10 | 
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 136   deps = [ | 136   deps = [ | 
| 137     "../..:webrtc_common", | 137     "../..:webrtc_common", | 
| 138     "../../base:rtc_base_approved", | 138     "../../base:rtc_base_approved", | 
| 139     "../../base:rtc_numerics", | 139     "../../base:rtc_numerics", | 
| 140     "../../common_video", | 140     "../../common_video", | 
| 141     "../../system_wrappers", | 141     "../../system_wrappers", | 
| 142   ] | 142   ] | 
| 143 } | 143 } | 
| 144 | 144 | 
| 145 rtc_static_library("webrtc_h264") { | 145 rtc_static_library("webrtc_h264") { | 
| 146   # TODO(ehmaldonado): Remove (bugs.webrtc.org/6828) |  | 
| 147   # Errors on cyclic dependency if enabled: |  | 
| 148   #   //webrtc/call:call -> |  | 
| 149   #   //webrtc/video:video -> |  | 
| 150   #   //webrtc/modules/video_coding:video_coding -> |  | 
| 151   #   //webrtc/modules/video_coding:webrtc_h264 -> |  | 
| 152   #   //webrtc/media:rtc_media -> |  | 
| 153   #   //webrtc/call:call |  | 
| 154   check_includes = false |  | 
| 155 |  | 
| 156   sources = [ | 146   sources = [ | 
| 157     "codecs/h264/h264.cc", | 147     "codecs/h264/h264.cc", | 
| 158     "codecs/h264/include/h264.h", | 148     "codecs/h264/include/h264.h", | 
| 159   ] | 149   ] | 
| 160 | 150 | 
| 161   if (!build_with_chromium && is_clang) { | 151   if (!build_with_chromium && is_clang) { | 
| 162     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 152     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
| 163     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 153     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 164   } | 154   } | 
| 165 | 155 | 
| 166   defines = [] | 156   defines = [] | 
| 167   deps = [ | 157   deps = [ | 
| 168     ":video_coding_utility", | 158     ":video_coding_utility", | 
| 169     "../../base:rtc_base_approved", | 159     "../../base:rtc_base_approved", | 
|  | 160     "../../media:rtc_media_base", | 
| 170     "../../system_wrappers", | 161     "../../system_wrappers", | 
| 171   ] | 162   ] | 
| 172 | 163 | 
| 173   if (rtc_use_h264) { | 164   if (rtc_use_h264) { | 
| 174     defines += [ "WEBRTC_USE_H264" ] | 165     defines += [ "WEBRTC_USE_H264" ] | 
| 175     if (rtc_initialize_ffmpeg) { | 166     if (rtc_initialize_ffmpeg) { | 
| 176       defines += [ "WEBRTC_INITIALIZE_FFMPEG" ] | 167       defines += [ "WEBRTC_INITIALIZE_FFMPEG" ] | 
| 177     } | 168     } | 
| 178     sources += [ | 169     sources += [ | 
| 179       "codecs/h264/h264_decoder_impl.cc", | 170       "codecs/h264/h264_decoder_impl.cc", | 
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 561     } | 552     } | 
| 562 | 553 | 
| 563     # TODO(jschuh): bugs.webrtc.org/1348: fix this warning. | 554     # TODO(jschuh): bugs.webrtc.org/1348: fix this warning. | 
| 564     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 555     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 
| 565     if (!build_with_chromium && is_clang) { | 556     if (!build_with_chromium && is_clang) { | 
| 566       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 557       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
| 567       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 558       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 568     } | 559     } | 
| 569   } | 560   } | 
| 570 } | 561 } | 
| OLD | NEW | 
|---|