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 b21792204877947f0ac89cbb01098781239c62e9..ec92f5572f9bd7c1877985cd1e1f3f073186e7f0 100644 |
--- a/content/renderer/media/rtc_video_encoder_factory.cc |
+++ b/content/renderer/media/rtc_video_encoder_factory.cc |
@@ -4,7 +4,9 @@ |
#include "content/renderer/media/rtc_video_encoder_factory.h" |
+#include "base/command_line.h" |
#include "content/common/gpu/client/gpu_video_encode_accelerator_host.h" |
+#include "content/public/common/content_switches.h" |
#include "content/renderer/media/rtc_video_encoder.h" |
#include "media/filters/gpu_video_accelerator_factories.h" |
#include "media/video/video_encode_accelerator.h" |
@@ -23,16 +25,22 @@ void VEAToWebRTCCodecs( |
int fps = profile.max_framerate.numerator; |
DCHECK_EQ(profile.max_framerate.denominator, 1U); |
+ const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess(); |
if (profile.profile >= media::VP8PROFILE_MIN && |
profile.profile <= media::VP8PROFILE_MAX) { |
- codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec( |
- webrtc::kVideoCodecVP8, "VP8", width, height, fps)); |
+ if (cmd_line->HasSwitch(switches::kEnableWebRtcHWVp8Encoding)) { |
+ codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec( |
+ webrtc::kVideoCodecVP8, "VP8", width, height, fps)); |
+ } |
} else if (profile.profile >= media::H264PROFILE_MIN && |
profile.profile <= media::H264PROFILE_MAX) { |
+ if (cmd_line->HasSwitch(switches::kEnableWebRtcHWH264Encoding)) { |
+ codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec( |
+ webrtc::kVideoCodecH264, "H264", width, height, fps)); |
+ } |
+ // TODO(hshi): remove the generic codec type after CASTv1 deprecation. |
codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec( |
webrtc::kVideoCodecGeneric, "CAST1", width, height, fps)); |
- codecs->push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec( |
- webrtc::kVideoCodecH264, "H264", width, height, fps)); |
} |
} |