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

Side by Side Diff: webrtc/modules/audio_coding/codecs/isac/audio_encoder_isac_t.h

Issue 1311533010: Remove AudioEncoder methods SetMaxBitrate and SetMaxPayloadSize (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@ifc-merge-2
Patch Set: Created 5 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) 2014 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2014 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
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 int SampleRateHz() const override; 60 int SampleRateHz() const override;
61 int NumChannels() const override; 61 int NumChannels() const override;
62 size_t Num10MsFramesInNextPacket() const override; 62 size_t Num10MsFramesInNextPacket() const override;
63 size_t Max10MsFramesInAPacket() const override; 63 size_t Max10MsFramesInAPacket() const override;
64 int GetTargetBitrate() const override; 64 int GetTargetBitrate() const override;
65 EncodedInfo EncodeInternal(uint32_t rtp_timestamp, 65 EncodedInfo EncodeInternal(uint32_t rtp_timestamp,
66 const int16_t* audio, 66 const int16_t* audio,
67 size_t max_encoded_bytes, 67 size_t max_encoded_bytes,
68 uint8_t* encoded) override; 68 uint8_t* encoded) override;
69 void Reset() override; 69 void Reset() override;
70 void SetMaxPayloadSize(int max_payload_size_bytes) override;
71 void SetMaxBitrate(int max_rate_bps) override;
72 70
73 private: 71 private:
74 // This value is taken from STREAM_SIZE_MAX_60 for iSAC float (60 ms) and 72 // This value is taken from STREAM_SIZE_MAX_60 for iSAC float (60 ms) and
75 // STREAM_MAXW16_60MS for iSAC fix (60 ms). 73 // STREAM_MAXW16_60MS for iSAC fix (60 ms).
76 static const size_t kSufficientEncodeBufferSizeBytes = 400; 74 static const size_t kSufficientEncodeBufferSizeBytes = 400;
77 75
78 static const int kDefaultBitRate = 32000; 76 static const int kDefaultBitRate = 32000;
79 77
80 // Recreate the iSAC encoder instance with the given settings, and save them. 78 // Recreate the iSAC encoder instance with the given settings, and save them.
81 void RecreateEncoderInstance(const Config& config); 79 void RecreateEncoderInstance(const Config& config);
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 private: 120 private:
123 typename T::instance_type* isac_state_; 121 typename T::instance_type* isac_state_;
124 LockedIsacBandwidthInfo* bwinfo_; 122 LockedIsacBandwidthInfo* bwinfo_;
125 int decoder_sample_rate_hz_; 123 int decoder_sample_rate_hz_;
126 124
127 DISALLOW_COPY_AND_ASSIGN(AudioDecoderIsacT); 125 DISALLOW_COPY_AND_ASSIGN(AudioDecoderIsacT);
128 }; 126 };
129 127
130 } // namespace webrtc 128 } // namespace webrtc
131 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_H_ 129 #endif // WEBRTC_MODULES_AUDIO_CODING_CODECS_ISAC_AUDIO_ENCODER_ISAC_T_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698