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

Unified Diff: content/renderer/media/rtc_video_encoder_factory.cc

Issue 2030833002: Revert "Use kEnableWebRtcHWH264Encoding flag when SW fallback is available" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/rtc_video_encoder_factory.cc
diff --git a/content/renderer/media/rtc_video_encoder_factory.cc b/content/renderer/media/rtc_video_encoder_factory.cc
index 36aa8fbc6d1bd49d94d9e2779808773e2d85d68e..7e99b7c13865ac2358e374554adf50c0ec4ce2b7 100644
--- a/content/renderer/media/rtc_video_encoder_factory.cc
+++ b/content/renderer/media/rtc_video_encoder_factory.cc
@@ -33,13 +33,13 @@ void VEAToWebRTCCodecs(
webrtc::kVideoCodecVP8, "VP8", width, height, fps));
} else if (profile.profile >= media::H264PROFILE_MIN &&
profile.profile <= media::H264PROFILE_MAX) {
- bool webrtc_h264_sw_enabled = false;
-#if BUILDFLAG(RTC_USE_H264)
- webrtc_h264_sw_enabled =
+ bool webrtc_h264_enabled = false;
+#if BUILDFLAG(RTC_USE_H264) && defined(OS_MACOSX)
+ webrtc_h264_enabled =
base::FeatureList::IsEnabled(kWebRtcH264WithOpenH264FFmpeg);
-#endif // BUILDFLAG(RTC_USE_H264)
+#endif // BUILDFLAG(RTC_USE_H264) && defined(OS_MACOSX)
if (cmd_line->HasSwitch(switches::kEnableWebRtcHWH264Encoding) ||
- webrtc_h264_sw_enabled) {
+ webrtc_h264_enabled) {
codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec(
webrtc::kVideoCodecH264, "H264", width, height, fps));
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698