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