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

Unified Diff: webrtc/voice_engine/include/voe_base.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
Index: webrtc/voice_engine/include/voe_base.h
diff --git a/webrtc/voice_engine/include/voe_base.h b/webrtc/voice_engine/include/voe_base.h
index 4001b945774892123a60f260300b301579f906d2..c7d31742539711d371bf710a0806ad70456e3dcc 100644
--- a/webrtc/voice_engine/include/voe_base.h
+++ b/webrtc/voice_engine/include/voe_base.h
@@ -34,10 +34,13 @@
#ifndef WEBRTC_VOICE_ENGINE_VOE_BASE_H
#define WEBRTC_VOICE_ENGINE_VOE_BASE_H
+#include <memory>
+
#include "webrtc/common_types.h"
namespace webrtc {
+class AudioDecoderFactory;
class AudioDeviceModule;
class AudioProcessing;
class AudioTransport;
@@ -123,11 +126,14 @@ class WEBRTC_DLLEXPORT VoEBase {
// functionality in a separate (reference counted) module.
// - The AudioProcessing module handles capture-side processing. VoiceEngine
// takes ownership of this object.
+ // - An AudioDecoderFactory - used to create audio decoders.
// If NULL is passed for any of these, VoiceEngine will create its own.
// Returns -1 in case of an error, 0 otherwise.
// TODO(ajm): Remove default NULLs.
virtual int Init(AudioDeviceModule* external_adm = NULL,
- AudioProcessing* audioproc = NULL) = 0;
+ AudioProcessing* audioproc = NULL,
+ std::shared_ptr<AudioDecoderFactory> decoder_factory =
+ std::shared_ptr<AudioDecoderFactory>()) = 0;
kwiberg-webrtc 2016/05/17 13:33:48 Ew! Default values for a virtual method... Also,
ossu 2016/05/17 14:25:35 I was just following orders! (i.e. there were alre
kwiberg-webrtc 2016/05/18 03:06:35 Yes, I didn't mean to imply you were at fault. It
// Returns NULL before Init() is called.
virtual AudioProcessing* audio_processing() = 0;

Powered by Google App Engine
This is Rietveld 408576698