webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.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/modules/audio_coding/neteq/mock/mock_decoder_database.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/modules/audio_coding/neteq/include/neteq.h ('K') | « webrtc/modules/audio_coding/neteq/include/neteq.h ('k') | webrtc/modules/audio_coding/neteq/neteq.cc » ('j') | webrtc/modules/audio_coding/neteq/neteq.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h

diff --git a/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h b/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h

index 60ae0f6501e35e9390c63f3303587096c323a9aa..326f49c0fe0cdc6c5d497312173792fde94b27bd 100644

--- a/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h

+++ b/webrtc/modules/audio_coding/neteq/mock/mock_decoder_database.h

@@ -21,7 +21,9 @@ namespace webrtc {

class MockDecoderDatabase : public DecoderDatabase {

public:

- MockDecoderDatabase() : DecoderDatabase(nullptr) {}

+ MockDecoderDatabase()

+ : DecoderDatabase(std::shared_ptr<AudioDecoderFactory>()) {}

kwiberg-webrtc 2016/05/17 13:33:48 You shouldn't need this---nullptr converts implici

virtual ~MockDecoderDatabase() { Die(); }

MOCK_METHOD0(Die, void());

MOCK_CONST_METHOD0(Empty,