admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove deprecated AddTrack/RemoveTrack functions on MediaStream.

Browse Source 
These have been deprecated since 2022.

Bug: None
Change-Id: I8340750f67e57c37601754345c679062c3c23436
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/364283
Commit-Queue: Harald Alvestrand <hta@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#43122}
This commit is contained in:
Harald Alvestrand 2024-10-01 07:24:06 +00:00 committed by WebRTC LUCI CQ
parent f88236066e
commit d9e9a7bc83
2 changed files with 0 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
api/media_stream_interface.h
View File

@ -351,23 +351,6 @@ class MediaStreamInterface : public webrtc::RefCountInterface,
virtual bool RemoveTrack(rtc::scoped_refptr<VideoTrackInterface> track) { virtual bool RemoveTrack(rtc::scoped_refptr<VideoTrackInterface> track) {
RTC_CHECK_NOTREACHED(); RTC_CHECK_NOTREACHED();
} }
// Deprecated: Should use scoped_refptr versions rather than pointers.
[[deprecated("Pass a scoped_refptr")]] virtual bool AddTrack(
AudioTrackInterface* track) {
return AddTrack(rtc::scoped_refptr<AudioTrackInterface>(track));
}
[[deprecated("Pass a scoped_refptr")]] virtual bool AddTrack(
VideoTrackInterface* track) {
return AddTrack(rtc::scoped_refptr<VideoTrackInterface>(track));
}
[[deprecated("Pass a scoped_refptr")]] virtual bool RemoveTrack(
AudioTrackInterface* track) {
return RemoveTrack(rtc::scoped_refptr<AudioTrackInterface>(track));
}
[[deprecated("Pass a scoped_refptr")]] virtual bool RemoveTrack(
VideoTrackInterface* track) {
return RemoveTrack(rtc::scoped_refptr<VideoTrackInterface>(track));
}
protected: protected:
~MediaStreamInterface() override = default; ~MediaStreamInterface() override = default;

5
api/test/mock_media_stream_interface.h
View File

@ -116,11 +116,6 @@ class MockMediaStream : public MediaStreamInterface {
RemoveTrack, RemoveTrack,
(rtc::scoped_refptr<VideoTrackInterface> track), (rtc::scoped_refptr<VideoTrackInterface> track),
(override)); (override));
// Old AddTrack/RemoveTrack methods - slated for removal
MOCK_METHOD(bool, AddTrack, (AudioTrackInterface * track), (override));
MOCK_METHOD(bool, AddTrack, (VideoTrackInterface * track), (override));
MOCK_METHOD(bool, RemoveTrack, (AudioTrackInterface * track), (override));
MOCK_METHOD(bool, RemoveTrack, (VideoTrackInterface * track), (override));
MOCK_METHOD(void, MOCK_METHOD(void,
RegisterObserver, RegisterObserver,
(ObserverInterface * observer), (ObserverInterface * observer),