Chromium Code Reviews| Index: webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc |
| diff --git a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc |
| index bd7bd1b82e49bbd1d3ac1eb6747ebe34dfe4923e..a8819cc9323f52315907e110496697f91f519f99 100644 |
| --- a/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc |
| +++ b/webrtc/modules/rtp_rtcp/source/rtp_receiver_impl.cc |
| @@ -276,12 +276,11 @@ void RtpReceiverImpl::CheckSSRCChanged(const RTPHeader& rtp_header) { |
| if (rtp_header.payloadType == last_received_payload_type) { |
| re_initialize_decoder = true; |
| - Payload* payload; |
| - if (!rtp_payload_registry_->PayloadTypeToPayload( |
| - rtp_header.payloadType, payload)) { |
| + const Payload* payload = rtp_payload_registry_->PayloadTypeToPayload( |
| + rtp_header.payloadType); |
| + if (payload == nullptr) { |
|
mflodman
2015/12/09 09:19:13
Same for the check here and below.
danilchap
2015/12/09 11:23:36
Done.
|
| return; |
| } |
| - assert(payload); |
| payload_name[RTP_PAYLOAD_NAME_SIZE - 1] = 0; |
| strncpy(payload_name, payload->name, RTP_PAYLOAD_NAME_SIZE - 1); |
| if (payload->audio) { |
| @@ -365,12 +364,12 @@ int32_t RtpReceiverImpl::CheckPayloadChanged(const RTPHeader& rtp_header, |
| return 0; |
| } |
| - Payload* payload; |
| - if (!rtp_payload_registry_->PayloadTypeToPayload(payload_type, payload)) { |
| + const Payload* payload = |
| + rtp_payload_registry_->PayloadTypeToPayload(payload_type); |
| + if (payload == nullptr) { |
| // Not a registered payload type. |
| return -1; |
| } |
| - assert(payload); |
| payload_name[RTP_PAYLOAD_NAME_SIZE - 1] = 0; |
| strncpy(payload_name, payload->name, RTP_PAYLOAD_NAME_SIZE - 1); |