Index: remoting/protocol/rtp_video_reader.cc |
diff --git a/remoting/protocol/rtp_video_reader.cc b/remoting/protocol/rtp_video_reader.cc |
index 8660371beb8536da7059d94c01fedf797fd27fcf..dbc25557074c08fbd88a37f022a6fbaa464dba97 100644 |
--- a/remoting/protocol/rtp_video_reader.cc |
+++ b/remoting/protocol/rtp_video_reader.cc |
@@ -5,6 +5,7 @@ |
#include "remoting/protocol/rtp_video_reader.h" |
#include "base/task.h" |
+#include "remoting/proto/video.pb.h" |
#include "remoting/protocol/session.h" |
namespace remoting { |
@@ -13,8 +14,7 @@ namespace protocol { |
RtpVideoReader::RtpVideoReader() { } |
RtpVideoReader::~RtpVideoReader() { } |
-void RtpVideoReader::Init(protocol::Session* session, |
- VideoStub* video_stub) { |
+void RtpVideoReader::Init(protocol::Session* session, VideoStub* video_stub) { |
rtp_reader_.Init(session->video_rtp_channel(), |
NewCallback(this, &RtpVideoReader::OnRtpPacket)); |
video_stub_ = video_stub; |
@@ -26,15 +26,10 @@ void RtpVideoReader::Close() { |
void RtpVideoReader::OnRtpPacket(const RtpPacket& rtp_packet) { |
VideoPacket* packet = new VideoPacket(); |
- packet->set_data(rtp_packet.payload, rtp_packet.payload_size); |
+ packet->set_data(rtp_packet.payload, rtp_packet.payload_size); |
packet->mutable_format()->set_encoding(VideoPacketFormat::ENCODING_VP8); |
packet->set_flags(rtp_packet.header.marker ? VideoPacket::LAST_PACKET : 0); |
- packet->mutable_format()->set_pixel_format(PIXEL_FORMAT_RGB32); |
- packet->mutable_format()->set_x(0); |
- packet->mutable_format()->set_y(0); |
- packet->mutable_format()->set_width(800); |
- packet->mutable_format()->set_height(600); |
video_stub_->ProcessVideoPacket(packet, new DeleteTask<VideoPacket>(packet)); |
} |