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 "services/image_decoder/image_decoder_impl.h" | 5 #include "services/image_decoder/image_decoder_impl.h" |
6 | 6 |
7 #include <string.h> | 7 #include <string.h> |
8 | 8 |
9 #include <utility> | 9 #include <utility> |
10 | 10 |
11 #include "base/logging.h" | 11 #include "base/logging.h" |
12 #include "content/public/child/image_decoder_utils.h" | 12 #include "content/public/child/image_decoder_utils.h" |
13 #include "mojo/public/cpp/bindings/strong_binding.h" | 13 #include "mojo/public/cpp/bindings/strong_binding.h" |
14 #include "skia/ext/image_operations.h" | 14 #include "skia/ext/image_operations.h" |
15 #include "third_party/skia/include/core/SkBitmap.h" | 15 #include "third_party/skia/include/core/SkBitmap.h" |
16 #include "ui/gfx/geometry/size.h" | |
17 | 16 |
18 #if defined(OS_CHROMEOS) | 17 #if defined(OS_CHROMEOS) |
19 #include "ui/gfx/chromeos/codec/jpeg_codec_robust_slow.h" | 18 #include "ui/gfx/chromeos/codec/jpeg_codec_robust_slow.h" |
20 #include "ui/gfx/codec/png_codec.h" | 19 #include "ui/gfx/codec/png_codec.h" |
21 #endif | 20 #endif |
22 | 21 |
23 namespace image_decoder { | 22 namespace image_decoder { |
24 | 23 |
25 namespace { | 24 namespace { |
26 | 25 |
27 int64_t kPadding = 64; | 26 int64_t kPadding = 64; |
28 | 27 |
29 } // namespace | 28 } // namespace |
30 | 29 |
31 ImageDecoderImpl::ImageDecoderImpl( | 30 ImageDecoderImpl::ImageDecoderImpl( |
32 std::unique_ptr<service_manager::ServiceContextRef> service_ref) | 31 std::unique_ptr<service_manager::ServiceContextRef> service_ref) |
33 : service_ref_(std::move(service_ref)) {} | 32 : service_ref_(std::move(service_ref)) {} |
34 | 33 |
35 ImageDecoderImpl::~ImageDecoderImpl() = default; | 34 ImageDecoderImpl::~ImageDecoderImpl() = default; |
36 | 35 |
37 void ImageDecoderImpl::DecodeImage(const std::vector<uint8_t>& encoded_data, | 36 void ImageDecoderImpl::DecodeImage(const std::vector<uint8_t>& encoded_data, |
38 mojom::ImageCodec codec, | 37 mojom::ImageCodec codec, |
39 bool shrink_to_fit, | 38 bool shrink_to_fit, |
40 int64_t max_size_in_bytes, | 39 int64_t max_size_in_bytes, |
| 40 const gfx::Size& desired_image_frame_size, |
41 const DecodeImageCallback& callback) { | 41 const DecodeImageCallback& callback) { |
42 if (encoded_data.size() == 0) { | 42 if (encoded_data.size() == 0) { |
43 callback.Run(SkBitmap()); | 43 callback.Run(SkBitmap()); |
44 return; | 44 return; |
45 } | 45 } |
46 | 46 |
47 SkBitmap decoded_image; | 47 SkBitmap decoded_image; |
48 #if defined(OS_CHROMEOS) | 48 #if defined(OS_CHROMEOS) |
49 if (codec == mojom::ImageCodec::ROBUST_JPEG) { | 49 if (codec == mojom::ImageCodec::ROBUST_JPEG) { |
50 // Our robust jpeg decoding is using IJG libjpeg. | 50 // Our robust jpeg decoding is using IJG libjpeg. |
51 if (encoded_data.size()) { | 51 if (encoded_data.size()) { |
52 std::unique_ptr<SkBitmap> decoded_jpeg(gfx::JPEGCodecRobustSlow::Decode( | 52 std::unique_ptr<SkBitmap> decoded_jpeg(gfx::JPEGCodecRobustSlow::Decode( |
53 encoded_data.data(), encoded_data.size())); | 53 encoded_data.data(), encoded_data.size())); |
54 if (decoded_jpeg.get() && !decoded_jpeg->empty()) | 54 if (decoded_jpeg.get() && !decoded_jpeg->empty()) |
55 decoded_image = *decoded_jpeg; | 55 decoded_image = *decoded_jpeg; |
56 } | 56 } |
57 } else if (codec == mojom::ImageCodec::ROBUST_PNG) { | 57 } else if (codec == mojom::ImageCodec::ROBUST_PNG) { |
58 // Our robust PNG decoding is using libpng. | 58 // Our robust PNG decoding is using libpng. |
59 if (encoded_data.size()) { | 59 if (encoded_data.size()) { |
60 SkBitmap decoded_png; | 60 SkBitmap decoded_png; |
61 if (gfx::PNGCodec::Decode( | 61 if (gfx::PNGCodec::Decode( |
62 encoded_data.data(), encoded_data.size(), &decoded_png)) { | 62 encoded_data.data(), encoded_data.size(), &decoded_png)) { |
63 decoded_image = decoded_png; | 63 decoded_image = decoded_png; |
64 } | 64 } |
65 } | 65 } |
66 } | 66 } |
67 #endif // defined(OS_CHROMEOS) | 67 #endif // defined(OS_CHROMEOS) |
68 if (codec == mojom::ImageCodec::DEFAULT) { | 68 if (codec == mojom::ImageCodec::DEFAULT) { |
69 decoded_image = content::DecodeImage( | 69 decoded_image = content::DecodeImage( |
70 encoded_data.data(), gfx::Size(), encoded_data.size()); | 70 encoded_data.data(), desired_image_frame_size, encoded_data.size()); |
71 } | 71 } |
72 | 72 |
73 if (!decoded_image.isNull()) { | 73 if (!decoded_image.isNull()) { |
74 // When serialized, the space taken up by a skia::mojom::Bitmap excluding | 74 // When serialized, the space taken up by a skia::mojom::Bitmap excluding |
75 // the pixel data payload should be: | 75 // the pixel data payload should be: |
76 // sizeof(skia::mojom::Bitmap::Data_) + pixel data array header (8 bytes) | 76 // sizeof(skia::mojom::Bitmap::Data_) + pixel data array header (8 bytes) |
77 // Use a bigger number in case we need padding at the end. | 77 // Use a bigger number in case we need padding at the end. |
78 int64_t struct_size = sizeof(skia::mojom::Bitmap::Data_) + kPadding; | 78 int64_t struct_size = sizeof(skia::mojom::Bitmap::Data_) + kPadding; |
79 int64_t image_size = decoded_image.computeSize64(); | 79 int64_t image_size = decoded_image.computeSize64(); |
80 int halves = 0; | 80 int halves = 0; |
(...skipping 13 matching lines...) Expand all Loading... |
94 } else { | 94 } else { |
95 decoded_image.reset(); | 95 decoded_image.reset(); |
96 } | 96 } |
97 } | 97 } |
98 } | 98 } |
99 | 99 |
100 callback.Run(decoded_image); | 100 callback.Run(decoded_image); |
101 } | 101 } |
102 | 102 |
103 } // namespace image_decoder | 103 } // namespace image_decoder |
OLD | NEW |