| 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 f30b6260cecbeb2df287dad58f0aa7c2331d94a0..d4a545741cb327ac8910015110d853f57923b628 100644
|
| --- a/content/renderer/media/rtc_video_encoder_factory.cc
|
| +++ b/content/renderer/media/rtc_video_encoder_factory.cc
|
| @@ -4,8 +4,10 @@
|
|
|
| #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/renderer/media/rtc_video_encoder.h"
|
| +#include "extensions/common/switches.h"
|
| #include "media/filters/gpu_video_accelerator_factories.h"
|
| #include "media/video/video_encode_accelerator.h"
|
|
|
| @@ -13,6 +15,11 @@ namespace content {
|
|
|
| namespace {
|
|
|
| +bool IsExtensionProcess() {
|
| + return CommandLine::ForCurrentProcess()->HasSwitch(
|
| + extensions::switches::kExtensionProcess);
|
| +}
|
| +
|
| // Translate from media::VideoEncodeAccelerator::SupportedProfile to
|
| // one or more instances of cricket::WebRtcVideoEncoderFactory::VideoCodec
|
| std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec> VEAToWebRTCCodecs(
|
| @@ -31,8 +38,10 @@ std::vector<cricket::WebRtcVideoEncoderFactory::VideoCodec> VEAToWebRTCCodecs(
|
| profile.profile <= media::H264PROFILE_MAX) {
|
| codecs.push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec(
|
| webrtc::kVideoCodecGeneric, "CAST1", width, height, fps));
|
| - codecs.push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec(
|
| - webrtc::kVideoCodecH264, "H264", width, height, fps));
|
| + if (IsExtensionProcess()) {
|
| + codecs.push_back(cricket::WebRtcVideoEncoderFactory::VideoCodec(
|
| + webrtc::kVideoCodecH264, "H264", width, height, fps));
|
| + }
|
| }
|
|
|
| return codecs;
|
|
|