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

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

Issue 2686043006: WebRtcVoiceMediaChannel::AddRecvStream: Don't call SetRecPayloadType (Closed)
Patch Set: rebase Created 3 years, 9 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) 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 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 // Inserts a new packet into NetEq. The |receive_timestamp| is an indication 104 // Inserts a new packet into NetEq. The |receive_timestamp| is an indication
105 // of the time when the packet was received, and should be measured with 105 // of the time when the packet was received, and should be measured with
106 // the same tick rate as the RTP timestamp of the current payload. 106 // the same tick rate as the RTP timestamp of the current payload.
107 // Returns 0 on success, -1 on failure. 107 // Returns 0 on success, -1 on failure.
108 int InsertPacket(const WebRtcRTPHeader& rtp_header, 108 int InsertPacket(const WebRtcRTPHeader& rtp_header,
109 rtc::ArrayView<const uint8_t> payload, 109 rtc::ArrayView<const uint8_t> payload,
110 uint32_t receive_timestamp) override; 110 uint32_t receive_timestamp) override;
111 111
112 int GetAudio(AudioFrame* audio_frame, bool* muted) override; 112 int GetAudio(AudioFrame* audio_frame, bool* muted) override;
113 113
114 void SetCodecs(const std::map<int, SdpAudioFormat>& codecs) override;
115
114 int RegisterPayloadType(NetEqDecoder codec, 116 int RegisterPayloadType(NetEqDecoder codec,
115 const std::string& codec_name, 117 const std::string& codec_name,
116 uint8_t rtp_payload_type) override; 118 uint8_t rtp_payload_type) override;
117 119
118 int RegisterExternalDecoder(AudioDecoder* decoder, 120 int RegisterExternalDecoder(AudioDecoder* decoder,
119 NetEqDecoder codec, 121 NetEqDecoder codec,
120 const std::string& codec_name, 122 const std::string& codec_name,
121 uint8_t rtp_payload_type) override; 123 uint8_t rtp_payload_type) override;
122 124
123 bool RegisterPayloadType(int rtp_payload_type, 125 bool RegisterPayloadType(int rtp_payload_type,
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 AudioFrame::kVadPassive; 414 AudioFrame::kVadPassive;
413 std::unique_ptr<TickTimer::Stopwatch> generated_noise_stopwatch_ 415 std::unique_ptr<TickTimer::Stopwatch> generated_noise_stopwatch_
414 GUARDED_BY(crit_sect_); 416 GUARDED_BY(crit_sect_);
415 417
416 private: 418 private:
417 RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl); 419 RTC_DISALLOW_COPY_AND_ASSIGN(NetEqImpl);
418 }; 420 };
419 421
420 } // namespace webrtc 422 } // namespace webrtc
421 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_ 423 #endif // WEBRTC_MODULES_AUDIO_CODING_NETEQ_NETEQ_IMPL_H_
OLDNEW
« no previous file with comments | « webrtc/modules/audio_coding/neteq/include/neteq.h ('k') | webrtc/modules/audio_coding/neteq/neteq_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698