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

Side by Side Diff: webrtc/modules/audio_coding/neteq/neteq_decoder_enum.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_MODULES_AUDIO_CODING_NETEQ_NETEQ_DECODER_ENUM_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_DECODER_ENUM_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_DECODER_ENUM_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_DECODER_ENUM_H_
13 13
14 #include "webrtc/api/audio_codecs/audio_format.h" 14 #include "webrtc/api/audio_codecs/audio_format.h"
15 #include "webrtc/rtc_base/optional.h" 15 #include "webrtc/api/optional.h"
16 16
17 namespace webrtc { 17 namespace webrtc {
18 18
19 enum class NetEqDecoder { 19 enum class NetEqDecoder {
20 kDecoderPCMu, 20 kDecoderPCMu,
21 kDecoderPCMa, 21 kDecoderPCMa,
22 kDecoderPCMu_2ch, 22 kDecoderPCMu_2ch,
23 kDecoderPCMa_2ch, 23 kDecoderPCMa_2ch,
24 kDecoderILBC, 24 kDecoderILBC,
25 kDecoderISAC, 25 kDecoderISAC,
(...skipping 21 matching lines...) Expand all
47 kDecoderArbitrary, 47 kDecoderArbitrary,
48 kDecoderOpus, 48 kDecoderOpus,
49 kDecoderOpus_2ch, 49 kDecoderOpus_2ch,
50 }; 50 };
51 51
52 rtc::Optional<SdpAudioFormat> NetEqDecoderToSdpAudioFormat(NetEqDecoder nd); 52 rtc::Optional<SdpAudioFormat> NetEqDecoderToSdpAudioFormat(NetEqDecoder nd);
53 53
54 } // namespace webrtc 54 } // namespace webrtc
55 55
56 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_DECODER_ENUM_H_ 56 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_DECODER_ENUM_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/include/neteq.h ('k') | webrtc/modules/audio_coding/neteq/neteq_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698