Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / media / cast / cast_config.h

diff --git a/src/media/cast/cast_config.h b/src/media/cast/cast_config.h
index 88bbdbc..7172f68 100644 (file)
--- a/src/media/cast/cast_config.h
+++ b/src/media/cast/cast_config.h
@@ -30,7 +30,7 @@ enum RtcpMode {
 struct AudioSenderConfig {
   AudioSenderConfig();
 
-  uint32 sender_ssrc;
+  // The sender ssrc is in rtp_config.ssrc.
   uint32 incoming_feedback_ssrc;
 
   int rtcp_interval;
@@ -49,7 +49,7 @@ struct AudioSenderConfig {
 struct VideoSenderConfig {
   VideoSenderConfig();
 
-  uint32 sender_ssrc;
+  // The sender ssrc is in rtp_config.ssrc.
   uint32 incoming_feedback_ssrc;
 
   int rtcp_interval;
@@ -71,7 +71,7 @@ struct VideoSenderConfig {
   int max_frame_rate;
   int max_number_of_video_buffers_used;  // Max value depend on codec.
   transport::VideoCodec codec;
-  int number_of_cores;
+  int number_of_encode_threads;
 };
 
 struct AudioReceiverConfig {
@@ -123,17 +123,6 @@ struct VideoReceiverConfig {
   std::string aes_iv_mask;  // Binary string of size kAesKeySize.
 };
 
-// DEPRECATED: Do not use in new code.  Please migrate existing code to use
-// media::AudioBus.
-struct PcmAudioFrame {
-  PcmAudioFrame();
-  ~PcmAudioFrame();
-
-  int channels;  // Samples in interleaved stereo format. L0, R0, L1 ,R1 ,...
-  int frequency;
-  std::vector<int16> samples;
-};
-
 // import from media::cast::transport
 typedef transport::Packet Packet;
 typedef transport::PacketList PacketList;