All users call SetTelephoneEventForwardToDecoder(true). Setting the flag to true on construction, enables deletion of those calls, followed by deletion of the flag itself. The unused getter method TelephoneEventForwardToDecoder() is deleted right away. Bug: webrtc:7135 Change-Id: I8c52c957b3f074be7ffc425b3588402d1e42b844 Reviewed-on: https://webrtc-review.googlesource.com/90402 Reviewed-by: Oskar Sundbom <ossu@webrtc.org> Reviewed-by: Åsa Persson <asapersson@webrtc.org> Commit-Queue: Niels Moller <nisse@webrtc.org> Cr-Commit-Position: refs/heads/master@{#24141}
80 lines
3.0 KiB
C++
80 lines
3.0 KiB
C++
/*
|
|
* Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
|
|
#ifndef MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_
|
|
#define MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_
|
|
|
|
#include <set>
|
|
|
|
#include "modules/rtp_rtcp/include/rtp_receiver.h"
|
|
#include "modules/rtp_rtcp/include/rtp_rtcp_defines.h"
|
|
#include "modules/rtp_rtcp/source/rtp_receiver_strategy.h"
|
|
#include "modules/rtp_rtcp/source/rtp_utility.h"
|
|
#include "rtc_base/onetimeevent.h"
|
|
|
|
namespace webrtc {
|
|
|
|
// Handles audio RTP packets. This class is thread-safe.
|
|
class RTPReceiverAudio : public RTPReceiverStrategy,
|
|
public TelephoneEventHandler {
|
|
public:
|
|
explicit RTPReceiverAudio(RtpData* data_callback);
|
|
~RTPReceiverAudio() override;
|
|
|
|
// The following three methods implement the TelephoneEventHandler interface.
|
|
// Forward DTMFs to decoder for playout.
|
|
void SetTelephoneEventForwardToDecoder(bool forward_to_decoder) override;
|
|
|
|
// Is TelephoneEvent configured with |payload_type|.
|
|
bool TelephoneEventPayloadType(const int8_t payload_type) const override;
|
|
|
|
TelephoneEventHandler* GetTelephoneEventHandler() override;
|
|
|
|
// Returns true if CNG is configured with |payload_type|.
|
|
bool CNGPayloadType(const int8_t payload_type);
|
|
|
|
int32_t ParseRtpPacket(WebRtcRTPHeader* rtp_header,
|
|
const PayloadUnion& specific_payload,
|
|
const uint8_t* packet,
|
|
size_t payload_length,
|
|
int64_t timestamp_ms) override;
|
|
|
|
RTPAliveType ProcessDeadOrAlive(uint16_t last_payload_length) const override;
|
|
|
|
int32_t OnNewPayloadTypeCreated(int payload_type,
|
|
const SdpAudioFormat& audio_format) override;
|
|
|
|
// We need to look out for special payload types here and sometimes reset
|
|
// statistics. In addition we sometimes need to tweak the frequency.
|
|
void CheckPayloadChanged(int8_t payload_type,
|
|
PayloadUnion* specific_payload,
|
|
bool* should_discard_changes) override;
|
|
|
|
private:
|
|
int32_t ParseAudioCodecSpecific(WebRtcRTPHeader* rtp_header,
|
|
const uint8_t* payload_data,
|
|
size_t payload_length,
|
|
const AudioPayload& audio_specific);
|
|
|
|
bool telephone_event_forward_to_decoder_;
|
|
int8_t telephone_event_payload_type_;
|
|
std::set<uint8_t> telephone_event_reported_;
|
|
|
|
int8_t cng_nb_payload_type_;
|
|
int8_t cng_wb_payload_type_;
|
|
int8_t cng_swb_payload_type_;
|
|
int8_t cng_fb_payload_type_;
|
|
|
|
ThreadUnsafeOneTimeEvent first_packet_received_;
|
|
};
|
|
} // namespace webrtc
|
|
|
|
#endif // MODULES_RTP_RTCP_SOURCE_RTP_RECEIVER_AUDIO_H_
|