Chromium Code Reviews| Index: webrtc/api/audio_codec/audio_decoder.h |
| diff --git a/webrtc/modules/audio_coding/codecs/audio_decoder.h b/webrtc/api/audio_codec/audio_decoder.h |
| similarity index 95% |
| copy from webrtc/modules/audio_coding/codecs/audio_decoder.h |
| copy to webrtc/api/audio_codec/audio_decoder.h |
| index 8468da20f2b74669fabcd3607cbf8f47ef35c715..bcc39c132b5d4a440a489737757acafd7c168818 100644 |
| --- a/webrtc/modules/audio_coding/codecs/audio_decoder.h |
| +++ b/webrtc/api/audio_codec/audio_decoder.h |
| @@ -8,8 +8,8 @@ |
| * be found in the AUTHORS file in the root of the source tree. |
| */ |
| -#ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_DECODER_H_ |
| -#define WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_DECODER_H_ |
| +#ifndef WEBRTC_API_AUDIO_CODEC_AUDIO_DECODER_H_ |
| +#define WEBRTC_API_AUDIO_CODEC_AUDIO_DECODER_H_ |
| #include <memory> |
| #include <vector> |
| @@ -22,14 +22,9 @@ |
| namespace webrtc { |
| -// This is the interface class for decoders in NetEQ. Each codec type will have |
| -// and implementation of this class. |
| class AudioDecoder { |
| public: |
| - enum SpeechType { |
| - kSpeech = 1, |
| - kComfortNoise = 2 |
| - }; |
| + enum SpeechType { kSpeech = 1, kComfortNoise = 2 }; |
|
ossu
2017/02/01 15:05:26
I think these should be left as-is, i.e. one-per-l
kwiberg-webrtc
2017/02/01 20:15:02
Since I moved this file, "git cl format" considere
ossu
2017/02/06 12:54:16
Yeah, I figured that might've been the case.
I've
kwiberg-webrtc
2017/02/06 14:19:36
Fair enough. If a human really cares, that human s
ossu
2017/02/06 14:44:06
Thanks! :)
kwiberg-webrtc
2017/02/09 20:08:30
Aha! If I add a trailing comma just before the clo
|
| // Used by PacketDuration below. Save the value -1 for errors. |
| enum { kNotImplemented = -2 }; |
| @@ -176,4 +171,4 @@ class AudioDecoder { |
| }; |
| } // namespace webrtc |
| -#endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_AUDIO_DECODER_H_ |
| +#endif // WEBRTC_API_AUDIO_CODEC_AUDIO_DECODER_H_ |