webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h - Issue 1319683002: AudioDecoder: Replace Init() with Reset()

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_external_decoder_pcm16b.h

Issue 1319683002: AudioDecoder: Replace Init() with Reset() (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@buffer

Patch Set: review fixes Created 5 years, 4 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

« no previous file with comments | « webrtc/modules/audio_coding/neteq/mock/mock_audio_decoder.h ('k') | webrtc/modules/audio_coding/neteq/neteq_external_decoder_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index f239b4aa3a77f1e40e9f8865dc876c0deaf6c758..fca1c2d6eeeb400e5529420c43f321d49eecdf96 100644

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

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

@@ -28,7 +28,7 @@ using ::testing::Invoke;

class ExternalPcm16B : public AudioDecoder {

public:

ExternalPcm16B() {}

- virtual int Init() { return 0; }

+ void Reset() override {}

protected:

int DecodeInternal(const uint8_t* encoded,

@@ -58,8 +58,8 @@ class MockExternalPcm16B : public ExternalPcm16B {

.WillByDefault(Invoke(&real_, &ExternalPcm16B::HasDecodePlc));

ON_CALL(*this, DecodePlc(_, _))

.WillByDefault(Invoke(&real_, &ExternalPcm16B::DecodePlc));

- ON_CALL(*this, Init())

- .WillByDefault(Invoke(&real_, &ExternalPcm16B::Init));

+ ON_CALL(*this, Reset())

+ .WillByDefault(Invoke(&real_, &ExternalPcm16B::Reset));

ON_CALL(*this, IncomingPacket(_, _, _, _, _))

.WillByDefault(Invoke(&real_, &ExternalPcm16B::IncomingPacket));

ON_CALL(*this, ErrorCode())

@@ -79,8 +79,7 @@ class MockExternalPcm16B : public ExternalPcm16B {

bool());

MOCK_METHOD2(DecodePlc,

size_t(size_t num_frames, int16_t* decoded));

- MOCK_METHOD0(Init,

- int());

+ MOCK_METHOD0(Reset, void());

MOCK_METHOD5(IncomingPacket,

int(const uint8_t* payload, size_t payload_len,

uint16_t rtp_sequence_number, uint32_t rtp_timestamp,