zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Clear out cached codecs when calculating new codec lists.

Browse Source 
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}
This commit is contained in:
noahric
2017-01-20 01:07:26 -08:00
committed by Commit bot
parent 204030a256
commit be850e1b1d
3 changed files with 41 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
webrtc/media/BUILD.gn
View File

@ -338,6 +338,7 @@ if (rtc_include_tests) {
"engine/videoencodersoftwarefallbackwrapper_unittest.cc",
"engine/webrtcmediaengine_unittest.cc",
"engine/webrtcvideocapturer_unittest.cc",
"engine/webrtcvideoencoderfactory_unittest.cc",
"engine/webrtcvideoengine2_unittest.cc",
"engine/webrtcvoiceengine_unittest.cc",
]

2
webrtc/media/engine/webrtcvideoencoderfactory.cc
View File

@ -22,6 +22,7 @@ webrtc::VideoEncoder* WebRtcVideoEncoderFactory::CreateVideoEncoder(
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 @@ webrtc::VideoEncoder* WebRtcVideoEncoderFactory::CreateVideoEncoder(
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(

38
webrtc/media/engine/webrtcvideoencoderfactory_unittest.cc Normal file
View File

@ -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());
}