Index: webrtc/media/engine/fakewebrtcvideoengine.h |
diff --git a/webrtc/media/engine/fakewebrtcvideoengine.h b/webrtc/media/engine/fakewebrtcvideoengine.h |
index e954f90b1eb4bfec9242429fbcacb4dc6dafcc77..a92f842face1c7261f183d73278a132888939aa8 100644 |
--- a/webrtc/media/engine/fakewebrtcvideoengine.h |
+++ b/webrtc/media/engine/fakewebrtcvideoengine.h |
@@ -193,11 +193,17 @@ class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory { |
encoders_have_internal_sources_(false) {} |
webrtc::VideoEncoder* CreateVideoEncoder( |
- webrtc::VideoCodecType type) override { |
+ const cricket::VideoCodec& codec) override { |
rtc::CritScope lock(&crit_); |
- if (supported_codec_types_.count(type) == 0) { |
- return NULL; |
+ bool found_matching_codec = false; |
+ for (const cricket::VideoCodec& supported_codec : codecs_) { |
+ if (supported_codec.Matches(codec)) { |
+ found_matching_codec = true; |
+ break; |
+ } |
} |
+ if (!found_matching_codec) |
+ return nullptr; |
FakeWebRtcVideoEncoder* encoder = new FakeWebRtcVideoEncoder(); |
encoders_.push_back(encoder); |
num_created_encoders_++; |
@@ -221,8 +227,7 @@ class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory { |
delete encoder; |
} |
- const std::vector<WebRtcVideoEncoderFactory::VideoCodec>& codecs() |
- const override { |
+ const std::vector<cricket::VideoCodec>& supported_codecs() const override { |
return codecs_; |
} |
@@ -235,11 +240,8 @@ class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory { |
encoders_have_internal_sources_ = internal_source; |
} |
- void AddSupportedVideoCodecType(webrtc::VideoCodecType type, |
- const std::string& name) { |
- supported_codec_types_.insert(type); |
- codecs_.push_back( |
- WebRtcVideoEncoderFactory::VideoCodec(type, name, 1280, 720, 30)); |
+ void AddSupportedVideoCodecType(const std::string& name) { |
+ codecs_.push_back(cricket::VideoCodec(name)); |
} |
int GetNumCreatedEncoders() { |
@@ -255,8 +257,7 @@ class FakeWebRtcVideoEncoderFactory : public WebRtcVideoEncoderFactory { |
private: |
rtc::CriticalSection crit_; |
rtc::Event created_video_encoder_event_; |
- std::set<webrtc::VideoCodecType> supported_codec_types_; |
- std::vector<WebRtcVideoEncoderFactory::VideoCodec> codecs_; |
+ std::vector<cricket::VideoCodec> codecs_; |
std::vector<FakeWebRtcVideoEncoder*> encoders_ GUARDED_BY(crit_); |
int num_created_encoders_ GUARDED_BY(crit_); |
bool encoders_have_internal_sources_; |