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

Side by Side Diff: dm/DMSrcSink.cpp

Issue 999173010: Test scanline decoding in DM. (Closed) Base URL: https://skia.googlesource.com/skia.git@scanlineDecoder3
Patch Set: Fix order of output Created 5 years, 9 months 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 | « dm/DMSrcSink.h ('k') | no next file » | 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 2015 Google Inc. 2 * Copyright 2015 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 "DMSrcSink.h" 8 #include "DMSrcSink.h"
9 #include "SamplePipeControllers.h" 9 #include "SamplePipeControllers.h"
10 #include "SkCommonFlags.h" 10 #include "SkCommonFlags.h"
11 #include "SkCodec.h" 11 #include "SkCodec.h"
12 #include "SkDocument.h" 12 #include "SkDocument.h"
13 #include "SkError.h" 13 #include "SkError.h"
14 #include "SkMultiPictureDraw.h" 14 #include "SkMultiPictureDraw.h"
15 #include "SkNullCanvas.h" 15 #include "SkNullCanvas.h"
16 #include "SkOSFile.h" 16 #include "SkOSFile.h"
17 #include "SkPictureData.h" 17 #include "SkPictureData.h"
18 #include "SkPictureRecorder.h" 18 #include "SkPictureRecorder.h"
19 #include "SkRandom.h" 19 #include "SkRandom.h"
20 #include "SkScanlineDecoder.h"
20 #include "SkSVGCanvas.h" 21 #include "SkSVGCanvas.h"
21 #include "SkStream.h" 22 #include "SkStream.h"
22 #include "SkXMLWriter.h" 23 #include "SkXMLWriter.h"
23 24
24 namespace DM { 25 namespace DM {
25 26
26 GMSrc::GMSrc(skiagm::GMRegistry::Factory factory) : fFactory(factory) {} 27 GMSrc::GMSrc(skiagm::GMRegistry::Factory factory) : fFactory(factory) {}
27 28
28 Error GMSrc::draw(SkCanvas* canvas) const { 29 Error GMSrc::draw(SkCanvas* canvas) const {
29 SkAutoTDelete<skiagm::GM> gm(fFactory(NULL)); 30 SkAutoTDelete<skiagm::GM> gm(fFactory(NULL));
30 canvas->concat(gm->getInitialTransform()); 31 canvas->concat(gm->getInitialTransform());
31 gm->draw(canvas); 32 gm->draw(canvas);
32 return ""; 33 return "";
33 } 34 }
34 35
35 SkISize GMSrc::size() const { 36 SkISize GMSrc::size() const {
36 SkAutoTDelete<skiagm::GM> gm(fFactory(NULL)); 37 SkAutoTDelete<skiagm::GM> gm(fFactory(NULL));
37 return gm->getISize(); 38 return gm->getISize();
38 } 39 }
39 40
40 Name GMSrc::name() const { 41 Name GMSrc::name() const {
41 SkAutoTDelete<skiagm::GM> gm(fFactory(NULL)); 42 SkAutoTDelete<skiagm::GM> gm(fFactory(NULL));
42 return gm->getName(); 43 return gm->getName();
43 } 44 }
44 45
45 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~*/ 46 /*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~*/
46 47
47 CodecSrc::CodecSrc(Path path) : fPath(path) {} 48 CodecSrc::CodecSrc(Path path, Mode mode) : fPath(path), fMode(mode) {}
48 49
49 Error CodecSrc::draw(SkCanvas* canvas) const { 50 Error CodecSrc::draw(SkCanvas* canvas) const {
50 SkImageInfo canvasInfo; 51 SkImageInfo canvasInfo;
51 if (NULL == canvas->peekPixels(&canvasInfo, NULL)) { 52 if (NULL == canvas->peekPixels(&canvasInfo, NULL)) {
52 // TODO: Once we implement GPU paths (e.g. JPEG YUV), we should use a de ferred decode to 53 // TODO: Once we implement GPU paths (e.g. JPEG YUV), we should use a de ferred decode to
53 // let the GPU handle it. 54 // let the GPU handle it.
54 return Error::Nonfatal("No need to test decoding to non-raster backend." ); 55 return Error::Nonfatal("No need to test decoding to non-raster backend." );
55 } 56 }
56 57
57 SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str())); 58 SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
(...skipping 11 matching lines...) Expand all
69 // FIXME: Currently we cannot draw unpremultiplied sources. 70 // FIXME: Currently we cannot draw unpremultiplied sources.
70 decodeInfo = decodeInfo.makeAlphaType(kPremul_SkAlphaType); 71 decodeInfo = decodeInfo.makeAlphaType(kPremul_SkAlphaType);
71 } 72 }
72 73
73 SkBitmap bitmap; 74 SkBitmap bitmap;
74 if (!bitmap.tryAllocPixels(decodeInfo)) { 75 if (!bitmap.tryAllocPixels(decodeInfo)) {
75 return SkStringPrintf("Image(%s) is too large (%d x %d)\n", fPath.c_str( ), 76 return SkStringPrintf("Image(%s) is too large (%d x %d)\n", fPath.c_str( ),
76 decodeInfo.width(), decodeInfo.height()); 77 decodeInfo.width(), decodeInfo.height());
77 } 78 }
78 79
79 SkAutoLockPixels alp(bitmap); 80 switch (fMode) {
80 switch (codec->getPixels(decodeInfo, bitmap.getPixels(), bitmap.rowBytes())) { 81 case kNormal_Mode:
81 case SkImageGenerator::kSuccess: 82 switch (codec->getPixels(decodeInfo, bitmap.getPixels(), bitmap.rowB ytes())) {
82 // We consider incomplete to be valid, since we should still decode what is 83 case SkImageGenerator::kSuccess:
83 // available. 84 // We consider incomplete to be valid, since we should still decode what is
84 case SkImageGenerator::kIncompleteInput: 85 // available.
85 canvas->drawBitmap(bitmap, 0, 0); 86 case SkImageGenerator::kIncompleteInput:
86 return ""; 87 break;
87 case SkImageGenerator::kInvalidConversion: 88 case SkImageGenerator::kInvalidConversion:
88 return Error::Nonfatal("Incompatible colortype conversion"); 89 return Error::Nonfatal("Incompatible colortype conversion");
89 default: 90 default:
90 // Everything else is considered a failure. 91 // Everything else is considered a failure.
91 return SkStringPrintf("Couldn't getPixels %s.", fPath.c_str()); 92 return SkStringPrintf("Couldn't getPixels %s.", fPath.c_str( ));
93 }
94 break;
95 case kScanline_Mode: {
96 SkScanlineDecoder* scanlineDecoder = codec->getScanlineDecoder(decod eInfo);
97 if (NULL == scanlineDecoder) {
98 return Error::Nonfatal("Cannot use scanline decoder for all imag es");
99 }
100 for (int y = 0; y < decodeInfo.height(); ++y) {
101 const SkImageGenerator::Result result = scanlineDecoder->getScan lines(
102 bitmap.getAddr(0, y), 1, 0);
103 switch (result) {
104 case SkImageGenerator::kSuccess:
105 case SkImageGenerator::kIncompleteInput:
106 break;
107 default:
108 return SkStringPrintf("%s failed after %d scanlines with error message %d",
109 fPath.c_str(), y-1, (int) result);
110 }
111 }
112 break;
113 }
92 } 114 }
115 canvas->drawBitmap(bitmap, 0, 0);
116 return "";
93 } 117 }
94 118
95 SkISize CodecSrc::size() const { 119 SkISize CodecSrc::size() const {
96 SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str())); 120 SkAutoTUnref<SkData> encoded(SkData::NewFromFileName(fPath.c_str()));
97 SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded)); 121 SkAutoTDelete<SkCodec> codec(SkCodec::NewFromData(encoded));
98 if (NULL != codec) { 122 if (NULL != codec) {
99 return codec->getInfo().dimensions(); 123 return codec->getInfo().dimensions();
100 } else { 124 } else {
101 return SkISize::Make(0, 0); 125 return SkISize::Make(0, 0);
102 } 126 }
(...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 surfaces.unrefAll(); 609 surfaces.unrefAll();
586 return ""; 610 return "";
587 } 611 }
588 SkISize size() const SK_OVERRIDE { return fSize; } 612 SkISize size() const SK_OVERRIDE { return fSize; }
589 Name name() const SK_OVERRIDE { sk_throw(); return ""; } // No one shou ld be calling this. 613 Name name() const SK_OVERRIDE { sk_throw(); return ""; } // No one shou ld be calling this.
590 } proxy(fW, fH, pic, src.size()); 614 } proxy(fW, fH, pic, src.size());
591 return fSink->draw(proxy, bitmap, stream, log); 615 return fSink->draw(proxy, bitmap, stream, log);
592 } 616 }
593 617
594 } // namespace DM 618 } // namespace DM
OLDNEW
« no previous file with comments | « dm/DMSrcSink.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698