Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(653)

Side by Side Diff: gm/image.cpp

Issue 1396323007: API to support native scaling by image-generator (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: mark test image as opaque, so jpeg has a chance of encoding it Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | include/core/SkImageGenerator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2011 Google Inc. 2 * Copyright 2011 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 #include "gm.h" 8 #include "gm.h"
9 #include "SkData.h" 9 #include "SkData.h"
10 #include "SkCanvas.h" 10 #include "SkCanvas.h"
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 } 233 }
234 } 234 }
235 235
236 static void draw_contents(SkCanvas* canvas) { 236 static void draw_contents(SkCanvas* canvas) {
237 SkPaint paint; 237 SkPaint paint;
238 paint.setStyle(SkPaint::kStroke_Style); 238 paint.setStyle(SkPaint::kStroke_Style);
239 paint.setStrokeWidth(20); 239 paint.setStrokeWidth(20);
240 canvas->drawCircle(50, 50, 35, paint); 240 canvas->drawCircle(50, 50, 35, paint);
241 } 241 }
242 242
243 static SkImage* make_raster(const SkImageInfo& info, GrContext*) { 243 static SkImage* make_raster(const SkImageInfo& info, GrContext*, void (*draw)(Sk Canvas*)) {
244 SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info)); 244 SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info));
245 draw_contents(surface->getCanvas()); 245 draw(surface->getCanvas());
246 return surface->newImageSnapshot(); 246 return surface->newImageSnapshot();
247 } 247 }
248 248
249 static SkImage* make_picture(const SkImageInfo& info, GrContext*) { 249 static SkImage* make_picture(const SkImageInfo& info, GrContext*, void (*draw)(S kCanvas*)) {
250 SkPictureRecorder recorder; 250 SkPictureRecorder recorder;
251 draw_contents(recorder.beginRecording(SkRect::MakeIWH(info.width(), info.hei ght()))); 251 draw(recorder.beginRecording(SkRect::MakeIWH(info.width(), info.height())));
252 SkAutoTUnref<SkPicture> pict(recorder.endRecording()); 252 SkAutoTUnref<SkPicture> pict(recorder.endRecording());
253 return SkImage::NewFromPicture(pict, info.dimensions(), nullptr, nullptr); 253 return SkImage::NewFromPicture(pict, info.dimensions(), nullptr, nullptr);
254 } 254 }
255 255
256 static SkImage* make_codec(const SkImageInfo& info, GrContext*) { 256 static SkImage* make_codec(const SkImageInfo& info, GrContext*, void (*draw)(SkC anvas*)) {
257 SkAutoTUnref<SkImage> image(make_raster(info, nullptr)); 257 SkAutoTUnref<SkImage> image(make_raster(info, nullptr, draw));
258 SkAutoTUnref<SkData> data(image->encode()); 258 SkAutoTUnref<SkData> data(image->encode());
259 return SkImage::NewFromEncoded(data); 259 return SkImage::NewFromEncoded(data);
260 } 260 }
261 261
262 static SkImage* make_gpu(const SkImageInfo& info, GrContext* ctx) { 262 static SkImage* make_gpu(const SkImageInfo& info, GrContext* ctx, void (*draw)(S kCanvas*)) {
263 if (!ctx) { return nullptr; } 263 if (!ctx) { return nullptr; }
264 SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkSurface::k No_Budgeted, info)); 264 SkAutoTUnref<SkSurface> surface(SkSurface::NewRenderTarget(ctx, SkSurface::k No_Budgeted, info));
265 draw_contents(surface->getCanvas()); 265 draw(surface->getCanvas());
266 return surface->newImageSnapshot(); 266 return surface->newImageSnapshot();
267 } 267 }
268 268
269 typedef SkImage* (*ImageMakerProc)(const SkImageInfo&, GrContext*); 269 typedef SkImage* (*ImageMakerProc)(const SkImageInfo&, GrContext*, void (*)(SkCa nvas*));
270 270
271 class ScalePixelsGM : public skiagm::GM { 271 class ScalePixelsGM : public skiagm::GM {
272 public: 272 public:
273 ScalePixelsGM() {} 273 ScalePixelsGM() {}
274 274
275 protected: 275 protected:
276 SkString onShortName() override { 276 SkString onShortName() override {
277 return SkString("scale-pixels"); 277 return SkString("scale-pixels");
278 } 278 }
279 279
280 SkISize onISize() override { 280 SkISize onISize() override {
281 return SkISize::Make(960, 1200); 281 return SkISize::Make(960, 1200);
282 } 282 }
283 283
284 void onDraw(SkCanvas* canvas) override { 284 void onDraw(SkCanvas* canvas) override {
285 const SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100); 285 const SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
286 286
287 const ImageMakerProc procs[] = { 287 const ImageMakerProc procs[] = {
288 make_codec, make_raster, make_picture, make_codec, make_gpu, 288 make_codec, make_raster, make_picture, make_codec, make_gpu,
289 }; 289 };
290 for (auto& proc : procs) { 290 for (auto& proc : procs) {
291 SkAutoTUnref<SkImage> image(proc(info, canvas->getGrContext())); 291 SkAutoTUnref<SkImage> image(proc(info, canvas->getGrContext(), draw_ contents));
292 if (image) { 292 if (image) {
293 show_scaled_pixels(canvas, image); 293 show_scaled_pixels(canvas, image);
294 } 294 }
295 canvas->translate(0, 120); 295 canvas->translate(0, 120);
296 } 296 }
297 } 297 }
298 298
299 private: 299 private:
300 typedef skiagm::GM INHERITED; 300 typedef skiagm::GM INHERITED;
301 }; 301 };
302 DEF_GM( return new ScalePixelsGM; ) 302 DEF_GM( return new ScalePixelsGM; )
303
304 //////////////////////////////////////////////////////////////////////////////// ///////////////////
305
306 #include "SkImageGenerator.h"
307
308 static SkImageInfo make_info(SkImage* img) {
309 return SkImageInfo::MakeN32(img->width(), img->height(),
310 img->isOpaque() ? kOpaque_SkAlphaType : kPremul_ SkAlphaType);
311 }
312
313 // Its simple, but I wonder if we should expose this formally?
314 //
315 class ImageGeneratorFromImage : public SkImageGenerator {
316 public:
317 ImageGeneratorFromImage(SkImage* img) : INHERITED(make_info(img)), fImg(SkRe f(img)) {}
318
319 protected:
320 bool onGetPixels(const SkImageInfo& info, void* pixels, size_t rowBytes, SkP MColor ctable[],
321 int* ctableCount) override {
322 return fImg->readPixels(info, pixels, rowBytes, 0, 0);
323 }
324
325 private:
326 SkAutoTUnref<SkImage> fImg;
327
328 typedef SkImageGenerator INHERITED;
329 };
330
331 static void draw_opaque_contents(SkCanvas* canvas) {
332 canvas->drawColor(0xFFFF8844);
333
334 SkPaint paint;
335 paint.setStyle(SkPaint::kStroke_Style);
336 paint.setStrokeWidth(20);
337 canvas->drawCircle(50, 50, 35, paint);
338 }
339
340 static SkImageGenerator* gen_raster(const SkImageInfo& info) {
341 SkAutoTUnref<SkSurface> surface(SkSurface::NewRaster(info));
342 draw_opaque_contents(surface->getCanvas());
343 SkAutoTUnref<SkImage> img(surface->newImageSnapshot());
344 return new ImageGeneratorFromImage(img);
345 }
346
347 static SkImageGenerator* gen_picture(const SkImageInfo& info) {
348 SkPictureRecorder recorder;
349 draw_opaque_contents(recorder.beginRecording(SkRect::MakeIWH(info.width(), i nfo.height())));
350 SkAutoTUnref<SkPicture> pict(recorder.endRecording());
351 return SkImageGenerator::NewFromPicture(info.dimensions(), pict, nullptr, nu llptr);
352 }
353
354 static SkImageGenerator* gen_png(const SkImageInfo& info) {
355 SkAutoTUnref<SkImage> image(make_raster(info, nullptr, draw_opaque_contents) );
356 SkAutoTUnref<SkData> data(image->encode(SkImageEncoder::kPNG_Type, 100));
357 return SkImageGenerator::NewFromEncoded(data);
358 }
359
360 static SkImageGenerator* gen_jpg(const SkImageInfo& info) {
361 SkAutoTUnref<SkImage> image(make_raster(info, nullptr, draw_opaque_contents) );
362 SkAutoTUnref<SkData> data(image->encode(SkImageEncoder::kJPEG_Type, 100));
363 return SkImageGenerator::NewFromEncoded(data);
364 }
365
366 typedef SkImageGenerator* (*GeneratorMakerProc)(const SkImageInfo&);
367
368 static void show_scaled_generator(SkCanvas* canvas, SkImageGenerator* gen) {
369 const SkImageInfo genInfo = gen->getInfo();
370
371 SkAutoCanvasRestore acr(canvas, true);
372
373 SkBitmap bm;
374 bm.allocPixels(genInfo);
375 if (gen->getPixels(bm.info(), bm.getPixels(), bm.rowBytes())) {
376 canvas->drawBitmap(bm, 0, 0, nullptr);
377 }
378 canvas->translate(110, 0);
379
380 const float scales[] = { 0.75f, 0.5f, 0.25f };
381 for (auto scale : scales) {
382 SkImageGenerator::SupportedSizes sizes;
383 if (gen->computeScaledDimensions(scale, &sizes)) {
384 const SkImageInfo info = SkImageInfo::MakeN32Premul(sizes.fSizes[0]. width(),
385 sizes.fSizes[0]. height());
386 bm.allocPixels(info);
387 SkPixmap pmap;
388 bm.peekPixels(&pmap);
389 if (gen->generateScaledPixels(pmap)) {
390 canvas->drawBitmap(bm, 0, SkIntToScalar(genInfo.height() - info. height())/2);
391 }
392 }
393 canvas->translate(100, 0);
394 }
395 }
396
397 class ScaleGeneratorGM : public skiagm::GM {
398 public:
399 ScaleGeneratorGM() {}
400
401 protected:
402 SkString onShortName() override {
403 return SkString("scale-generator");
404 }
405
406 SkISize onISize() override {
407 return SkISize::Make(500, 500);
408 }
409
410 void onDraw(SkCanvas* canvas) override {
411 canvas->translate(10, 10);
412
413 // explicitly make it opaque, so we can test JPEG (which is only ever op aque)
414 const SkImageInfo info = SkImageInfo::MakeN32(100, 100, kOpaque_SkAlphaT ype);
415
416 const GeneratorMakerProc procs[] = {
417 gen_raster, gen_picture, gen_png, gen_jpg,
418 };
419 for (auto& proc : procs) {
420 SkAutoTDelete<SkImageGenerator> gen(proc(info));
421 if (gen) {
422 show_scaled_generator(canvas, gen);
423 }
424 canvas->translate(0, 120);
425 }
426 }
427
428 private:
429 typedef skiagm::GM INHERITED;
430 };
431 DEF_GM( return new ScaleGeneratorGM; )
OLDNEW
« no previous file with comments | « no previous file | include/core/SkImageGenerator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698