Commit 339cbc30 authored by Jose Lopes's avatar Jose Lopes Committed by Commit Bot

media: Migrate PacketReceiverCallback to repeating callback.

This callback is run as part of an event handler:
* https://cs.chromium.org/chromium/src/chrome/renderer/media/cast_transport_ipc.cc?rcl=9de1b156267c48a11dcd12948c1ab7bfe81fd008&l=174

which in turn is called by an IPC handler:
* https://cs.chromium.org/chromium/src/chrome/renderer/media/cast_ipc_dispatcher.cc?rcl=9de1b156267c48a11dcd12948c1ab7bfe81fd008&l=139

registered in:
* https://cs.chromium.org/chromium/src/chrome/renderer/media/cast_ipc_dispatcher.cc?rcl=9de1b156267c48a11dcd12948c1ab7bfe81fd008&l=57

This is part of the base::Callback migration.

Context: https://cs.chromium.org/chromium/src/docs/callback.md?rcl=9fcc3764aea8f97e9f6de4a9ee61d554e67edcda&l=40

Bug: 714018
Change-Id: I3ae9158ba5186a5cf686d877845fb3d23090488c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2073722
Commit-Queue: Jose Lopes <jabolopes@google.com>
Reviewed-by: default avatardanakj <danakj@chromium.org>
Reviewed-by: default avatarXiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#745409}
parent f0755d55
......@@ -76,8 +76,8 @@ void CastSessionDelegateBase::StartUDP(
// destruction of CastTransportIPC, and they both share the same thread.
cast_transport_ = std::make_unique<CastTransportIPC>(
local_endpoint, remote_endpoint, std::move(options),
base::Bind(&CastSessionDelegateBase::ReceivePacket,
base::Unretained(this)),
base::BindRepeating(&CastSessionDelegateBase::ReceivePacket,
base::Unretained(this)),
base::BindRepeating(&CastSessionDelegateBase::StatusNotificationCB,
base::Unretained(this), error_callback),
base::BindRepeating(
......
......@@ -18,11 +18,11 @@ CastTransportIPC::CastTransportIPC(
const net::IPEndPoint& local_end_point,
const net::IPEndPoint& remote_end_point,
std::unique_ptr<base::DictionaryValue> options,
const media::cast::PacketReceiverCallback& packet_callback,
media::cast::PacketReceiverCallback packet_callback,
media::cast::CastTransportStatusCallback status_callback,
BulkRawEventsCallback raw_events_cb)
: channel_id_(-1),
packet_callback_(packet_callback),
packet_callback_(std::move(packet_callback)),
status_callback_(std::move(status_callback)),
raw_events_callback_(std::move(raw_events_cb)) {
if (CastIPCDispatcher::Get()) {
......
......@@ -30,7 +30,7 @@ class CastTransportIPC : public media::cast::CastTransport {
CastTransportIPC(const net::IPEndPoint& local_end_point,
const net::IPEndPoint& remote_end_point,
std::unique_ptr<base::DictionaryValue> options,
const media::cast::PacketReceiverCallback& packet_callback,
media::cast::PacketReceiverCallback packet_callback,
media::cast::CastTransportStatusCallback status_callback,
BulkRawEventsCallback raw_events_cb);
......
......@@ -115,8 +115,8 @@ struct EncodedFrame {
std::string data;
};
typedef base::Callback<void(std::unique_ptr<Packet> packet)>
PacketReceiverCallback;
using PacketReceiverCallback =
base::RepeatingCallback<void(std::unique_ptr<Packet> packet)>;
typedef base::Callback<bool(std::unique_ptr<Packet> packet)>
PacketReceiverCallbackWithStatus;
......
......@@ -10,6 +10,7 @@
#include <utility>
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/single_thread_task_runner.h"
#include "build/build_config.h"
#include "media/cast/net/cast_transport_defines.h"
......@@ -44,7 +45,7 @@ std::unique_ptr<CastTransport> CastTransport::Create(
}
PacketReceiverCallback CastTransport::PacketReceiverForTesting() {
return PacketReceiverCallback();
return base::NullCallback();
}
class CastTransportImpl::RtcpClient : public RtcpObserver {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment