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

Unified Diff: trunk/src/media/cast/cast_sender_impl.cc

Issue 25546003: Revert 226264 "Be able to build cast_unittest and related target..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 3 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 | « trunk/src/media/cast/cast_sender_impl.h ('k') | trunk/src/media/cast/cast_thread.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/cast/cast_sender_impl.cc
===================================================================
--- trunk/src/media/cast/cast_sender_impl.cc (revision 226266)
+++ trunk/src/media/cast/cast_sender_impl.cc (working copy)
@@ -55,12 +55,7 @@
audio_frame, recorded_time, callback));
}
- protected:
- virtual ~LocalFrameInput() {}
-
private:
- friend class base::RefCountedThreadSafe<LocalFrameInput>;
-
scoped_refptr<CastThread> cast_thread_;
base::WeakPtr<AudioSender> audio_sender_;
base::WeakPtr<VideoSender> video_sender_;
@@ -105,6 +100,8 @@
ssrc_of_audio_sender_(ssrc_of_audio_sender),
ssrc_of_video_sender_(ssrc_of_video_sender) {}
+ virtual ~LocalCastSenderPacketReceiver() {}
+
virtual void ReceivedPacket(const uint8* packet,
int length,
const base::Closure callback) OVERRIDE {
@@ -135,12 +132,7 @@
}
}
- protected:
- virtual ~LocalCastSenderPacketReceiver() {}
-
private:
- friend class base::RefCountedThreadSafe<LocalCastSenderPacketReceiver>;
-
scoped_refptr<CastThread> cast_thread_;
base::WeakPtr<AudioSender> audio_sender_;
base::WeakPtr<VideoSender> video_sender_;
@@ -180,13 +172,5 @@
CastSenderImpl::~CastSenderImpl() {}
-scoped_refptr<FrameInput> CastSenderImpl::frame_input() {
- return frame_input_;
-}
-
-scoped_refptr<PacketReceiver> CastSenderImpl::packet_receiver() {
- return packet_receiver_;
-}
-
} // namespace cast
} // namespace media
« no previous file with comments | « trunk/src/media/cast/cast_sender_impl.h ('k') | trunk/src/media/cast/cast_thread.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698