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

Unified Diff: content/renderer/media/webrtc/peer_connection_dependency_factory.cc

Issue 2346283002: Fix build with media_use_ffmpeg=false (Closed)
Patch Set: Created 4 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
« no previous file with comments | « content/renderer/media/gpu/rtc_video_encoder_factory.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webrtc/peer_connection_dependency_factory.cc
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
index 93b7f2fbef930f5cc0f39b36d14d91c76098ed39..065993d290c91daf53c22407dd568f2d31217a08 100644
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
@@ -168,7 +168,7 @@ void PeerConnectionDependencyFactory::CreatePeerConnectionFactory() {
DVLOG(1) << "PeerConnectionDependencyFactory::CreatePeerConnectionFactory()";
-#if BUILDFLAG(RTC_USE_H264)
+#if BUILDFLAG(RTC_USE_H264) && !defined(MEDIA_DISABLE_FFMPEG)
// Building /w |rtc_use_h264|, is the corresponding run-time feature enabled?
if (base::FeatureList::IsEnabled(kWebRtcH264WithOpenH264FFmpeg)) {
// |H264DecoderImpl| may be used which depends on FFmpeg, therefore we need
@@ -178,7 +178,9 @@ void PeerConnectionDependencyFactory::CreatePeerConnectionFactory() {
// Feature is to be disabled, no need to make sure FFmpeg is initialized.
webrtc::DisableRtcUseH264();
}
-#endif
+#else
+ webrtc::DisableRtcUseH264();
+#endif // BUILDFLAG(RTC_USE_H264) && !defined(MEDIA_DISABLE_FFMPEG)
base::MessageLoop::current()->AddDestructionObserver(this);
// To allow sending to the signaling/worker threads.
« no previous file with comments | « content/renderer/media/gpu/rtc_video_encoder_factory.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698