| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 #include "remoting/client/gl_desktop.h" | 5 #include "remoting/client/gl_desktop.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "remoting/client/gl_canvas.h" | 8 #include "remoting/client/gl_canvas.h" |
| 9 #include "remoting/client/gl_render_layer.h" | 9 #include "remoting/client/gl_render_layer.h" |
| 10 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" | 10 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 | 23 |
| 24 void GlDesktop::SetCanvas(GlCanvas* canvas) { | 24 void GlDesktop::SetCanvas(GlCanvas* canvas) { |
| 25 if (!canvas) { | 25 if (!canvas) { |
| 26 layer_.reset(); | 26 layer_.reset(); |
| 27 return; | 27 return; |
| 28 } | 28 } |
| 29 layer_.reset(new GlRenderLayer(kTextureId, canvas)); | 29 layer_.reset(new GlRenderLayer(kTextureId, canvas)); |
| 30 last_desktop_size_.set(0, 0); | 30 last_desktop_size_.set(0, 0); |
| 31 } | 31 } |
| 32 | 32 |
| 33 void GlDesktop::SetVideoFrame(std::unique_ptr<webrtc::DesktopFrame> frame) { | 33 void GlDesktop::SetVideoFrame(const webrtc::DesktopFrame& frame) { |
| 34 if (!layer_) { | 34 if (!layer_) { |
| 35 return; | 35 return; |
| 36 } | 36 } |
| 37 if (!frame->size().equals(last_desktop_size_)) { | 37 if (!frame.size().equals(last_desktop_size_)) { |
| 38 layer_->SetTexture(frame->data(), frame->size().width(), | 38 layer_->SetTexture(frame.data(), frame.size().width(), |
| 39 frame->size().height()); | 39 frame.size().height()); |
| 40 last_desktop_size_.set(frame->size().width(), frame->size().height()); | 40 last_desktop_size_.set(frame.size().width(), frame.size().height()); |
| 41 } else { | 41 } else { |
| 42 for (webrtc::DesktopRegion::Iterator i(frame->updated_region()); | 42 for (webrtc::DesktopRegion::Iterator i(frame.updated_region()); |
| 43 !i.IsAtEnd(); i.Advance()) { | 43 !i.IsAtEnd(); i.Advance()) { |
| 44 const uint8_t* rect_start = | 44 const uint8_t* rect_start = |
| 45 frame->GetFrameDataAtPos(i.rect().top_left()); | 45 frame.GetFrameDataAtPos(i.rect().top_left()); |
| 46 layer_->UpdateTexture( | 46 layer_->UpdateTexture( |
| 47 rect_start, i.rect().left(), i.rect().top(), i.rect().width(), | 47 rect_start, i.rect().left(), i.rect().top(), i.rect().width(), |
| 48 i.rect().height(), frame->stride()); | 48 i.rect().height(), frame.stride()); |
| 49 } | 49 } |
| 50 } | 50 } |
| 51 } | 51 } |
| 52 | 52 |
| 53 void GlDesktop::Draw() { | 53 void GlDesktop::Draw() { |
| 54 if (layer_ && !last_desktop_size_.is_empty()) { | 54 if (layer_ && !last_desktop_size_.is_empty()) { |
| 55 layer_->Draw(1.f); | 55 layer_->Draw(1.f); |
| 56 } | 56 } |
| 57 } | 57 } |
| 58 | 58 |
| 59 } // namespace remoting | 59 } // namespace remoting |
| OLD | NEW |