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

Side by Side Diff: webrtc/modules/video_coding/codecs/h264/h264.gypi

Issue 1657273002: Ability to disable the effects of |rtc_use_h264| with DisableRtcUseH264. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Addressed comments (flag rename as TODO) Created 4 years, 10 months 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2015 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2015 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 { 9 {
10 'includes': [ 10 'includes': [
11 '../../../../build/common.gypi', 11 '../../../../build/common.gypi',
12 ], 12 ],
13 'targets': [ 13 'targets': [
14 { 14 {
15 'target_name': 'webrtc_h264', 15 'target_name': 'webrtc_h264',
16 'type': 'static_library', 16 'type': 'static_library',
17 'conditions': [ 17 'conditions': [
18 ['OS=="ios"', { 18 ['OS=="ios"', {
19 'dependencies': [ 19 'dependencies': [
20 'webrtc_h264_video_toolbox', 20 'webrtc_h264_video_toolbox',
21 ], 21 ],
22 'sources': [ 22 'sources': [
23 'h264_objc.mm', 23 'h264_objc.mm',
24 ], 24 ],
25 }], 25 }],
26 // TODO(hbos): Consider renaming this flag and the below macro to
27 // something which helps distinguish OpenH264/FFmpeg from other H264
28 // implementations.
stefan-webrtc 2016/02/03 07:51:14 +1. Now the flag suggests that h264 is enabled/dis
26 ['rtc_use_h264==1', { 29 ['rtc_use_h264==1', {
27 'defines': [ 30 'defines': [
28 'WEBRTC_THIRD_PARTY_H264', 31 'WEBRTC_USE_H264',
29 ], 32 ],
30 'conditions': [ 33 'conditions': [
31 ['rtc_initialize_ffmpeg==1', { 34 ['rtc_initialize_ffmpeg==1', {
32 'defines': [ 35 'defines': [
33 'WEBRTC_INITIALIZE_FFMPEG', 36 'WEBRTC_INITIALIZE_FFMPEG',
34 ], 37 ],
35 }], 38 }],
36 ], 39 ],
37 'dependencies': [ 40 'dependencies': [
38 '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg', 41 '<(DEPTH)/third_party/ffmpeg/ffmpeg.gyp:ffmpeg',
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 'h264_video_toolbox_encoder.cc', 80 'h264_video_toolbox_encoder.cc',
78 'h264_video_toolbox_encoder.h', 81 'h264_video_toolbox_encoder.h',
79 'h264_video_toolbox_nalu.cc', 82 'h264_video_toolbox_nalu.cc',
80 'h264_video_toolbox_nalu.h', 83 'h264_video_toolbox_nalu.h',
81 ], 84 ],
82 }, # webrtc_h264_video_toolbox 85 }, # webrtc_h264_video_toolbox
83 ], # targets 86 ], # targets
84 }], # OS=="ios" 87 }], # OS=="ios"
85 ], # conditions 88 ], # conditions
86 } 89 }
OLDNEW
« no previous file with comments | « webrtc/modules/video_coding/codecs/h264/h264.cc ('k') | webrtc/modules/video_coding/codecs/h264/include/h264.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698