Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef REMOTING_CLIENT_PLUGIN_PEPPER_VIDEO_RENDERER_3D_H_ | 5 #ifndef REMOTING_CLIENT_PLUGIN_PEPPER_VIDEO_RENDERER_3D_H_ |
| 6 #define REMOTING_CLIENT_PLUGIN_PEPPER_VIDEO_RENDERER_3D_H_ | 6 #define REMOTING_CLIENT_PLUGIN_PEPPER_VIDEO_RENDERER_3D_H_ |
| 7 | 7 |
| 8 #include <deque> | 8 #include <deque> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 91 protocol::PerformanceTracker* perf_tracker_ = nullptr; | 91 protocol::PerformanceTracker* perf_tracker_ = nullptr; |
| 92 | 92 |
| 93 pp::Graphics3D graphics_; | 93 pp::Graphics3D graphics_; |
| 94 const PPB_OpenGLES2* gles2_if_; | 94 const PPB_OpenGLES2* gles2_if_; |
| 95 pp::VideoDecoder video_decoder_; | 95 pp::VideoDecoder video_decoder_; |
| 96 | 96 |
| 97 webrtc::DesktopSize frame_size_; | 97 webrtc::DesktopSize frame_size_; |
| 98 webrtc::DesktopVector frame_dpi_; | 98 webrtc::DesktopVector frame_dpi_; |
| 99 scoped_ptr<webrtc::DesktopRegion> frame_shape_; | 99 scoped_ptr<webrtc::DesktopRegion> frame_shape_; |
| 100 | 100 |
| 101 // Sizes for the frames in the pipe. Necessary to workaround | |
| 102 // crbug.com/542945 . Set only when decoder returns frames that don't have | |
| 103 // visible_rect set. | |
| 104 typedef std::map<uint32_t, webrtc::DesktopSize> FrameSizesMap; | |
| 105 scoped_ptr<FrameSizesMap> frame_sizes_; | |
|
Wez
2015/10/19 21:56:16
Do you need something this complicated? Frame size
Sergey Ulanov
2015/10/19 22:19:51
Yes, good point. Done.
| |
| 106 | |
| 101 webrtc::DesktopSize view_size_; | 107 webrtc::DesktopSize view_size_; |
| 102 | 108 |
| 103 bool initialization_finished_ = false; | 109 bool initialization_finished_ = false; |
| 104 bool decode_pending_ = false; | 110 bool decode_pending_ = false; |
| 105 bool get_picture_pending_ = false; | 111 bool get_picture_pending_ = false; |
| 106 bool paint_pending_ = false; | 112 bool paint_pending_ = false; |
| 107 | 113 |
| 108 // Queue of packets that that have been received, but haven't been passed to | 114 // Queue of packets that that have been received, but haven't been passed to |
| 109 // the decoder yet. | 115 // the decoder yet. |
| 110 std::deque<PendingPacket*> pending_packets_; | 116 std::deque<PendingPacket*> pending_packets_; |
| (...skipping 25 matching lines...) Expand all Loading... | |
| 136 bool debug_dirty_region_ = false; | 142 bool debug_dirty_region_ = false; |
| 137 | 143 |
| 138 pp::CompletionCallbackFactory<PepperVideoRenderer3D> callback_factory_; | 144 pp::CompletionCallbackFactory<PepperVideoRenderer3D> callback_factory_; |
| 139 | 145 |
| 140 DISALLOW_COPY_AND_ASSIGN(PepperVideoRenderer3D); | 146 DISALLOW_COPY_AND_ASSIGN(PepperVideoRenderer3D); |
| 141 }; | 147 }; |
| 142 | 148 |
| 143 } // namespace remoting | 149 } // namespace remoting |
| 144 | 150 |
| 145 #endif // REMOTING_CLIENT_PLUGIN_PEPPER_VIDEO_RENDERER_3D_H_ | 151 #endif // REMOTING_CLIENT_PLUGIN_PEPPER_VIDEO_RENDERER_3D_H_ |
| OLD | NEW |