Clear out cached codecs when calculating new codec lists.
Without this, every time WebRtcVideoEngine2 calls supported_codecs(),
the codec list grows.
BUG=webrtc:7020
Review-Url: https://codereview.webrtc.org/2639423006
Cr-Commit-Position: refs/heads/master@{#16178}
diff --git a/webrtc/media/BUILD.gn b/webrtc/media/BUILD.gn
index 23aa0f0..060b6af 100644
--- a/webrtc/media/BUILD.gn
+++ b/webrtc/media/BUILD.gn
@@ -338,6 +338,7 @@
"engine/videoencodersoftwarefallbackwrapper_unittest.cc",
"engine/webrtcmediaengine_unittest.cc",
"engine/webrtcvideocapturer_unittest.cc",
+ "engine/webrtcvideoencoderfactory_unittest.cc",
"engine/webrtcvideoengine2_unittest.cc",
"engine/webrtcvoiceengine_unittest.cc",
]
diff --git a/webrtc/media/engine/webrtcvideoencoderfactory.cc b/webrtc/media/engine/webrtcvideoencoderfactory.cc
index c7e5ac4..a332d86 100644
--- a/webrtc/media/engine/webrtcvideoencoderfactory.cc
+++ b/webrtc/media/engine/webrtcvideoencoderfactory.cc
@@ -22,6 +22,7 @@
const std::vector<cricket::VideoCodec>&
WebRtcVideoEncoderFactory::supported_codecs() const {
+ codecs_.clear();
const std::vector<VideoCodec>& encoder_codecs = codecs();
for (const VideoCodec& encoder_codec : encoder_codecs) {
codecs_.push_back(cricket::VideoCodec(encoder_codec.name));
@@ -38,6 +39,7 @@
const std::vector<WebRtcVideoEncoderFactory::VideoCodec>&
WebRtcVideoEncoderFactory::codecs() const {
+ encoder_codecs_.clear();
const std::vector<cricket::VideoCodec>& codecs = supported_codecs();
for (const cricket::VideoCodec& codec : codecs) {
encoder_codecs_.push_back(
diff --git a/webrtc/media/engine/webrtcvideoencoderfactory_unittest.cc b/webrtc/media/engine/webrtcvideoencoderfactory_unittest.cc
new file mode 100644
index 0000000..967c33b
--- /dev/null
+++ b/webrtc/media/engine/webrtcvideoencoderfactory_unittest.cc
@@ -0,0 +1,38 @@
+/*
+ * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
+ *
+ * Use of this source code is governed by a BSD-style license
+ * that can be found in the LICENSE file in the root of the source
+ * tree. An additional intellectual property rights grant can be found
+ * in the file PATENTS. All contributing project authors may
+ * be found in the AUTHORS file in the root of the source tree.
+ */
+
+#include "webrtc/media/engine/webrtcvideoencoderfactory.h"
+
+#include "webrtc/test/gtest.h"
+
+class WebRtcVideoEncoderFactoryForTest
+ : public cricket::WebRtcVideoEncoderFactory {
+ public:
+ WebRtcVideoEncoderFactoryForTest() {
+ codecs_.push_back(VideoCodec(webrtc::kVideoCodecH264, "H264"));
+ codecs_.push_back(VideoCodec(webrtc::kVideoCodecVP8, "VP8"));
+ }
+
+ const std::vector<VideoCodec>& codecs() const override { return codecs_; }
+
+ void DestroyVideoEncoder(webrtc::VideoEncoder* encoder) override {}
+
+ std::vector<VideoCodec> codecs_;
+};
+
+TEST(WebRtcVideoEncoderFactoryTest, TestMultipleCallsToSupportedCodecs) {
+ WebRtcVideoEncoderFactoryForTest factory;
+ EXPECT_EQ(2u, factory.supported_codecs().size());
+ EXPECT_EQ("H264", factory.supported_codecs()[0].name);
+ EXPECT_EQ("VP8", factory.supported_codecs()[1].name);
+
+ // The codec list doesn't grow when called repeatedly.
+ EXPECT_EQ(2u, factory.supported_codecs().size());
+}
