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

Unified Diff: webrtc/build/common.gypi

Issue 1639273002: H264: Thread-safe InitializeFFmpeg. Flag to control if InitializeFFmpeg should be called. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: rtc_initialize_ffmpeg Created 4 years, 11 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
« no previous file with comments | « no previous file | webrtc/build/webrtc.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/build/common.gypi
diff --git a/webrtc/build/common.gypi b/webrtc/build/common.gypi
index a77420c070cb103d4c42fd179a592b0a3272542d..d5b79f9c13b0178cef0c5cb16965f916cb2e2094 100644
--- a/webrtc/build/common.gypi
+++ b/webrtc/build/common.gypi
@@ -142,11 +142,23 @@
# support, |ffmpeg_branding| has to separately be set to a value that
# includes H.264, for example "Chrome". If FFmpeg is built without H.264,
# compilation succeeds but |H264DecoderImpl| fails to initialize.
+ # See also: |rtc_initialize_ffmpeg|.
# CHECK THE OPENH264, FFMPEG AND H.264 LICENSES/PATENTS BEFORE BUILDING.
# http://www.openh264.org, https://www.ffmpeg.org/
'rtc_use_h264%': 0,
'conditions': [
+ # FFmpeg must be initialized for |H264DecoderImpl| to work. This can be
+ # done by WebRTC during |H264DecoderImpl::InitDecode| or externally.
+ # FFmpeg must only be initialized once. Projects that initialize FFmpeg
+ # externally, such as Chromium, must turn this flag off so that WebRTC
+ # does not also initialize.
+ ['build_with_chromium==0', {
+ 'rtc_initialize_ffmpeg%': 1,
+ }, {
+ 'rtc_initialize_ffmpeg%': 0,
+ }],
+
['build_with_chromium==1', {
# Exclude pulse audio on Chromium since its prerequisites don't require
# pulse audio.
« no previous file with comments | « no previous file | webrtc/build/webrtc.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698