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

Remove cricket::SessionDescription::Copy()

Browse Source 
To be submitted on or after March 13, 2020 (2 weeks after PSA).

Bug: webrtc:10701
Change-Id: Ie4b6d31e1496b81714fe9f9418694fc4c2e69ecd
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/169443
Reviewed-by: Karl Wiberg <kwiberg@webrtc.org>
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#30784}
This commit is contained in:
Harald Alvestrand
2020-02-28 11:54:40 +01:00
committed by Commit Bot
parent 4b6ba7c207
commit b97d2fe896
2 changed files with 8 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pc/session_description.h
View File

@ -87,9 +87,6 @@ class MediaContentDescription {
virtual bool has_codecs() const = 0; virtual bool has_codecs() const = 0;
RTC_DEPRECATED virtual MediaContentDescription* Copy() const {
return CloneInternal();
}
// Copy operator that returns an unique_ptr. // Copy operator that returns an unique_ptr.
// Not a virtual function. // Not a virtual function.
// If a type-specific variant of Clone() is desired, override it, or // If a type-specific variant of Clone() is desired, override it, or
@ -349,9 +346,6 @@ class AudioContentDescription : public MediaContentDescriptionImpl<AudioCodec> {
public: public:
AudioContentDescription() {} AudioContentDescription() {}
RTC_DEPRECATED virtual AudioContentDescription* Copy() const {
return CloneInternal();
}
virtual MediaType type() const { return MEDIA_TYPE_AUDIO; } virtual MediaType type() const { return MEDIA_TYPE_AUDIO; }
virtual AudioContentDescription* as_audio() { return this; } virtual AudioContentDescription* as_audio() { return this; }
virtual const AudioContentDescription* as_audio() const { return this; } virtual const AudioContentDescription* as_audio() const { return this; }
@ -364,9 +358,6 @@ class AudioContentDescription : public MediaContentDescriptionImpl<AudioCodec> {
class VideoContentDescription : public MediaContentDescriptionImpl<VideoCodec> { class VideoContentDescription : public MediaContentDescriptionImpl<VideoCodec> {
public: public:
RTC_DEPRECATED virtual VideoContentDescription* Copy() const {
return CloneInternal();
}
virtual MediaType type() const { return MEDIA_TYPE_VIDEO; } virtual MediaType type() const { return MEDIA_TYPE_VIDEO; }
virtual VideoContentDescription* as_video() { return this; } virtual VideoContentDescription* as_video() { return this; }
virtual const VideoContentDescription* as_video() const { return this; } virtual const VideoContentDescription* as_video() const { return this; }

16
pc/webrtc_sdp_unittest.cc
View File

@ -1195,8 +1195,8 @@ class WebRtcSdpTest : public ::testing::Test {
// Turns the existing reference description into a plan B description, // Turns the existing reference description into a plan B description,
// with 2 audio tracks and 3 video tracks. // with 2 audio tracks and 3 video tracks.
void MakePlanBDescription() { void MakePlanBDescription() {
audio_desc_ = audio_desc_->Copy(); audio_desc_ = new AudioContentDescription(*audio_desc_);
video_desc_ = video_desc_->Copy(); video_desc_ = new VideoContentDescription(*video_desc_);
StreamParams audio_track_2; StreamParams audio_track_2;
audio_track_2.id = kAudioTrackId2; audio_track_2.id = kAudioTrackId2;
@ -1713,8 +1713,8 @@ class WebRtcSdpTest : public ::testing::Test {
} }
void AddExtmap(bool encrypted) { void AddExtmap(bool encrypted) {
audio_desc_ = audio_desc_->Copy(); audio_desc_ = new AudioContentDescription(*audio_desc_);
video_desc_ = video_desc_->Copy(); video_desc_ = new VideoContentDescription(*video_desc_);
audio_desc_->AddRtpHeaderExtension( audio_desc_->AddRtpHeaderExtension(
RtpExtension(kExtmapUri, kExtmapId, encrypted)); RtpExtension(kExtmapUri, kExtmapId, encrypted));
video_desc_->AddRtpHeaderExtension( video_desc_->AddRtpHeaderExtension(
@ -1794,8 +1794,8 @@ class WebRtcSdpTest : public ::testing::Test {
} }
bool TestSerializeRejected(bool audio_rejected, bool video_rejected) { bool TestSerializeRejected(bool audio_rejected, bool video_rejected) {
audio_desc_ = audio_desc_->Copy(); audio_desc_ = new AudioContentDescription(*audio_desc_);
video_desc_ = video_desc_->Copy(); video_desc_ = new VideoContentDescription(*video_desc_);
desc_.RemoveContentByName(kAudioContentName); desc_.RemoveContentByName(kAudioContentName);
desc_.RemoveContentByName(kVideoContentName); desc_.RemoveContentByName(kVideoContentName);
@ -1876,8 +1876,8 @@ class WebRtcSdpTest : public ::testing::Test {
JsepSessionDescription new_jdesc(SdpType::kOffer); JsepSessionDescription new_jdesc(SdpType::kOffer);
EXPECT_TRUE(SdpDeserialize(new_sdp, &new_jdesc)); EXPECT_TRUE(SdpDeserialize(new_sdp, &new_jdesc));
audio_desc_ = audio_desc_->Copy(); audio_desc_ = new AudioContentDescription(*audio_desc_);
video_desc_ = video_desc_->Copy(); video_desc_ = new VideoContentDescription(*video_desc_);
desc_.RemoveContentByName(kAudioContentName); desc_.RemoveContentByName(kAudioContentName);
desc_.RemoveContentByName(kVideoContentName); desc_.RemoveContentByName(kVideoContentName);
desc_.AddContent(kAudioContentName, MediaProtocolType::kRtp, audio_rejected, desc_.AddContent(kAudioContentName, MediaProtocolType::kRtp, audio_rejected,