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

Unified Diff: media/cast/receiver/cast_receiver_impl.h

Issue 388663003: Cast: Reshuffle files under media/cast (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missing includes Created 6 years, 5 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/receiver/audio_decoder_unittest.cc ('k') | media/cast/receiver/cast_receiver_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/cast/receiver/cast_receiver_impl.h
diff --git a/media/cast/receiver/cast_receiver_impl.h b/media/cast/receiver/cast_receiver_impl.h
index 693fd283611a33f071bc1174366609df131b951d..3443561257616e170de203503dba27ff4f9ee315 100644
--- a/media/cast/receiver/cast_receiver_impl.h
+++ b/media/cast/receiver/cast_receiver_impl.h
@@ -10,8 +10,8 @@
#include "media/cast/cast_config.h"
#include "media/cast/cast_environment.h"
#include "media/cast/cast_receiver.h"
+#include "media/cast/net/pacing/paced_sender.h"
#include "media/cast/receiver/frame_receiver.h"
-#include "media/cast/transport/pacing/paced_sender.h"
namespace media {
namespace cast {
@@ -27,12 +27,12 @@ class CastReceiverImpl : public CastReceiver {
CastReceiverImpl(scoped_refptr<CastEnvironment> cast_environment,
const FrameReceiverConfig& audio_config,
const FrameReceiverConfig& video_config,
- transport::PacketSender* const packet_sender);
+ PacketSender* const packet_sender);
virtual ~CastReceiverImpl();
// CastReceiver implementation.
- virtual transport::PacketReceiverCallback packet_receiver() OVERRIDE;
+ virtual PacketReceiverCallback packet_receiver() OVERRIDE;
virtual void RequestDecodedAudioFrame(
const AudioFrameDecodedCallback& callback) OVERRIDE;
virtual void RequestEncodedAudioFrame(
@@ -51,13 +51,13 @@ class CastReceiverImpl : public CastReceiver {
// uses this as a callback for RequestEncodedAudioFrame().
void DecodeEncodedAudioFrame(
const AudioFrameDecodedCallback& callback,
- scoped_ptr<transport::EncodedFrame> encoded_frame);
+ scoped_ptr<EncodedFrame> encoded_frame);
// Feeds an EncodedFrame into |video_decoder_|. RequestDecodedVideoFrame()
// uses this as a callback for RequestEncodedVideoFrame().
void DecodeEncodedVideoFrame(
const VideoFrameDecodedCallback& callback,
- scoped_ptr<transport::EncodedFrame> encoded_frame);
+ scoped_ptr<EncodedFrame> encoded_frame);
// Receives an AudioBus from |audio_decoder_|, logs the event, and passes the
// data on by running the given |callback|. This method is static to ensure
@@ -88,7 +88,7 @@ class CastReceiverImpl : public CastReceiver {
bool is_continuous);
const scoped_refptr<CastEnvironment> cast_environment_;
- transport::PacedSender pacer_;
+ PacedSender pacer_;
FrameReceiver audio_receiver_;
FrameReceiver video_receiver_;
@@ -102,8 +102,8 @@ class CastReceiverImpl : public CastReceiver {
// the internal software-based decoders.
const int num_audio_channels_;
const int audio_sampling_rate_;
- const transport::Codec audio_codec_;
- const transport::Codec video_codec_;
+ const Codec audio_codec_;
+ const Codec video_codec_;
// Created on-demand to decode frames from |audio_receiver_| into AudioBuses
// for playback.
« no previous file with comments | « media/cast/receiver/audio_decoder_unittest.cc ('k') | media/cast/receiver/cast_receiver_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698