Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(169)

Unified Diff: media/cast/net/cast_transport_sender_impl.h

Issue 445933002: Cast: Move retransmission to the transport (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fixed test compile Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/cast/net/cast_transport_sender.h ('k') | media/cast/net/cast_transport_sender_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/net/cast_transport_sender_impl.h
diff --git a/media/cast/net/cast_transport_sender_impl.h b/media/cast/net/cast_transport_sender_impl.h
index cee845223cc08177224b78d0509525060faf9d2d..0727852f81ec3165c109185c3dafe1fc6d6f24d4 100644
--- a/media/cast/net/cast_transport_sender_impl.h
+++ b/media/cast/net/cast_transport_sender_impl.h
@@ -25,6 +25,7 @@
#define MEDIA_CAST_NET_CAST_TRANSPORT_IMPL_H_
#include "base/callback.h"
+#include "base/gtest_prod_util.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
@@ -79,15 +80,28 @@ class CastTransportSenderImpl : public CastTransportSender {
base::TimeTicks current_time,
uint32 current_time_as_rtp_timestamp) OVERRIDE;
- virtual void ResendPackets(bool is_audio,
- const MissingFramesAndPacketsMap& missing_packets,
- bool cancel_rtx_if_not_in_list,
- base::TimeDelta dedupe_window)
- OVERRIDE;
+ virtual void CancelSendingFrames(
+ uint32 ssrc,
+ const std::vector<uint32>& frame_ids) OVERRIDE;
+
+ virtual void ResendFrameForKickstart(uint32 ssrc, uint32 frame_id) OVERRIDE;
virtual PacketReceiverCallback PacketReceiverForTesting() OVERRIDE;
private:
+ FRIEND_TEST_ALL_PREFIXES(CastTransportSenderImplTest, NacksCancelRetransmits);
+ FRIEND_TEST_ALL_PREFIXES(CastTransportSenderImplTest, CancelRetransmits);
+ FRIEND_TEST_ALL_PREFIXES(CastTransportSenderImplTest, Kickstart);
+
+ // Resend packets for the stream identified by |ssrc|.
+ // If |cancel_rtx_if_not_in_list| is true then transmission of packets for the
+ // frames but not in the list will be dropped.
+ // If packet was sent after |now - dedupe_window| then it will not be sent.
+ void ResendPackets(uint32 ssrc,
+ const MissingFramesAndPacketsMap& missing_packets,
+ bool cancel_rtx_if_not_in_list,
+ base::TimeDelta dedupe_window);
+
// If |raw_events_callback_| is non-null, calls it with events collected
// by |event_subscriber_| since last call.
void SendRawEvents();
@@ -99,6 +113,11 @@ class CastTransportSenderImpl : public CastTransportSender {
void OnReceivedLogMessage(EventMediaType media_type,
const RtcpReceiverLogMessage& log);
+ // Called when a RTCP Cast message is received.
+ void OnReceivedCastMessage(uint32 ssrc,
+ const RtcpCastMessageCallback& cast_message_cb,
+ const RtcpCastMessage& cast_message);
+
base::TickClock* clock_; // Not owned by this class.
CastTransportStatusCallback status_callback_;
scoped_refptr<base::SingleThreadTaskRunner> transport_task_runner_;
« no previous file with comments | « media/cast/net/cast_transport_sender.h ('k') | media/cast/net/cast_transport_sender_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698