Simplify VideoReader and VideoWriter

remoting/protocol/video_writer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "remoting/protocol/video_writer.h"
 
-#include "remoting/protocol/session_config.h"
-#include "remoting/protocol/protobuf_video_writer.h"
+#include "base/bind.h"
+#include "net/socket/stream_socket.h"

[Wez, 2014/09/16 23:10:07]

Is StreamSocket actually used here, or is the forward-decl sufficient?

[Sergey Ulanov, 2014/09/17 21:52:06]

It's needed to upcast net::StreamSocket to net::Socket when passing it to
BufferedWriter::Init()

[Wez, 2014/09/18 00:23:55]

Acknowledged.

+#include "remoting/base/constants.h"
+#include "remoting/proto/video.pb.h"
+#include "remoting/protocol/message_serialization.h"
+#include "remoting/protocol/stream_channel_factory.h"

[Wez, 2014/09/16 23:10:07]

Not used?

[Sergey Ulanov, 2014/09/17 21:52:06]

Done.

 
 namespace remoting {
 namespace protocol {
 
-VideoWriter::~VideoWriter() { }
+VideoWriter::VideoWriter()
+    : ChannelDispatcherBase(kVideoChannelName) {

[Wez, 2014/09/16 23:10:07]

Similar comment applies re channel name in VideoWriter; should this be
VideoChannelWriter or VideoChannelImpl or VideoChannel, for example?

[Sergey Ulanov, 2014/09/17 21:52:06]

Renamed

+}
 
-// static
-scoped_ptr<VideoWriter> VideoWriter::Create(const SessionConfig& config) {
-  const ChannelConfig& video_config = config.video_config();
-  if (video_config.transport == ChannelConfig::TRANSPORT_STREAM) {
-    return scoped_ptr<VideoWriter>(new ProtobufVideoWriter());
-  }
-  return scoped_ptr<VideoWriter>();
+VideoWriter::~VideoWriter() {
+}
+
+void VideoWriter::OnInitialized() {
+  // TODO(sergeyu): Provide WriteFailedCallback for the buffered writer.

[Wez, 2014/09/16 23:10:07]

What will happen with it NULL like this? Crash?

[Sergey Ulanov, 2014/09/17 21:52:07]

BufferedSocketWriter doesn't call it if it's NULL.

+  buffered_writer_.Init(
+      channel(), BufferedSocketWriter::WriteFailedCallback());
+}
+
+void VideoWriter::ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
+                                     const base::Closure& done) {
+  buffered_writer_.Write(SerializeAndFrameMessage(*packet), done);
 }
 
 }  // namespace protocol
 }  // namespace remoting