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 #include "content/browser/renderer_host/delegated_frame_host.h" | 5 #include "content/browser/renderer_host/delegated_frame_host.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <utility> | 9 #include <utility> |
10 #include <vector> | 10 #include <vector> |
(...skipping 601 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
612 if (result->size() != region_in_frame.size()) { | 612 if (result->size() != region_in_frame.size()) { |
613 skia::ImageOperations::ResizeMethod method = | 613 skia::ImageOperations::ResizeMethod method = |
614 skia::ImageOperations::RESIZE_GOOD; | 614 skia::ImageOperations::RESIZE_GOOD; |
615 scaled_bitmap = skia::ImageOperations::Resize(*bitmap.get(), method, | 615 scaled_bitmap = skia::ImageOperations::Resize(*bitmap.get(), method, |
616 region_in_frame.width(), | 616 region_in_frame.width(), |
617 region_in_frame.height()); | 617 region_in_frame.height()); |
618 } else { | 618 } else { |
619 scaled_bitmap = *bitmap.get(); | 619 scaled_bitmap = *bitmap.get(); |
620 } | 620 } |
621 | 621 |
622 { | 622 media::CopyRGBToVideoFrame( |
623 SkAutoLockPixels scaled_bitmap_locker(scaled_bitmap); | 623 reinterpret_cast<uint8_t*>(scaled_bitmap.getPixels()), |
| 624 scaled_bitmap.rowBytes(), region_in_frame, video_frame.get()); |
624 | 625 |
625 media::CopyRGBToVideoFrame( | |
626 reinterpret_cast<uint8_t*>(scaled_bitmap.getPixels()), | |
627 scaled_bitmap.rowBytes(), region_in_frame, video_frame.get()); | |
628 } | |
629 ignore_result(scoped_callback_runner.Release()); | 626 ignore_result(scoped_callback_runner.Release()); |
630 callback.Run(region_in_frame, true); | 627 callback.Run(region_in_frame, true); |
631 return; | 628 return; |
632 } | 629 } |
633 | 630 |
634 ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); | 631 ImageTransportFactory* factory = ImageTransportFactory::GetInstance(); |
635 display_compositor::GLHelper* gl_helper = factory->GetGLHelper(); | 632 display_compositor::GLHelper* gl_helper = factory->GetGLHelper(); |
636 if (!gl_helper) | 633 if (!gl_helper) |
637 return; | 634 return; |
638 if (subscriber_texture.get() && !subscriber_texture->texture_id()) | 635 if (subscriber_texture.get() && !subscriber_texture->texture_id()) |
(...skipping 227 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
866 } | 863 } |
867 | 864 |
868 if (!skipped_frames_) { | 865 if (!skipped_frames_) { |
869 latest_confirmed_begin_frame_source_id_ = ack.source_id; | 866 latest_confirmed_begin_frame_source_id_ = ack.source_id; |
870 latest_confirmed_begin_frame_sequence_number_ = | 867 latest_confirmed_begin_frame_sequence_number_ = |
871 ack.latest_confirmed_sequence_number; | 868 ack.latest_confirmed_sequence_number; |
872 } | 869 } |
873 } | 870 } |
874 | 871 |
875 } // namespace content | 872 } // namespace content |
OLD | NEW |