Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / media / cast / receiver / cast_receiver_impl.cc

diff --git a/src/media/cast/receiver/cast_receiver_impl.cc b/src/media/cast/receiver/cast_receiver_impl.cc
index 7cff354..91821bb 100644 (file)
--- a/src/media/cast/receiver/cast_receiver_impl.cc
+++ b/src/media/cast/receiver/cast_receiver_impl.cc
@@ -10,6 +10,7 @@
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
+#include "media/cast/net/rtcp/rtcp_receiver.h"
 #include "media/cast/receiver/audio_decoder.h"
 #include "media/cast/receiver/video_decoder.h"
 
@@ -20,7 +21,7 @@ scoped_ptr<CastReceiver> CastReceiver::Create(
     scoped_refptr<CastEnvironment> cast_environment,
     const FrameReceiverConfig& audio_config,
     const FrameReceiverConfig& video_config,
-    transport::PacketSender* const packet_sender) {
+    PacketSender* const packet_sender) {
   return scoped_ptr<CastReceiver>(new CastReceiverImpl(
       cast_environment, audio_config, video_config, packet_sender));
 }
@@ -29,7 +30,7 @@ CastReceiverImpl::CastReceiverImpl(
     scoped_refptr<CastEnvironment> cast_environment,
     const FrameReceiverConfig& audio_config,
     const FrameReceiverConfig& video_config,
-    transport::PacketSender* const packet_sender)
+    PacketSender* const packet_sender)
     : cast_environment_(cast_environment),
       pacer_(cast_environment->Clock(),
              cast_environment->Logging(),
@@ -41,8 +42,8 @@ CastReceiverImpl::CastReceiverImpl(
       ssrc_of_video_sender_(video_config.incoming_ssrc),
       num_audio_channels_(audio_config.channels),
       audio_sampling_rate_(audio_config.frequency),
-      audio_codec_(audio_config.codec.audio),
-      video_codec_(video_config.codec.video) {}
+      audio_codec_(audio_config.codec),
+      video_codec_(video_config.codec) {}
 
 CastReceiverImpl::~CastReceiverImpl() {}
 
@@ -51,8 +52,8 @@ void CastReceiverImpl::DispatchReceivedPacket(scoped_ptr<Packet> packet) {
   const size_t length = packet->size();
 
   uint32 ssrc_of_sender;
-  if (Rtcp::IsRtcpPacket(data, length)) {
-    ssrc_of_sender = Rtcp::GetSsrcOfSender(data, length);
+  if (RtcpReceiver::IsRtcpPacket(data, length)) {
+    ssrc_of_sender = RtcpReceiver::GetSsrcOfSender(data, length);
   } else if (!FrameReceiver::ParseSenderSsrc(data, length, &ssrc_of_sender)) {
     VLOG(1) << "Invalid RTP packet.";
     return;
@@ -76,7 +77,7 @@ void CastReceiverImpl::DispatchReceivedPacket(scoped_ptr<Packet> packet) {
                  base::Passed(&packet)));
 }
 
-transport::PacketReceiverCallback CastReceiverImpl::packet_receiver() {
+PacketReceiverCallback CastReceiverImpl::packet_receiver() {
   return base::Bind(&CastReceiverImpl::DispatchReceivedPacket,
                     // TODO(miu): This code structure is dangerous, since the
                     // callback could be stored and then invoked after
@@ -122,7 +123,7 @@ void CastReceiverImpl::RequestEncodedVideoFrame(
 
 void CastReceiverImpl::DecodeEncodedAudioFrame(
     const AudioFrameDecodedCallback& callback,
-    scoped_ptr<transport::EncodedFrame> encoded_frame) {
+    scoped_ptr<EncodedFrame> encoded_frame) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   if (!encoded_frame) {
     callback.Run(make_scoped_ptr<AudioBus>(NULL), base::TimeTicks(), false);
@@ -150,7 +151,7 @@ void CastReceiverImpl::DecodeEncodedAudioFrame(
 
 void CastReceiverImpl::DecodeEncodedVideoFrame(
     const VideoFrameDecodedCallback& callback,
-    scoped_ptr<transport::EncodedFrame> encoded_frame) {
+    scoped_ptr<EncodedFrame> encoded_frame) {
   DCHECK(cast_environment_->CurrentlyOn(CastEnvironment::MAIN));
   if (!encoded_frame) {
     callback.Run(