Chromium Code Reviews| 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 a20865c3aaa55ceb414dfa5ce3c7981f6183a146..917118c96b70f47aa7907b0ffc8bda2be58d4ef7 100644 |
| --- a/webrtc/modules/video_coding/codecs/h264/h264.gypi |
| +++ b/webrtc/modules/video_coding/codecs/h264/h264.gypi |
| @@ -15,6 +15,36 @@ |
| 'target_name': 'webrtc_h264', |
| 'type': 'static_library', |
| 'conditions': [ |
| + ['use_openh264==1', { |
| + 'include_dirs': [ |
| + # TODO(hbos): proper OpenH264 dependency |
| + '<(webrtc_root)/modules/video_coding/codecs/h264/openh264/codec/api/svc', |
| + '<(webrtc_root)/modules/video_coding/codecs/h264/openh264/codec/common', |
| + '<(webrtc_root)/modules/video_coding/codecs/h264/openh264/codec/encoder/core/inc', |
| + '<(webrtc_root)/modules/video_coding/codecs/h264/openh264/codec/encoder/plus/inc', |
| + '<(webrtc_root)/modules/video_coding/codecs/h264/openh264/codec/processing/interface', |
| + ], |
| + 'link_settings': { |
| + 'libraries': [ |
| + # TODO(hbos): Add OpenH264 to third_party and update dependencies. |
|
stefan-webrtc
2015/09/28 11:19:01
Are we fixing this TODO before committing this CL?
hbos
2015/09/30 15:35:18
Yes. I want to be able to build from source and ru
stefan-webrtc
2015/10/01 08:19:30
Acknowledged.
|
| + # OpenH264 library root directory |
| + '-L<(webrtc_root)/modules/video_coding/codecs/h264/openh264', |
| + # The library files '-lXXX' -> 'libXXX.a' inside OpenH264 directory |
| + '-lcommon', |
| + '-lconsole_common', |
| + '-ldecoder', |
| + '-lencoder', |
| + '-lopenh264', |
| + '-lprocessing', |
| + ], |
| + }, |
| + 'sources': [ |
| + 'h264_encoder_impl.cc', |
| + 'h264_encoder_impl.h', |
| + 'h264_decoder_impl.cc', |
| + 'h264_decoder_impl.h', |
| + ], |
| + }], |
| ['OS=="ios"', { |
| 'dependencies': [ |
| 'webrtc_h264_video_toolbox', |