summaryrefslogtreecommitdiffstats
path: root/remoting/base
diff options
context:
space:
mode:
Diffstat (limited to 'remoting/base')
-rw-r--r--remoting/base/codec_test.cc10
-rw-r--r--remoting/base/decoder.h10
-rw-r--r--remoting/base/decoder_verbatim.cc10
-rw-r--r--remoting/base/decoder_verbatim.h8
-rw-r--r--remoting/base/decoder_verbatim_unittest.cc2
-rw-r--r--remoting/base/decoder_zlib.cc10
-rw-r--r--remoting/base/decoder_zlib.h8
-rw-r--r--remoting/base/encoder.h4
-rw-r--r--remoting/base/encoder_verbatim.cc2
-rw-r--r--remoting/base/encoder_zlib.cc9
-rw-r--r--remoting/base/encoder_zlib.h8
-rw-r--r--remoting/base/protocol/chromotocol.proto4
-rw-r--r--remoting/base/protocol_decoder.cc4
-rw-r--r--remoting/base/protocol_decoder.h4
-rw-r--r--remoting/base/protocol_decoder_unittest.cc4
15 files changed, 49 insertions, 48 deletions
diff --git a/remoting/base/codec_test.cc b/remoting/base/codec_test.cc
index fd4469c..40c42ed 100644
--- a/remoting/base/codec_test.cc
+++ b/remoting/base/codec_test.cc
@@ -85,7 +85,7 @@ class EncoderMessageTester {
}
// Test that we received the correct message.
- void ReceivedMessage(HostMessage* message) {
+ void ReceivedMessage(ChromotingHostMessage* message) {
EXPECT_TRUE(message->has_update_stream_packet());
if (state_ == kWaitingForBeginRect) {
@@ -162,7 +162,7 @@ class DecoderTester {
EXPECT_TRUE(frame_.get());
}
- void ReceivedMessage(HostMessage* message) {
+ void ReceivedMessage(ChromotingHostMessage* message) {
if (message->has_update_stream_packet()) {
decoder_->PartialDecode(message);
return;
@@ -265,7 +265,7 @@ class EncoderTester {
EXPECT_GT(data_available_, 0);
}
- void DataAvailable(HostMessage* message,
+ void DataAvailable(ChromotingHostMessage* message,
Encoder::EncodingState state) {
++data_available_;
message_tester_->ReceivedMessage(message);
@@ -274,7 +274,7 @@ class EncoderTester {
// Send the message to the DecoderTester.
if (decoder_tester_) {
if (state & Encoder::EncodingStarting) {
- HostMessage* begin_update = new HostMessage();
+ ChromotingHostMessage* begin_update = new ChromotingHostMessage();
begin_update->mutable_begin_update_stream();
decoder_tester_->ReceivedMessage(begin_update);
}
@@ -284,7 +284,7 @@ class EncoderTester {
}
if (state & Encoder::EncodingEnded) {
- HostMessage* end_update = new HostMessage();
+ ChromotingHostMessage* end_update = new ChromotingHostMessage();
end_update->mutable_end_update_stream();
decoder_tester_->ReceivedMessage(end_update);
}
diff --git a/remoting/base/decoder.h b/remoting/base/decoder.h
index eb7f7ed..75ffa03 100644
--- a/remoting/base/decoder.h
+++ b/remoting/base/decoder.h
@@ -24,7 +24,7 @@ typedef std::vector<gfx::Rect> UpdatedRects;
// Sequence of actions with a decoder is as follows:
//
// 1. BeginDecode(PartialDecodeDone, DecodeDone, VideoFrame)
-// 2. PartialDecode(HostMessage)
+// 2. PartialDecode(ChromotingHostMessage)
// ...
// 3. EndDecode()
//
@@ -57,15 +57,15 @@ class Decoder {
Task* partial_decode_done,
Task* decode_done) = 0;
- // Give a HostMessage that contains the update stream packet that contains
- // the encoded data to the decoder.
+ // Give a ChromotingHostMessage that contains the update stream packet that
+ // contains the encoded data to the decoder.
// The decoder will own |message| and is responsible for deleting it.
//
// If the decoder has written something into |frame|,
// |partial_decode_done_| is called with |frame| and updated regions.
// Return true if the decoder can accept |message| and decode it.
//
- // HostMessage returned by this method will contain a
+ // ChromotingHostMessage returned by this method will contain a
// UpdateStreamPacketMessage.
// This message will contain either:
// 1. UpdateStreamBeginRect
@@ -74,7 +74,7 @@ class Decoder {
//
// See remoting/base/protocol/chromotocol.proto for more information about
// these messages.
- virtual bool PartialDecode(HostMessage* message) = 0;
+ virtual bool PartialDecode(ChromotingHostMessage* message) = 0;
// Notify the decoder that we have received the last update stream packet.
// If the decoding of the update stream has completed |decode_done_| is
diff --git a/remoting/base/decoder_verbatim.cc b/remoting/base/decoder_verbatim.cc
index af4f83b..b944bbc 100644
--- a/remoting/base/decoder_verbatim.cc
+++ b/remoting/base/decoder_verbatim.cc
@@ -42,8 +42,8 @@ bool DecoderVerbatim::BeginDecode(scoped_refptr<media::VideoFrame> frame,
return true;
}
-bool DecoderVerbatim::PartialDecode(HostMessage* message) {
- scoped_ptr<HostMessage> msg_deleter(message);
+bool DecoderVerbatim::PartialDecode(ChromotingHostMessage* message) {
+ scoped_ptr<ChromotingHostMessage> msg_deleter(message);
DCHECK(message->has_update_stream_packet());
DCHECK(started_);
@@ -70,7 +70,7 @@ void DecoderVerbatim::EndDecode() {
started_ = false;
}
-bool DecoderVerbatim::HandleBeginRect(HostMessage* message) {
+bool DecoderVerbatim::HandleBeginRect(ChromotingHostMessage* message) {
DCHECK_EQ(kWaitingForBeginRect, state_);
state_ = kWaitingForRectData;
@@ -94,7 +94,7 @@ bool DecoderVerbatim::HandleBeginRect(HostMessage* message) {
return true;
}
-bool DecoderVerbatim::HandleRectData(HostMessage* message) {
+bool DecoderVerbatim::HandleRectData(ChromotingHostMessage* message) {
DCHECK_EQ(kWaitingForRectData, state_);
DCHECK_EQ(0,
message->update_stream_packet().rect_data().sequence_number());
@@ -126,7 +126,7 @@ bool DecoderVerbatim::HandleRectData(HostMessage* message) {
return true;
}
-bool DecoderVerbatim::HandleEndRect(HostMessage* message) {
+bool DecoderVerbatim::HandleEndRect(ChromotingHostMessage* message) {
DCHECK_EQ(kWaitingForRectData, state_);
state_ = kWaitingForBeginRect;
return true;
diff --git a/remoting/base/decoder_verbatim.h b/remoting/base/decoder_verbatim.h
index 22543f9..67b6cfa 100644
--- a/remoting/base/decoder_verbatim.h
+++ b/remoting/base/decoder_verbatim.h
@@ -18,15 +18,15 @@ class DecoderVerbatim : public Decoder {
UpdatedRects* update_rects,
Task* partial_decode_done,
Task* decode_done);
- virtual bool PartialDecode(HostMessage* message);
+ virtual bool PartialDecode(ChromotingHostMessage* message);
virtual void EndDecode();
void set_reverse_rows(bool reverse) { reverse_rows_ = reverse; }
private:
- bool HandleBeginRect(HostMessage* message);
- bool HandleRectData(HostMessage* message);
- bool HandleEndRect(HostMessage* message);
+ bool HandleBeginRect(ChromotingHostMessage* message);
+ bool HandleRectData(ChromotingHostMessage* message);
+ bool HandleEndRect(ChromotingHostMessage* message);
// The internal state of the decoder.
State state_;
diff --git a/remoting/base/decoder_verbatim_unittest.cc b/remoting/base/decoder_verbatim_unittest.cc
index 947750a..8c00d76 100644
--- a/remoting/base/decoder_verbatim_unittest.cc
+++ b/remoting/base/decoder_verbatim_unittest.cc
@@ -21,7 +21,7 @@ TEST(DecoderVerbatimTest, SimpleDecode) {
const size_t kWidth = 10;
const size_t kHeight = 1;
const char kData[] = "ABCDEFGHIJ";
- scoped_ptr<HostMessage> msg(new HostMessage());
+ scoped_ptr<ChromotingHostMessage> msg(new ChromotingHostMessage());
// Prepare the begin rect message.
UpdateStreamBeginRect* begin_rect =
diff --git a/remoting/base/decoder_zlib.cc b/remoting/base/decoder_zlib.cc
index 43a5fe2..8aabfbc 100644
--- a/remoting/base/decoder_zlib.cc
+++ b/remoting/base/decoder_zlib.cc
@@ -53,8 +53,8 @@ bool DecoderZlib::BeginDecode(scoped_refptr<media::VideoFrame> frame,
return true;
}
-bool DecoderZlib::PartialDecode(HostMessage* message) {
- scoped_ptr<HostMessage> msg_deleter(message);
+bool DecoderZlib::PartialDecode(ChromotingHostMessage* message) {
+ scoped_ptr<ChromotingHostMessage> msg_deleter(message);
DCHECK(message->has_update_stream_packet());
DCHECK(started_);
@@ -82,7 +82,7 @@ void DecoderZlib::EndDecode() {
started_ = false;
}
-bool DecoderZlib::HandleBeginRect(HostMessage* message) {
+bool DecoderZlib::HandleBeginRect(ChromotingHostMessage* message) {
DCHECK_EQ(kWaitingForBeginRect, state_);
state_ = kWaitingForRectData;
@@ -108,7 +108,7 @@ bool DecoderZlib::HandleBeginRect(HostMessage* message) {
return true;
}
-bool DecoderZlib::HandleRectData(HostMessage* message) {
+bool DecoderZlib::HandleRectData(ChromotingHostMessage* message) {
DCHECK_EQ(kWaitingForRectData, state_);
DCHECK_EQ(0,
message->update_stream_packet().rect_data().sequence_number());
@@ -153,7 +153,7 @@ bool DecoderZlib::HandleRectData(HostMessage* message) {
return true;
}
-bool DecoderZlib::HandleEndRect(HostMessage* message) {
+bool DecoderZlib::HandleEndRect(ChromotingHostMessage* message) {
DCHECK_EQ(kWaitingForRectData, state_);
state_ = kWaitingForBeginRect;
diff --git a/remoting/base/decoder_zlib.h b/remoting/base/decoder_zlib.h
index 05f8a99..ee897ab 100644
--- a/remoting/base/decoder_zlib.h
+++ b/remoting/base/decoder_zlib.h
@@ -20,16 +20,16 @@ class DecoderZlib : public Decoder {
UpdatedRects* update_rects,
Task* partial_decode_done,
Task* decode_done);
- virtual bool PartialDecode(HostMessage* message);
+ virtual bool PartialDecode(ChromotingHostMessage* message);
virtual void EndDecode();
// TODO(hclam): Should make this into the Decoder interface.
void set_reverse_rows(bool reverse) { reverse_rows_ = reverse; }
private:
- bool HandleBeginRect(HostMessage* message);
- bool HandleRectData(HostMessage* message);
- bool HandleEndRect(HostMessage* message);
+ bool HandleBeginRect(ChromotingHostMessage* message);
+ bool HandleRectData(ChromotingHostMessage* message);
+ bool HandleEndRect(ChromotingHostMessage* message);
// The internal state of the decoder.
State state_;
diff --git a/remoting/base/encoder.h b/remoting/base/encoder.h
index 0c1fd50f..4d2cf85 100644
--- a/remoting/base/encoder.h
+++ b/remoting/base/encoder.h
@@ -17,7 +17,6 @@ namespace media {
namespace remoting {
class CaptureData;
-class HostMessage;
// A class to perform the task of encoding a continous stream of
// images.
@@ -40,7 +39,8 @@ class Encoder {
// of HostMessage to reduce the amount of memory copies.
// The callback takes ownership of the HostMessage and is responsible for
// deleting it.
- typedef Callback2<HostMessage*, EncodingState>::Type DataAvailableCallback;
+ typedef Callback2<ChromotingHostMessage*,
+ EncodingState>::Type DataAvailableCallback;
virtual ~Encoder() {}
diff --git a/remoting/base/encoder_verbatim.cc b/remoting/base/encoder_verbatim.cc
index 6a5a7d6..d3821d7 100644
--- a/remoting/base/encoder_verbatim.cc
+++ b/remoting/base/encoder_verbatim.cc
@@ -23,7 +23,7 @@ void EncoderVerbatim::Encode(scoped_refptr<CaptureData> capture_data,
for (InvalidRects::const_iterator r = rects.begin();
r != rects.end(); ++r, ++index) {
const gfx::Rect& dirty_rect = *r;
- HostMessage* msg = new HostMessage();
+ ChromotingHostMessage* msg = new ChromotingHostMessage();
UpdateStreamPacketMessage* packet = msg->mutable_update_stream_packet();
if (EncodeRect(dirty_rect.x(), dirty_rect.y(), dirty_rect.width(),
diff --git a/remoting/base/encoder_zlib.cc b/remoting/base/encoder_zlib.cc
index 84842ac..fdf8725 100644
--- a/remoting/base/encoder_zlib.cc
+++ b/remoting/base/encoder_zlib.cc
@@ -48,7 +48,7 @@ void EncoderZlib::EncodeRect(CompressorZlib* compressor,
const int bytes_per_pixel = GetBytesPerPixel(capture_data_->pixel_format());
const int row_size = bytes_per_pixel * rect.width();
- HostMessage* message = PrepareMessage(&rect);
+ ChromotingHostMessage* message = PrepareMessage(&rect);
const uint8 * in = capture_data_->data_planes().data[0] +
rect.y() * strides +
rect.x() * bytes_per_pixel;
@@ -107,8 +107,8 @@ void EncoderZlib::EncodeRect(CompressorZlib* compressor,
}
}
-HostMessage* EncoderZlib::PrepareMessage(const gfx::Rect* rect) {
- HostMessage* message = new HostMessage();
+ChromotingHostMessage* EncoderZlib::PrepareMessage(const gfx::Rect* rect) {
+ ChromotingHostMessage* message = new ChromotingHostMessage();
UpdateStreamPacketMessage* packet = message->mutable_update_stream_packet();
// Prepare the begin rect content.
@@ -126,7 +126,8 @@ HostMessage* EncoderZlib::PrepareMessage(const gfx::Rect* rect) {
return message;
}
-void EncoderZlib::SubmitMessage(HostMessage* message, size_t rect_index) {
+void EncoderZlib::SubmitMessage(ChromotingHostMessage* message,
+ size_t rect_index) {
EncodingState state = EncodingInProgress;
if (rect_index == 0 && message->update_stream_packet().has_begin_rect())
state |= EncodingStarting;
diff --git a/remoting/base/encoder_zlib.h b/remoting/base/encoder_zlib.h
index 476135b..0c88e7e 100644
--- a/remoting/base/encoder_zlib.h
+++ b/remoting/base/encoder_zlib.h
@@ -31,12 +31,12 @@ class EncoderZlib : public Encoder {
void EncodeRect(CompressorZlib* compressor, const gfx::Rect& rect,
size_t rect_index);
- // Create a new HostMessage with the right flag and attributes. The message
- // can be used immediately for output of encoding.
- HostMessage* PrepareMessage(const gfx::Rect* rect);
+ // Create a new ChromotingHostMessage with the right flag and attributes.
+ // The message can be used immediately for output of encoding.
+ ChromotingHostMessage* PrepareMessage(const gfx::Rect* rect);
// Submit |message| to |callback_|.
- void SubmitMessage(HostMessage* message, size_t rect_index);
+ void SubmitMessage(ChromotingHostMessage* message, size_t rect_index);
scoped_refptr<CaptureData> capture_data_;
scoped_ptr<DataAvailableCallback> callback_;
diff --git a/remoting/base/protocol/chromotocol.proto b/remoting/base/protocol/chromotocol.proto
index df510d9..f2752d9 100644
--- a/remoting/base/protocol/chromotocol.proto
+++ b/remoting/base/protocol/chromotocol.proto
@@ -99,7 +99,7 @@ message UpdateStreamPacketMessage {
// Defines the message that is sent from the host to the client.
// Only one of these messages should be present.
// NEXT ID: 5
-message HostMessage {
+message ChromotingHostMessage {
optional InitClientMessage init_client= 1;
optional BeginUpdateStreamMessage begin_update_stream = 2;
optional EndUpdateStreamMessage end_update_stream = 3;
@@ -162,7 +162,7 @@ message MouseUpEvent {
// Defines the message that is sent from the client to the host.
// Only one of the optional messages should be present.
// NEXT ID: 7
-message ClientMessage {
+message ChromotingClientMessage {
optional KeyEvent key_event = 1;
optional MouseSetPositionEvent mouse_set_position_event = 2;
optional MouseMoveEvent mouse_move_event = 3;
diff --git a/remoting/base/protocol_decoder.cc b/remoting/base/protocol_decoder.cc
index 3724f5a..0dc8441 100644
--- a/remoting/base/protocol_decoder.cc
+++ b/remoting/base/protocol_decoder.cc
@@ -18,12 +18,12 @@ ProtocolDecoder::ProtocolDecoder()
void ProtocolDecoder::ParseClientMessages(scoped_refptr<media::DataBuffer> data,
ClientMessageList* messages) {
- ParseMessages<ClientMessage>(data, messages);
+ ParseMessages<ChromotingClientMessage>(data, messages);
}
void ProtocolDecoder::ParseHostMessages(scoped_refptr<media::DataBuffer> data,
HostMessageList* messages) {
- ParseMessages<HostMessage>(data, messages);
+ ParseMessages<ChromotingHostMessage>(data, messages);
}
template <typename T>
diff --git a/remoting/base/protocol_decoder.h b/remoting/base/protocol_decoder.h
index 119198f..b74da64 100644
--- a/remoting/base/protocol_decoder.h
+++ b/remoting/base/protocol_decoder.h
@@ -15,8 +15,8 @@
namespace remoting {
-typedef std::vector<HostMessage*> HostMessageList;
-typedef std::vector<ClientMessage*> ClientMessageList;
+typedef std::vector<ChromotingHostMessage*> HostMessageList;
+typedef std::vector<ChromotingClientMessage*> ClientMessageList;
// A protocol decoder is used to decode data transmitted in the chromoting
// network.
diff --git a/remoting/base/protocol_decoder_unittest.cc b/remoting/base/protocol_decoder_unittest.cc
index c2473a8..da13a0d 100644
--- a/remoting/base/protocol_decoder_unittest.cc
+++ b/remoting/base/protocol_decoder_unittest.cc
@@ -16,7 +16,7 @@ static const int kWidth = 640;
static const int kHeight = 480;
static const std::string kTestData = "Chromoting rockz";
-static void AppendMessage(const HostMessage& msg,
+static void AppendMessage(const ChromotingHostMessage& msg,
std::string* buffer) {
// Contains one encoded message.
scoped_refptr<media::DataBuffer> encoded_msg;
@@ -31,7 +31,7 @@ static void PrepareData(uint8** buffer, int* size) {
std::string encoded_data;
// The first message is InitClient.
- HostMessage msg;
+ ChromotingHostMessage msg;
msg.mutable_init_client()->set_width(kWidth);
msg.mutable_init_client()->set_height(kHeight);
AppendMessage(msg, &encoded_data);
generated by cgit v1.1 at 2025-02-01 17:35:02 +0000