Index: remoting/client/plugin/pepper_video_renderer_3d.h |
diff --git a/remoting/client/plugin/pepper_video_renderer_3d.h b/remoting/client/plugin/pepper_video_renderer_3d.h |
index e1699ecfff9a4acb76ebf87374b5635642be2920..03aad6faa603a6aee8d150020b993ecc15f8f84c 100644 |
--- a/remoting/client/plugin/pepper_video_renderer_3d.h |
+++ b/remoting/client/plugin/pepper_video_renderer_3d.h |
@@ -13,11 +13,13 @@ |
#include "base/callback.h" |
#include "base/macros.h" |
+#include "ppapi/c/ppb_opengles2.h" |
Sergey Ulanov
2016/07/14 17:45:28
Don't need this. Use int instead of GLint below.
Hzj_jie
2016/07/15 02:30:50
Done.
|
#include "ppapi/cpp/graphics_3d.h" |
#include "ppapi/cpp/instance_handle.h" |
#include "ppapi/cpp/video_decoder.h" |
#include "ppapi/utility/completion_callback_factory.h" |
#include "remoting/client/plugin/pepper_video_renderer.h" |
+#include "remoting/client/plugin/pepper_video_renderer_2d.h" |
#include "remoting/protocol/video_stub.h" |
#include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h" |
@@ -136,6 +138,12 @@ class PepperVideoRenderer3D : public PepperVideoRenderer, |
// the |current_picture_| is rendered. |
std::list<std::unique_ptr<FrameTracker>> current_picture_frames_; |
+ // The fallback software renderer, if input video packet size is larger than |
+ // hardware limitation. |
+ PepperVideoRenderer2D fallback_renderer_; |
Sergey Ulanov
2016/07/14 17:45:28
I don't think we want to allocate fallback rendere
Hzj_jie
2016/07/15 02:30:50
I believe SetPepperContext / OnViewChanged / Enabl
Sergey Ulanov
2016/07/15 23:33:18
You do need to call these methods, but they can be
Hzj_jie
2016/07/16 01:19:21
Oh, that seems unachievable. We do not store most
|
+ bool fallback_renderer_usable_; |
Sergey Ulanov
2016/07/14 17:45:28
The 2D renderer is not expected to fail. Just add
Hzj_jie
2016/07/15 02:30:50
Done.
|
+ bool use_fallback_renderer_; |
+ |
// Set to true if the screen has been resized and needs to be repainted. |
bool force_repaint_ = false; |
@@ -156,6 +164,8 @@ class PepperVideoRenderer3D : public PepperVideoRenderer, |
// True if dirty regions are to be sent to |event_handler_| for debugging. |
bool debug_dirty_region_ = false; |
+ GLint gl_max_texture_size_; |
Sergey Ulanov
2016/07/14 17:45:28
int
Hzj_jie
2016/07/15 02:30:50
Done.
|
+ |
pp::CompletionCallbackFactory<PepperVideoRenderer3D> callback_factory_; |
DISALLOW_COPY_AND_ASSIGN(PepperVideoRenderer3D); |