zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "introduce an unsupported content description type"

Browse Source 
This reverts commit 239f92ecf7fc8ca27e0376dd192b33ce33377b3c.

Reason for revert: Breaks downstream projects.

Original change's description:
> introduce an unsupported content description type
>
> This carries around unsupported content descriptions
> (i.e. things where webrtc does not understand the media type
> or protocol) in a special data type so that a rejected content or
> mediasection is added to the answer SDP.
>
> BUG=webrtc:3513
>
> Change-Id: Ifc4168eae11e899f2504649de5e1eecb6801a9fb
> Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/179082
> Reviewed-by: Kári Helgason <kthelgason@webrtc.org>
> Reviewed-by: Harald Alvestrand <hta@webrtc.org>
> Commit-Queue: Philipp Hancke <philipp.hancke@googlemail.com>
> Cr-Commit-Position: refs/heads/master@{#32410}

TBR=kthelgason@webrtc.org,hta@webrtc.org,philipp.hancke@googlemail.com

Change-Id: I055fe001fe2757d79be7c304eccc43a8e3104f69
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: webrtc:3513
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/188581
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Commit-Queue: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32411}
This commit is contained in:
Ilya Nikolaevskiy
2020-10-15 10:02:53 +00:00
committed by Commit Bot
parent 239f92ecf7
commit ad2ec76387
14 changed files with 29 additions and 291 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sdk/objc/api/peerconnection/RTCRtpCodecParameters.mm
View File

@ -62,9 +62,6 @@ const NSString * const kRTCH264CodecName = @(cricket::kH264CodecName);
case cricket::MEDIA_TYPE_DATA:
RTC_NOTREACHED();
break;
case cricket::MEDIA_TYPE_UNSUPPORTED:
RTC_NOTREACHED();
break;
}
if (nativeParameters.clock_rate) {
_clockRate = [NSNumber numberWithInt:*nativeParameters.clock_rate];

1
sdk/objc/api/peerconnection/RTCRtpReceiver.h
View File

@ -21,7 +21,6 @@ typedef NS_ENUM(NSInteger, RTCRtpMediaType) {
RTCRtpMediaTypeAudio,
RTCRtpMediaTypeVideo,
RTCRtpMediaTypeData,
RTCRtpMediaTypeUnsupported,
};
@class RTC_OBJC_TYPE(RTCRtpReceiver);

6
sdk/objc/api/peerconnection/RTCRtpReceiver.mm
View File

@ -125,8 +125,6 @@ void RtpReceiverDelegateAdapter::OnFirstPacketReceived(
return RTCRtpMediaTypeVideo;
case cricket::MEDIA_TYPE_DATA:
return RTCRtpMediaTypeData;
case cricket::MEDIA_TYPE_UNSUPPORTED:
return RTCRtpMediaTypeUnsupported;
}
}
@ -138,8 +136,6 @@ void RtpReceiverDelegateAdapter::OnFirstPacketReceived(
return cricket::MEDIA_TYPE_VIDEO;
case RTCRtpMediaTypeData:
return cricket::MEDIA_TYPE_DATA;
case RTCRtpMediaTypeUnsupported:
return cricket::MEDIA_TYPE_UNSUPPORTED;
}
}
@ -151,8 +147,6 @@ void RtpReceiverDelegateAdapter::OnFirstPacketReceived(
return @"VIDEO";
case RTCRtpMediaTypeData:
return @"DATA";
case RTCRtpMediaTypeUnsupported:
return @"UNSUPPORTED";
}
}