From 30b182aca08ab4374d831d09c2acb34bb964f3bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niels=20M=C3=B6ller?= Date: Tue, 5 Feb 2019 00:59:35 +0100 Subject: [PATCH] New methods for registering network change callbacks in MediaTransport Adds methods AddNetworkChangeCallback and RemoveNetworkChangeCallback, to replace SetNetworkChangeCallback. Needed because both VideoChannel and VoiceChannel register such a callback. This cl is step 1, it just adds the methods to the interface, without calling them. Bug: webrtc:9719 Change-Id: I39f1748706d4369ca71d594ca5e2f1380de5ce66 Reviewed-on: https://webrtc-review.googlesource.com/c/121462 Reviewed-by: Peter Slatala Reviewed-by: Steve Anton Commit-Queue: Peter Slatala Cr-Commit-Position: refs/heads/master@{#26541} --- api/media_transport_interface.cc | 6 ++++++ api/media_transport_interface.h | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/api/media_transport_interface.cc b/api/media_transport_interface.cc index d4f9fd210b..a02356e077 100644 --- a/api/media_transport_interface.cc +++ b/api/media_transport_interface.cc @@ -157,6 +157,12 @@ MediaTransportInterface::GetLatestTargetTransferRate() { void MediaTransportInterface::SetNetworkChangeCallback( MediaTransportNetworkChangeCallback* callback) {} +void MediaTransportInterface::AddNetworkChangeCallback( + MediaTransportNetworkChangeCallback* callback) {} + +void MediaTransportInterface::RemoveNetworkChangeCallback( + MediaTransportNetworkChangeCallback* callback) {} + void MediaTransportInterface::SetFirstAudioPacketReceivedObserver( AudioPacketReceivedObserver* observer) {} diff --git a/api/media_transport_interface.h b/api/media_transport_interface.h index 96b135df4a..ad1f7c6ed3 100644 --- a/api/media_transport_interface.h +++ b/api/media_transport_interface.h @@ -433,8 +433,14 @@ class MediaTransportInterface { // with the current network route. // Before media transport is destroyed, the callback must be unregistered by // setting it to nullptr. + // TODO(nisse): The SetNetworkChangeCallback is being replaced with Add/Remove + // methods, because both video channel and voice channel need to register. virtual void SetNetworkChangeCallback( MediaTransportNetworkChangeCallback* callback); + virtual void AddNetworkChangeCallback( + MediaTransportNetworkChangeCallback* callback); + virtual void RemoveNetworkChangeCallback( + MediaTransportNetworkChangeCallback* callback); // Sets a state observer callback. Before media transport is destroyed, the // callback must be unregistered by setting it to nullptr.