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

Unified Diff: webrtc/test/mock_audio_encoder.h

Issue 2799033006: Injectable audio encoders: Moved audio encoder, factory and builtin factory to api/. (Closed)
Patch Set: More backwards-compatibility! Created 3 years, 8 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/test/call_test.cc ('k') | webrtc/test/mock_audio_encoder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webrtc/test/mock_audio_encoder.h
diff --git a/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h b/webrtc/test/mock_audio_encoder.h
similarity index 90%
rename from webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h
rename to webrtc/test/mock_audio_encoder.h
index 279db3781552180f39c0bdf939267f223743ad9b..1c6a5f0e5615a2e253b3f49019f970d5a866ece8 100644
--- a/webrtc/modules/audio_coding/codecs/mock/mock_audio_encoder.h
+++ b/webrtc/test/mock_audio_encoder.h
@@ -8,13 +8,13 @@
* be found in the AUTHORS file in the root of the source tree.
*/
-#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_MOCK_MOCK_AUDIO_ENCODER_H_
-#define WEBRTC_MODULES_AUDIO_CODING_CODECS_MOCK_MOCK_AUDIO_ENCODER_H_
+#ifndef WEBRTC_TEST_MOCK_AUDIO_ENCODER_H_
+#define WEBRTC_TEST_MOCK_AUDIO_ENCODER_H_
#include <string>
+#include "webrtc/api/audio_codecs/audio_encoder.h"
#include "webrtc/base/array_view.h"
-#include "webrtc/modules/audio_coding/codecs/audio_encoder.h"
#include "webrtc/test/gmock.h"
namespace webrtc {
@@ -25,7 +25,8 @@ class MockAudioEncoder : public AudioEncoder {
// methods don't use any override declarations, and we want to avoid
// warnings from -Winconsistent-missing-override. See
// http://crbug.com/428099.
- ~MockAudioEncoder() /* override */ { Die(); }
+ MockAudioEncoder();
+ ~MockAudioEncoder();
MOCK_METHOD0(Die, void());
MOCK_METHOD1(Mark, void(std::string desc));
MOCK_CONST_METHOD0(SampleRateHz, int());
@@ -48,8 +49,7 @@ class MockAudioEncoder : public AudioEncoder {
void(float uplink_packet_loss_fraction));
MOCK_METHOD2(EnableAudioNetworkAdaptor,
- bool(const std::string& config_string,
- RtcEventLog* event_log));
+ bool(const std::string& config_string, RtcEventLog* event_log));
// Note, we explicitly chose not to create a mock for the Encode method.
MOCK_METHOD3(EncodeImpl,
@@ -77,6 +77,8 @@ class MockAudioEncoder : public AudioEncoder {
class CopyEncoding {
public:
+ ~CopyEncoding();
+
// Creates a functor that will return |info| and append the data in the
// payload to the buffer given as input to it. Up to info.encoded_bytes are
// appended - make sure the payload is big enough! Since it uses an
@@ -102,4 +104,4 @@ class MockAudioEncoder : public AudioEncoder {
} // namespace webrtc
-#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_MOCK_MOCK_AUDIO_ENCODER_H_
+#endif // WEBRTC_TEST_MOCK_AUDIO_ENCODER_H_
« no previous file with comments | « webrtc/test/call_test.cc ('k') | webrtc/test/mock_audio_encoder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698