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

Side by Side Diff: webrtc/api/audio_codecs/g711/audio_decoder_g711.h

Issue 3011943002: Move optional.h to webrtc/api/ (Closed)
Patch Set: Created 3 years, 3 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2017 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
11 #ifndef WEBRTC_API_AUDIO_CODECS_G711_AUDIO_DECODER_G711_H_ 11 #ifndef WEBRTC_API_AUDIO_CODECS_G711_AUDIO_DECODER_G711_H_
12 #define WEBRTC_API_AUDIO_CODECS_G711_AUDIO_DECODER_G711_H_ 12 #define WEBRTC_API_AUDIO_CODECS_G711_AUDIO_DECODER_G711_H_
13 13
14 #include <memory> 14 #include <memory>
15 #include <vector> 15 #include <vector>
16 16
17 #include "webrtc/api/audio_codecs/audio_decoder.h" 17 #include "webrtc/api/audio_codecs/audio_decoder.h"
18 #include "webrtc/api/audio_codecs/audio_format.h" 18 #include "webrtc/api/audio_codecs/audio_format.h"
19 #include "webrtc/rtc_base/optional.h" 19 #include "webrtc/api/optional.h"
20 20
21 namespace webrtc { 21 namespace webrtc {
22 22
23 // G711 decoder API for use as a template parameter to 23 // G711 decoder API for use as a template parameter to
24 // CreateAudioDecoderFactory<...>(). 24 // CreateAudioDecoderFactory<...>().
25 // 25 //
26 // NOTE: This struct is still under development and may change without notice. 26 // NOTE: This struct is still under development and may change without notice.
27 struct AudioDecoderG711 { 27 struct AudioDecoderG711 {
28 struct Config { 28 struct Config {
29 enum class Type { kPcmU, kPcmA }; 29 enum class Type { kPcmU, kPcmA };
30 bool IsOk() const { 30 bool IsOk() const {
31 return (type == Type::kPcmU || type == Type::kPcmA) && num_channels >= 1; 31 return (type == Type::kPcmU || type == Type::kPcmA) && num_channels >= 1;
32 } 32 }
33 Type type; 33 Type type;
34 int num_channels; 34 int num_channels;
35 }; 35 };
36 static rtc::Optional<Config> SdpToConfig(const SdpAudioFormat& audio_format); 36 static rtc::Optional<Config> SdpToConfig(const SdpAudioFormat& audio_format);
37 static void AppendSupportedDecoders(std::vector<AudioCodecSpec>* specs); 37 static void AppendSupportedDecoders(std::vector<AudioCodecSpec>* specs);
38 static std::unique_ptr<AudioDecoder> MakeAudioDecoder(const Config& config); 38 static std::unique_ptr<AudioDecoder> MakeAudioDecoder(const Config& config);
39 }; 39 };
40 40
41 } // namespace webrtc 41 } // namespace webrtc
42 42
43 #endif // WEBRTC_API_AUDIO_CODECS_G711_AUDIO_DECODER_G711_H_ 43 #endif // WEBRTC_API_AUDIO_CODECS_G711_AUDIO_DECODER_G711_H_
OLDNEW
« no previous file with comments | « webrtc/api/audio_codecs/g711/BUILD.gn ('k') | webrtc/api/audio_codecs/g711/audio_encoder_g711.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698