webrtc/media/base/mediaengine.h - Issue 1949533002: WIP: Move the creation of AudioCodecFactory into PeerConnectionFactory.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1949533002: WIP: Move the creation of AudioCodecFactory into PeerConnectionFactory. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Retained Channel API by adding overloads; also add intended AudioReceiveStream API 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

« webrtc/audio/audio_receive_stream.cc ('K') | « webrtc/media/base/fakemediaengine.h ('k') | webrtc/media/engine/fakewebrtcvoiceengine.h » ('j') | webrtc/media/engine/webrtcvoiceengine_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/media/base/mediaengine.h

diff --git a/webrtc/media/base/mediaengine.h b/webrtc/media/base/mediaengine.h

index 4c7d62a1e4b7bc99503c3ce8885d4c80a276295a..dca53a1cb5d330214318198907a33850050a5340 100644

--- a/webrtc/media/base/mediaengine.h

+++ b/webrtc/media/base/mediaengine.h

@@ -33,6 +33,7 @@

#endif

namespace webrtc {

+class AudioDecoderFactory;

class AudioDeviceModule;

class Call;

}

@@ -124,7 +125,10 @@ class MediaEngineFactory {

template<class VOICE, class VIDEO>

class CompositeMediaEngine : public MediaEngineInterface {

public:

- explicit CompositeMediaEngine(webrtc::AudioDeviceModule* adm) : voice_(adm) {}

+ explicit CompositeMediaEngine(

+ webrtc::AudioDeviceModule* adm,

+ std::shared_ptr<webrtc::AudioDecoderFactory> audio_decoder_factory)

+ : voice_(adm, std::move(audio_decoder_factory)) {}

virtual ~CompositeMediaEngine() {}

virtual bool Init() {

video_.Init();