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

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: Rebased onto master Created 4 years, 6 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 883b474a49051d571a5be20f7291504c733de7f4..44d9fddf40319a5e33a06d161da8a3690c4a6102 100644
--- a/webrtc/media/base/fakemediaengine.h
+++ b/webrtc/media/base/fakemediaengine.h
@@ -736,7 +736,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)
kwiberg-webrtc 2016/06/13 13:06:00 This now takes two arguments, so it doesn't need t
ossu 2016/06/13 13:28:39 Acknowledged.
: output_volume_(-1) {
// Add a fake audio codec. Note that the name must not be "" as there are
// sanity checks against that.
@@ -850,8 +853,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