From 3c652b67468d182bd36aee4c31557621be50cc92 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Wed, 18 Nov 2015 23:07:57 +0100 Subject: modules/audio_coding: Remove some codec include dirs Also clean up some include_dir entries and update the few references to them with absolute include paths instead. Finally fixed a few lint errors and invalid header guards. None of these are used downstream. BUG=webrtc:5095 TESTED=git cl try -c --bot=android_compile_rel --bot=linux_compile_rel --bot=win_compile_rel --bot=mac_compile_rel --bot=ios_rel --bot=linux_gn_rel --bot=win_x64_gn_rel --bot=mac_x64_gn_rel --bot=android_gn_rel -m tryserver.webrtc R=kwiberg@webrtc.org Review URL: https://codereview.webrtc.org/1438663003 . Cr-Commit-Position: refs/heads/master@{#10700} --- webrtc/modules/audio_coding/neteq/mock/mock_external_decoder_pcm16b.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '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 8cf89c083d..3b60c6310a 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 @@ -15,7 +15,7 @@ #include "testing/gmock/include/gmock/gmock.h" #include "webrtc/base/constructormagic.h" -#include "webrtc/modules/audio_coding/codecs/pcm16b/include/pcm16b.h" +#include "webrtc/modules/audio_coding/codecs/pcm16b/pcm16b.h" #include "webrtc/typedefs.h" namespace webrtc { -- cgit v1.2.3 From d7b7ae8bdaaf51d885bbbcf6d2ccd2da2522ab03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Bostr=C3=B6m?= Date: Tue, 8 Dec 2015 13:41:35 +0100 Subject: Add encode/decode time tracing to audio_coding. Also removes virtual from VideoDecoder::Decode and updated mocks and tests accordingly to use VideoDecoder::DecodeInternal instead. BUG=webrtc:5167 R=henrik.lundin@webrtc.org Review URL: https://codereview.webrtc.org/1512483003 . Cr-Commit-Position: refs/heads/master@{#10935} --- .../audio_coding/neteq/mock/mock_external_decoder_pcm16b.h | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to '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 3b60c6310a..42c17ae054 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 @@ -30,7 +30,6 @@ class ExternalPcm16B : public AudioDecoder { ExternalPcm16B() {} void Reset() override {} - protected: int DecodeInternal(const uint8_t* encoded, size_t encoded_len, int sample_rate_hz, @@ -52,8 +51,8 @@ class MockExternalPcm16B : public ExternalPcm16B { public: MockExternalPcm16B() { // By default, all calls are delegated to the real object. - ON_CALL(*this, Decode(_, _, _, _, _, _)) - .WillByDefault(Invoke(&real_, &ExternalPcm16B::Decode)); + ON_CALL(*this, DecodeInternal(_, _, _, _, _)) + .WillByDefault(Invoke(&real_, &ExternalPcm16B::DecodeInternal)); ON_CALL(*this, HasDecodePlc()) .WillByDefault(Invoke(&real_, &ExternalPcm16B::HasDecodePlc)); ON_CALL(*this, DecodePlc(_, _)) @@ -68,11 +67,10 @@ class MockExternalPcm16B : public ExternalPcm16B { virtual ~MockExternalPcm16B() { Die(); } MOCK_METHOD0(Die, void()); - MOCK_METHOD6(Decode, + MOCK_METHOD5(DecodeInternal, int(const uint8_t* encoded, size_t encoded_len, int sample_rate_hz, - size_t max_decoded_bytes, int16_t* decoded, SpeechType* speech_type)); MOCK_CONST_METHOD0(HasDecodePlc, -- cgit v1.2.3