webrtc/modules/video_coding/codecs/h264/h264.gypi - Issue 1306813009: H.264 video codec support using OpenH264/FFmpeg

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: webrtc/modules/video_coding/codecs/h264/h264.gypi

Issue 1306813009: H.264 video codec support using OpenH264/FFmpeg (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Re-enable H264 in video_loopback and screenshare_loopback after rebase (video_quality_test) Created 5 years, 3 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 side-by-side diff with in-line comments

Download patch

« webrtc/build/common.gypi ('K') | « webrtc/modules/video_coding/codecs/h264/h264.cc ('k') | webrtc/modules/video_coding/codecs/h264/h264_decoder_impl.h » ('j') | webrtc/modules/video_coding/codecs/h264/include/h264.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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.

+ # 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',