39ce11f7f6
Reason for revert: A interface change broke some downstream code in google3. Original issue's description: > Support external audio mixer in webrtc. > > An external audio mixer will be passed from PeerConnectionFactory to > AudioTransportProxy. > > BUG=webrtc:6457 > > Committed: https://crrev.com/f6bcac59e88c3be5ffd73bbb1098f2d82ee316a1 > Cr-Commit-Position: refs/heads/master@{#15556} TBR=solenberg@webrtc.org,aleloi@webrtc.org,deadbeef@webrtc.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=webrtc:6457 Review-Url: https://codereview.webrtc.org/2562333003 Cr-Commit-Position: refs/heads/master@{#15557}
44 lines
1.6 KiB
C++
44 lines
1.6 KiB
C++
/*
|
|
* Copyright (c) 2016 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/nullwebrtcvideoengine.h"
|
|
#include "webrtc/media/engine/webrtcvoiceengine.h"
|
|
#include "webrtc/modules/audio_coding/codecs/mock/mock_audio_decoder_factory.h"
|
|
#include "webrtc/test/gtest.h"
|
|
|
|
namespace cricket {
|
|
|
|
class WebRtcMediaEngineNullVideo
|
|
: public CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine> {
|
|
public:
|
|
WebRtcMediaEngineNullVideo(
|
|
webrtc::AudioDeviceModule* adm,
|
|
const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
|
|
audio_decoder_factory,
|
|
WebRtcVideoEncoderFactory* video_encoder_factory,
|
|
WebRtcVideoDecoderFactory* video_decoder_factory)
|
|
: CompositeMediaEngine<WebRtcVoiceEngine, NullWebRtcVideoEngine>(
|
|
adm, audio_decoder_factory) {
|
|
video_.SetExternalDecoderFactory(video_decoder_factory);
|
|
video_.SetExternalEncoderFactory(video_encoder_factory);
|
|
}
|
|
};
|
|
|
|
// Simple test to check if NullWebRtcVideoEngine implements the methods
|
|
// required by CompositeMediaEngine.
|
|
TEST(NullWebRtcVideoEngineTest, CheckInterface) {
|
|
WebRtcMediaEngineNullVideo engine(
|
|
nullptr, webrtc::MockAudioDecoderFactory::CreateUnusedFactory(), nullptr,
|
|
nullptr);
|
|
EXPECT_TRUE(engine.Init());
|
|
}
|
|
|
|
} // namespace cricket
|