From c3c29113d1733a4f97ca4b8e212f22f718a876b7 Mon Sep 17 00:00:00 2001 From: "andresp@webrtc.org" Date: Wed, 27 Aug 2014 09:39:43 +0000 Subject: [PATCH] Expose setPayloadType on the rtp_sender. Thus allowing other users of this module to set the payload type to be used without having to call SendOutgoingData. BUG=3694 R=asapersson@webrtc.org Review URL: https://webrtc-codereview.appspot.com/18289004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@6988 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/rtp_rtcp/source/rtp_sender.cc | 7 ++++++- webrtc/modules/rtp_rtcp/source/rtp_sender.h | 2 ++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc index d5bffa9f9..f544db210 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.cc +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.cc @@ -283,6 +283,11 @@ int32_t RTPSender::DeRegisterSendPayload( return 0; } +void RTPSender::SetSendPayloadType(int8_t payload_type) { + CriticalSectionScoped cs(send_critsect_); + payload_type_ = payload_type; +} + int8_t RTPSender::SendPayloadType() const { CriticalSectionScoped cs(send_critsect_); return payload_type_; @@ -385,7 +390,7 @@ int32_t RTPSender::CheckPayloadType(const int8_t payload_type, LOG(LS_WARNING) << "Payload type " << payload_type << " not registered."; return -1; } - payload_type_ = payload_type; + SetSendPayloadType(payload_type); RtpUtility::Payload* payload = it->second; assert(payload); if (!payload->audio && !audio_configured_) { diff --git a/webrtc/modules/rtp_rtcp/source/rtp_sender.h b/webrtc/modules/rtp_rtcp/source/rtp_sender.h index 39bcb0cea..e4d4fca30 100644 --- a/webrtc/modules/rtp_rtcp/source/rtp_sender.h +++ b/webrtc/modules/rtp_rtcp/source/rtp_sender.h @@ -100,6 +100,8 @@ class RTPSender : public RTPSenderInterface, public Bitrate::Observer { int32_t DeRegisterSendPayload(const int8_t payload_type); + void SetSendPayloadType(int8_t payload_type); + int8_t SendPayloadType() const; int SendPayloadFrequency() const;