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

Unified Diff: media/cast/transport/cast_transport_config.h

Issue 138753004: Cast: IPC glue between cast library transport and encoders. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: added rtp statistics callbacks Created 6 years, 10 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
Index: media/cast/transport/cast_transport_config.h
diff --git a/media/cast/transport/cast_transport_config.h b/media/cast/transport/cast_transport_config.h
index 2461df470d9672031cdf1027ada396368b062505..b96bd63b49b38edffdece8255d47089a27e09449 100644
--- a/media/cast/transport/cast_transport_config.h
+++ b/media/cast/transport/cast_transport_config.h
@@ -11,6 +11,7 @@
#include "base/basictypes.h"
#include "base/callback.h"
#include "base/memory/ref_counted.h"
+#include "media/base/media_export.h"
#include "media/cast/transport/cast_transport_defines.h"
#include "net/base/ip_endpoint.h"
@@ -34,14 +35,14 @@ enum AudioCodec {
kExternalAudio,
};
-struct RtpConfig {
+struct MEDIA_EXPORT RtpConfig {
RtpConfig();
int history_ms; // The time RTP packets are stored for retransmissions.
int max_delay_ms;
int payload_type;
};
-struct CastTransportConfig {
+struct MEDIA_EXPORT CastTransportConfig {
CastTransportConfig();
~CastTransportConfig();
@@ -66,7 +67,7 @@ struct CastTransportConfig {
std::string aes_iv_mask; // Binary string of size kAesBlockSize.
};
-struct EncodedVideoFrame {
+struct MEDIA_EXPORT EncodedVideoFrame {
EncodedVideoFrame();
~EncodedVideoFrame();
@@ -77,7 +78,7 @@ struct EncodedVideoFrame {
std::string data;
};
-struct EncodedAudioFrame {
+struct MEDIA_EXPORT EncodedAudioFrame {
EncodedAudioFrame();
~EncodedAudioFrame();
@@ -114,16 +115,16 @@ enum RtcpSenderFrameStatus {
kRtcpSenderFrameStatusSentToNetwork = 3,
};
-struct RtcpSenderFrameLogMessage {
+struct MEDIA_EXPORT RtcpSenderFrameLogMessage {
RtcpSenderFrameLogMessage();
~RtcpSenderFrameLogMessage();
RtcpSenderFrameStatus frame_status;
uint32 rtp_timestamp;
};
-typedef std::list<RtcpSenderFrameLogMessage> RtcpSenderLogMessage;
+typedef std::vector<RtcpSenderFrameLogMessage> RtcpSenderLogMessage;
-struct RtcpSenderInfo {
+struct MEDIA_EXPORT RtcpSenderInfo {
RtcpSenderInfo();
~RtcpSenderInfo();
// First three members are used for lipsync.
@@ -148,13 +149,23 @@ struct RtcpReportBlock {
uint32 delay_since_last_sr;
};
-struct RtcpDlrrReportBlock {
+struct MEDIA_EXPORT RtcpDlrrReportBlock {
RtcpDlrrReportBlock();
~RtcpDlrrReportBlock();
uint32 last_rr;
uint32 delay_since_last_rr;
};
+// This is only needed because IPC messages don't support more than
+// 5 arguments.
+struct MEDIA_EXPORT SendRtcpFromRtpSenderData {
+ SendRtcpFromRtpSenderData();
+ ~SendRtcpFromRtpSenderData();
+ uint32 packet_type_flags;
+ uint32 sending_ssrc;
+ std::string c_name;
+};
+
inline bool operator==(RtcpSenderInfo lhs, RtcpSenderInfo rhs) {
return lhs.ntp_seconds == rhs.ntp_seconds &&
lhs.ntp_fraction == rhs.ntp_fraction &&

Powered by Google App Engine
This is Rietveld 408576698