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

Side by Side Diff: webrtc/modules/audio_coding/codecs/isac/audio_decoder_isac_t.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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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_CODECS_ISAC_AUDIO_DECODER_ISAC_T_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_H_
12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_H_ 12 #define WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_H_
13 13
14 #include <vector> 14 #include <vector>
15 15
16 #include "webrtc/api/audio_codecs/audio_decoder.h" 16 #include "webrtc/api/audio_codecs/audio_decoder.h"
17 #include "webrtc/api/optional.h"
17 #include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h" 18 #include "webrtc/modules/audio_coding/codecs/isac/locked_bandwidth_info.h"
18 #include "webrtc/rtc_base/constructormagic.h" 19 #include "webrtc/rtc_base/constructormagic.h"
19 #include "webrtc/rtc_base/optional.h"
20 #include "webrtc/rtc_base/scoped_ref_ptr.h" 20 #include "webrtc/rtc_base/scoped_ref_ptr.h"
21 21
22 namespace webrtc { 22 namespace webrtc {
23 23
24 template <typename T> 24 template <typename T>
25 class AudioDecoderIsacT final : public AudioDecoder { 25 class AudioDecoderIsacT final : public AudioDecoder {
26 public: 26 public:
27 explicit AudioDecoderIsacT(int sample_rate_hz); 27 explicit AudioDecoderIsacT(int sample_rate_hz);
28 AudioDecoderIsacT(int sample_rate_hz, 28 AudioDecoderIsacT(int sample_rate_hz,
29 const rtc::scoped_refptr<LockedIsacBandwidthInfo>& bwinfo); 29 const rtc::scoped_refptr<LockedIsacBandwidthInfo>& bwinfo);
(...skipping 20 matching lines...) Expand all
50 typename T::instance_type* isac_state_; 50 typename T::instance_type* isac_state_;
51 int sample_rate_hz_; 51 int sample_rate_hz_;
52 rtc::scoped_refptr<LockedIsacBandwidthInfo> bwinfo_; 52 rtc::scoped_refptr<LockedIsacBandwidthInfo> bwinfo_;
53 53
54 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderIsacT); 54 RTC_DISALLOW_COPY_AND_ASSIGN(AudioDecoderIsacT);
55 }; 55 };
56 56
57 } // namespace webrtc 57 } // namespace webrtc
58 58
59 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_H_ 59 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_DECODER_ISAC_T_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698