Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef CHROME_RENDERER_MEDIA_CAST_SESSION_DELEGATE_H_ | 5 #ifndef CHROME_RENDERER_MEDIA_CAST_SESSION_DELEGATE_H_ |
| 6 #define CHROME_RENDERER_MEDIA_CAST_SESSION_DELEGATE_H_ | 6 #define CHROME_RENDERER_MEDIA_CAST_SESSION_DELEGATE_H_ |
| 7 | 7 |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "base/memory/ref_counted.h" | 11 #include "base/memory/ref_counted.h" |
| 12 #include "base/memory/weak_ptr.h" | |
| 12 #include "base/threading/thread.h" | 13 #include "base/threading/thread.h" |
| 13 #include "base/threading/thread_checker.h" | 14 #include "base/threading/thread_checker.h" |
| 14 #include "base/time/default_tick_clock.h" | 15 #include "base/time/default_tick_clock.h" |
| 15 #include "media/cast/cast_config.h" | 16 #include "media/cast/cast_config.h" |
| 16 #include "media/cast/cast_sender.h" | 17 #include "media/cast/cast_sender.h" |
| 17 | 18 |
| 18 namespace base { | 19 namespace base { |
| 19 class MessageLoopProxy; | 20 class MessageLoopProxy; |
| 20 } // namespace base | 21 } // namespace base |
| 21 | 22 |
| 22 namespace media { | 23 namespace media { |
| 23 class VideoFrame; | 24 class VideoFrame; |
| 24 | 25 |
| 25 namespace cast { | 26 namespace cast { |
| 26 class CastEnvironment; | 27 class CastEnvironment; |
| 27 class EncodingEventSubscriber; | 28 class EncodingEventSubscriber; |
|
Ami GONE FROM CHROMIUM
2014/02/25 18:35:08
I think you committed a classic blunder.
Please do
mikhal1
2014/02/25 22:33:33
You're right, sorry.
On 2014/02/25 18:35:08, Ami F
| |
| 28 class FrameInput; | 29 class FrameInput; |
| 29 | 30 |
| 30 namespace transport { | 31 namespace transport { |
| 31 class CastTransportSender; | 32 class CastTransportSender; |
| 32 } // namespace transport | 33 } // namespace transport |
| 33 } // namespace cast | 34 } // namespace cast |
| 34 } // namespace media | 35 } // namespace media |
| 35 | 36 |
| 36 // This class hosts CastSender and connects it to audio/video frame input | 37 // This class hosts CastSender and connects it to audio/video frame input |
| 37 // and network socket. | 38 // and network socket. |
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 92 | 93 |
| 93 scoped_ptr<media::cast::EncodingEventSubscriber> audio_event_subscriber_; | 94 scoped_ptr<media::cast::EncodingEventSubscriber> audio_event_subscriber_; |
| 94 scoped_ptr<media::cast::EncodingEventSubscriber> video_event_subscriber_; | 95 scoped_ptr<media::cast::EncodingEventSubscriber> video_event_subscriber_; |
| 95 | 96 |
| 96 net::IPEndPoint local_endpoint_; | 97 net::IPEndPoint local_endpoint_; |
| 97 net::IPEndPoint remote_endpoint_; | 98 net::IPEndPoint remote_endpoint_; |
| 98 bool transport_configured_; | 99 bool transport_configured_; |
| 99 | 100 |
| 100 // Proxy to the IO message loop. | 101 // Proxy to the IO message loop. |
| 101 scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_; | 102 scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy_; |
| 103 base::WeakPtrFactory<CastSessionDelegate> weak_factory_; | |
| 102 | 104 |
| 103 DISALLOW_COPY_AND_ASSIGN(CastSessionDelegate); | 105 DISALLOW_COPY_AND_ASSIGN(CastSessionDelegate); |
| 104 }; | 106 }; |
| 105 | 107 |
| 106 #endif // CHROME_RENDERER_MEDIA_CAST_SESSION_DELEGATE_H_ | 108 #endif // CHROME_RENDERER_MEDIA_CAST_SESSION_DELEGATE_H_ |
| OLD | NEW |