Implement video renderer based on VideoDecode API.

remoting/client/plugin/chromoting_instance.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/client/plugin/chromoting_instance.h"
 
 #include <string>
 #include <vector>
 
 #if defined(OS_NACL)
@@ skipping 26 matching lines @@
 #include "remoting/base/constants.h"
 #include "remoting/base/util.h"
 #include "remoting/client/chromoting_client.h"
 #include "remoting/client/plugin/delegating_signal_strategy.h"
 #include "remoting/client/plugin/normalizing_input_filter_cros.h"
 #include "remoting/client/plugin/normalizing_input_filter_mac.h"
 #include "remoting/client/plugin/pepper_audio_player.h"
 #include "remoting/client/plugin/pepper_mouse_locker.h"
 #include "remoting/client/plugin/pepper_port_allocator.h"
 #include "remoting/client/plugin/pepper_video_renderer_2d.h"
+#include "remoting/client/plugin/pepper_video_renderer_3d.h"
 #include "remoting/client/software_video_renderer.h"
 #include "remoting/client/token_fetcher_proxy.h"
 #include "remoting/protocol/connection_to_host.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/libjingle_transport_factory.h"
 #include "third_party/webrtc/base/helpers.h"
 #include "third_party/webrtc/base/ssladapter.h"
 #include "url/gurl.h"
 
 // Windows defines 'PostMessage', so we have to undef it.
@@ skipping 319 matching lines @@
 
 bool ChromotingInstance::HandleInputEvent(const pp::InputEvent& event) {
   DCHECK(plugin_task_runner_->BelongsToCurrentThread());
 
   if (!IsConnected())
     return false;
 
   return input_handler_.HandleInputEvent(event);
 }
 
+void ChromotingInstance::OnVideoDecoderFailed() {
+  mouse_input_filter_.set_input_stub(NULL);
+  client_.reset();
+  video_renderer_.reset();
+
+  OnConnectionState(protocol::ConnectionToHost::FAILED,
+                    protocol::INCOMPATIBLE_PROTOCOL);

[Wez, 2014/12/24 17:11:13]

This seems a strange error to set in case of decoder failure; it might be
failing due to a resource allocation issue or something else not
protocol-related, surely?

[Sergey Ulanov, 2015/01/06 01:16:31]

Added TODO to fix it.

+}
+
 void ChromotingInstance::OnVideoFirstFrameReceived() {
   scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
   PostLegacyJsonMessage("onFirstFrameReceived", data.Pass());
 }
 
 void ChromotingInstance::OnVideoSize(const webrtc::DesktopSize& size,
                                         const webrtc::DesktopVector& dpi) {
   mouse_input_filter_.set_output_size(size);
 
   scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
@@ skipping 221 matching lines @@
   }
 #elif defined(OS_MACOSX)
   normalizing_input_filter_.reset(new NormalizingInputFilterMac(&key_mapper_));
 #elif defined(OS_CHROMEOS)
   normalizing_input_filter_.reset(new NormalizingInputFilterCros(&key_mapper_));
 #else
   normalizing_input_filter_.reset(new protocol::InputFilter(&key_mapper_));
 #endif
   input_handler_.set_input_stub(normalizing_input_filter_.get());
 
-  video_renderer_.reset(new PepperVideoRenderer2D());
+  video_renderer_.reset(new PepperVideoRenderer3D());
   bool initialized =

[Wez, 2014/12/24 17:11:13]

Rather than have this bool, it'd be more readable to reset() the
|video_renderer_| based on the result of Initialize() being false (and similarly
below) - then the CHECK below becomes CHECK(video_renderer_), which seems more
self-documenting.

[Sergey Ulanov, 2015/01/06 01:16:31]

Done.

       video_renderer_->Initialize(this, context_, this);
-  CHECK(initialized);
+
+  // If we failed to initialize 3D renderer (because there is no hardware
+  // support on this machine) then use the 2D renderer.
+  if (!initialized) {
+    LOG(WARNING)
+        << "Failed to initialize 3D renderer. Using 2D renderer instead.";
+    video_renderer_.reset(new PepperVideoRenderer2D());
+    bool initialized =
+        video_renderer_->Initialize(this, context_, this);
+    CHECK(initialized);

[Wez, 2014/12/24 17:11:13]

Move this CHECK to after the if() block

[Sergey Ulanov, 2015/01/06 01:16:31]

Done.

+  }
 
   if (!plugin_view_.is_null())
     video_renderer_->OnViewChanged(plugin_view_);
 
   scoped_ptr<AudioPlayer> audio_player(new PepperAudioPlayer(this));
   client_.reset(new ChromotingClient(&context_, this, video_renderer_.get(),
                                      audio_player.Pass()));
 
   // Connect the input pipeline to the protocol stub & initialize components.
   mouse_input_filter_.set_input_stub(client_->input_stub());
@@ skipping 455 matching lines @@
                                       url_components.scheme.len);
   return url_scheme == kChromeExtensionUrlScheme;
 }
 
 bool ChromotingInstance::IsConnected() {
   return client_ &&
          (client_->connection_state() == protocol::ConnectionToHost::CONNECTED);
 }
 
 }  // namespace remoting