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

Side by Side Diff: webrtc/modules/audio_coding/neteq/include/neteq.h

Issue 2272963002: NetEq: Don't check sample rate and frame size upon error (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 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
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/neteq/neteq_impl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 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 147 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 // type, i.e. they cannot have DTMF or CNG payload type, nor a codec change 158 // type, i.e. they cannot have DTMF or CNG payload type, nor a codec change
159 // can be implied by inserting a sync-packet. 159 // can be implied by inserting a sync-packet.
160 // Returns kOk on success, kFail on failure. 160 // Returns kOk on success, kFail on failure.
161 virtual int InsertSyncPacket(const WebRtcRTPHeader& rtp_header, 161 virtual int InsertSyncPacket(const WebRtcRTPHeader& rtp_header,
162 uint32_t receive_timestamp) = 0; 162 uint32_t receive_timestamp) = 0;
163 163
164 // Instructs NetEq to deliver 10 ms of audio data. The data is written to 164 // Instructs NetEq to deliver 10 ms of audio data. The data is written to
165 // |audio_frame|. All data in |audio_frame| is wiped; |data_|, |speech_type_|, 165 // |audio_frame|. All data in |audio_frame| is wiped; |data_|, |speech_type_|,
166 // |num_channels_|, |sample_rate_hz_|, |samples_per_channel_|, and 166 // |num_channels_|, |sample_rate_hz_|, |samples_per_channel_|, and
167 // |vad_activity_| are updated upon success. If an error is returned, some 167 // |vad_activity_| are updated upon success. If an error is returned, some
168 // fields may not have been updated. 168 // fields may not have been updated, or may contain inconsistent values.
169 // If muted state is enabled (through Config::enable_muted_state), |muted| 169 // If muted state is enabled (through Config::enable_muted_state), |muted|
170 // may be set to true after a prolonged expand period. When this happens, the 170 // may be set to true after a prolonged expand period. When this happens, the
171 // |data_| in |audio_frame| is not written, but should be interpreted as being 171 // |data_| in |audio_frame| is not written, but should be interpreted as being
172 // all zeros. 172 // all zeros.
173 // Returns kOK on success, or kFail in case of an error. 173 // Returns kOK on success, or kFail in case of an error.
174 virtual int GetAudio(AudioFrame* audio_frame, bool* muted) = 0; 174 virtual int GetAudio(AudioFrame* audio_frame, bool* muted) = 0;
175 175
176 // Associates |rtp_payload_type| with |codec| and |codec_name|, and stores the 176 // Associates |rtp_payload_type| with |codec| and |codec_name|, and stores the
177 // information in the codec database. Returns 0 on success, -1 on failure. 177 // information in the codec database. Returns 0 on success, -1 on failure.
178 // The name is only used to provide information back to the caller about the 178 // The name is only used to provide information back to the caller about the
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 301
302 protected: 302 protected:
303 NetEq() {} 303 NetEq() {}
304 304
305 private: 305 private:
306 RTC_DISALLOW_COPY_AND_ASSIGN(NetEq); 306 RTC_DISALLOW_COPY_AND_ASSIGN(NetEq);
307 }; 307 };
308 308
309 } // namespace webrtc 309 } // namespace webrtc
310 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_INCLUDE_NETEQ_H_ 310 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_INCLUDE_NETEQ_H_
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_coding/neteq/neteq_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698