Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(42)

Unified Diff: webrtc/media/base/fakemediaengine.h

Issue 1991233004: Moved creation of AudioDecoderFactory to inside PeerConnectionFactory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@audio-decoder-factory-injections-3
Patch Set: Removed explicit constructor qualifier. Fixed comment grammar. Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: webrtc/media/base/fakemediaengine.h
diff --git a/webrtc/media/base/fakemediaengine.h b/webrtc/media/base/fakemediaengine.h
index bde584386f9771df74930fa49b7dde20eed09cc1..e645dca12893ef694d1ec93964760aaff5479647 100644
--- a/webrtc/media/base/fakemediaengine.h
+++ b/webrtc/media/base/fakemediaengine.h
@@ -728,7 +728,10 @@ class FakeBaseEngine {
class FakeVoiceEngine : public FakeBaseEngine {
public:
- explicit FakeVoiceEngine(webrtc::AudioDeviceModule* adm)
+ explicit FakeVoiceEngine(
+ webrtc::AudioDeviceModule* adm,
+ const rtc::scoped_refptr<webrtc::AudioDecoderFactory>&
+ audio_decoder_factory)
: output_volume_(-1) {
// Add a fake audio codec. Note that the name must not be "" as there are
// sanity checks against that.
@@ -842,8 +845,9 @@ class FakeVideoEngine : public FakeBaseEngine {
class FakeMediaEngine :
public CompositeMediaEngine<FakeVoiceEngine, FakeVideoEngine> {
public:
- FakeMediaEngine() :
- CompositeMediaEngine<FakeVoiceEngine, FakeVideoEngine>(nullptr) {}
+ FakeMediaEngine()
+ : CompositeMediaEngine<FakeVoiceEngine, FakeVideoEngine>(nullptr,
+ nullptr) {}
virtual ~FakeMediaEngine() {}
void SetAudioCodecs(const std::vector<AudioCodec>& codecs) {

Powered by Google App Engine
This is Rietveld 408576698