diff options
| author | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 00:54:47 +0000 |
|---|---|---|
| committer | hclam@chromium.org <hclam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-23 00:54:47 +0000 |
| commit | be2da4de5227f4f1cbb8455a58045c5e51076474 (patch) | |
| tree | d69b7cb3b045d01adb953b007086fbe9c864af40 /remoting/host/session_manager.h | |
| parent | 452390cc7dc08a33a2c9b5729372b830f6966095 (diff) | |
| download | chromium_src-be2da4de5227f4f1cbb8455a58045c5e51076474.zip chromium_src-be2da4de5227f4f1cbb8455a58045c5e51076474.tar.gz chromium_src-be2da4de5227f4f1cbb8455a58045c5e51076474.tar.bz2 | |
Moving Encoder and Decoder to remoting/base
Putting Encder and Decoder together so we can have test that tests both
of them.
TEST=remoting_unittests
Review URL: http://codereview.chromium.org/2840036
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53427 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host/session_manager.h')
| -rw-r--r-- | remoting/host/session_manager.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/remoting/host/session_manager.h b/remoting/host/session_manager.h index c2a2149..83c437a 100644 --- a/remoting/host/session_manager.h +++ b/remoting/host/session_manager.h @@ -12,9 +12,9 @@ #include "base/ref_counted.h" #include "base/scoped_ptr.h" #include "base/time.h" +#include "remoting/base/encoder.h" #include "remoting/base/protocol/chromotocol.pb.h" #include "remoting/host/capturer.h" -#include "remoting/host/encoder.h" namespace media { @@ -24,7 +24,7 @@ class DataBuffer; namespace remoting { -class Encoder; +class CaptureData; class ClientConnection; // A class for controlling and coordinate Capturer, Encoder @@ -115,7 +115,7 @@ class SessionManager : public base::RefCountedThreadSafe<SessionManager> { void ScheduleNextCapture(); void DoCapture(); - void CaptureDoneCallback(scoped_refptr<Capturer::CaptureData> capture_data); + void CaptureDoneCallback(scoped_refptr<CaptureData> capture_data); void DoFinishEncode(); void DoGetInitInfo(scoped_refptr<ClientConnection> client); @@ -142,7 +142,7 @@ class SessionManager : public base::RefCountedThreadSafe<SessionManager> { // Encoder thread ----------------------------------------------------------- - void DoEncode(scoped_refptr<Capturer::CaptureData> capture_data); + void DoEncode(scoped_refptr<CaptureData> capture_data); // EncodeDataAvailableTask takes ownership of header and is responsible for // deleting it. |