| Index: talk/media/base/mediaengine.h
|
| diff --git a/talk/media/base/mediaengine.h b/talk/media/base/mediaengine.h
|
| index 08addc46400553df42bc9946bf9f118a63d0507c..d64036e2354dcb90bba6f3bd93b78681111cc8f4 100644
|
| --- a/talk/media/base/mediaengine.h
|
| +++ b/talk/media/base/mediaengine.h
|
| @@ -137,10 +137,10 @@ class MediaEngineInterface {
|
| virtual bool StartAecDump(rtc::PlatformFile file) = 0;
|
|
|
| // Voice processors for effects.
|
| - virtual bool RegisterVoiceProcessor(uint32 ssrc,
|
| + virtual bool RegisterVoiceProcessor(uint32_t ssrc,
|
| VoiceProcessor* video_processor,
|
| MediaProcessorDirection direction) = 0;
|
| - virtual bool UnregisterVoiceProcessor(uint32 ssrc,
|
| + virtual bool UnregisterVoiceProcessor(uint32_t ssrc,
|
| VoiceProcessor* video_processor,
|
| MediaProcessorDirection direction) = 0;
|
| };
|
| @@ -250,12 +250,12 @@ class CompositeMediaEngine : public MediaEngineInterface {
|
| return voice_.StartAecDump(file);
|
| }
|
|
|
| - virtual bool RegisterVoiceProcessor(uint32 ssrc,
|
| + virtual bool RegisterVoiceProcessor(uint32_t ssrc,
|
| VoiceProcessor* processor,
|
| MediaProcessorDirection direction) {
|
| return voice_.RegisterProcessor(ssrc, processor, direction);
|
| }
|
| - virtual bool UnregisterVoiceProcessor(uint32 ssrc,
|
| + virtual bool UnregisterVoiceProcessor(uint32_t ssrc,
|
| VoiceProcessor* processor,
|
| MediaProcessorDirection direction) {
|
| return voice_.UnregisterProcessor(ssrc, processor, direction);
|
| @@ -296,12 +296,16 @@ class NullVoiceEngine {
|
| }
|
| void SetLogging(int min_sev, const char* filter) {}
|
| bool StartAecDump(rtc::PlatformFile file) { return false; }
|
| - bool RegisterProcessor(uint32 ssrc,
|
| + bool RegisterProcessor(uint32_t ssrc,
|
| VoiceProcessor* voice_processor,
|
| - MediaProcessorDirection direction) { return true; }
|
| - bool UnregisterProcessor(uint32 ssrc,
|
| + MediaProcessorDirection direction) {
|
| + return true;
|
| + }
|
| + bool UnregisterProcessor(uint32_t ssrc,
|
| VoiceProcessor* voice_processor,
|
| - MediaProcessorDirection direction) { return true; }
|
| + MediaProcessorDirection direction) {
|
| + return true;
|
| + }
|
|
|
| private:
|
| std::vector<AudioCodec> codecs_;
|
|
|