admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added backwards compatible version of WebRtcMediaEngineFactory::Create.

Browse Source 
Added notry to unbreak clients quickly.

NOTRY=True
BUG=webrtc:6000

Review-Url: https://codereview.webrtc.org/2069643002
Cr-Commit-Position: refs/heads/master@{#13150}
This commit is contained in:
ossu 2016-06-15 02:22:32 -07:00 committed by Commit bot
parent 71ee44cc6d
commit 111744e1d7
3 changed files with 35 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
webrtc/media/engine/webrtcmediaengine.cc
View File

@ -9,6 +9,7 @@
*/
#include "webrtc/media/engine/webrtcmediaengine.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
#include <algorithm>
@ -63,6 +64,18 @@ void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
namespace cricket {
// TODO(ossu): Backwards-compatible interface. Will be deprecated once the
// audio decoder factory is fully plumbed and used throughout WebRTC.
// See: crbug.com/webrtc/6000
MediaEngineInterface* WebRtcMediaEngineFactory::Create(
webrtc::AudioDeviceModule* adm,
WebRtcVideoEncoderFactory* video_encoder_factory,
WebRtcVideoDecoderFactory* video_decoder_factory) {
return CreateWebRtcMediaEngine(adm,
webrtc::CreateBuiltinAudioDecoderFactory(),
video_encoder_factory, video_decoder_factory);
}
// Used by PeerConnectionFactory to create a media engine passed into
// ChannelManager.
MediaEngineInterface* WebRtcMediaEngineFactory::Create(

8
webrtc/media/engine/webrtcmediaengine.h
View File

@ -29,6 +29,14 @@ namespace cricket {
class WebRtcMediaEngineFactory {
public:
// TODO(ossu): Backwards-compatible interface. Will be deprecated once the
// audio decoder factory is fully plumbed and used throughout WebRTC.
// See: crbug.com/webrtc/6000
static MediaEngineInterface* Create(
webrtc::AudioDeviceModule* adm,
WebRtcVideoEncoderFactory* video_encoder_factory,
WebRtcVideoDecoderFactory* video_decoder_factory);
static MediaEngineInterface* Create(
webrtc::AudioDeviceModule* adm,
const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&

14
webrtc/media/engine/webrtcmediaengine_unittest.cc
View File

@ -10,6 +10,7 @@
#include "testing/gtest/include/gtest/gtest.h"
#include "webrtc/modules/audio_coding/codecs/builtin_audio_decoder_factory.h"
#include "webrtc/media/engine/webrtcmediaengine.h"
using webrtc::RtpExtension;
@ -179,4 +180,17 @@ TEST(WebRtcMediaEngineTest, FilterRtpExtensions_RemoveRedundantBwe_3) {
EXPECT_EQ(1, filtered.size());
EXPECT_EQ(RtpExtension::kTimestampOffsetUri, filtered[0].uri);
}
TEST(WebRtcMediaEngineFactoryTest, CreateOldApi) {
std::unique_ptr<MediaEngineInterface> engine(
WebRtcMediaEngineFactory::Create(nullptr, nullptr, nullptr));
EXPECT_TRUE(engine);
}
TEST(WebRtcMediaEngineFactoryTest, CreateWithBuiltinDecoders) {
std::unique_ptr<MediaEngineInterface> engine(WebRtcMediaEngineFactory::Create(
nullptr, webrtc::CreateBuiltinAudioDecoderFactory(), nullptr, nullptr));
EXPECT_TRUE(engine);
}
} // namespace cricket