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

Unified Diff: tests/JpegTest.cpp

Issue 656163002: Revert of JPEG YUV Decoding (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/images/SkImageDecoder_libjpeg.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tests/JpegTest.cpp
diff --git a/tests/JpegTest.cpp b/tests/JpegTest.cpp
index 8828926ef9e5d70384272cf8fc748c4c3c60109d..f8784a2d26cc3d428ea5394165c55aec3807a4a0 100644
--- a/tests/JpegTest.cpp
+++ b/tests/JpegTest.cpp
@@ -6,12 +6,11 @@
*/
#include "SkBitmap.h"
-#include "SkDecodingImageGenerator.h"
+#include "SkData.h"
#include "SkForceLinking.h"
+#include "SkImage.h"
#include "SkImageDecoder.h"
-#include "SkPixelRef.h"
#include "SkStream.h"
-#include "SkTemplates.h"
#include "Test.h"
__SK_FORCE_IMAGE_DECODER_LINKING;
@@ -453,47 +452,3 @@
SkASSERT(writeSuccess);
#endif
}
-
-DEF_TEST(Jpeg_YUV, reporter) {
- size_t len = sizeof(goodJpegImage);
- SkMemoryStream* stream = SkNEW_ARGS(SkMemoryStream, (goodJpegImage, len));
-
- SkBitmap bitmap;
- SkDecodingImageGenerator::Options opts;
- bool pixelsInstalled = SkInstallDiscardablePixelRef(
- SkDecodingImageGenerator::Create(stream, opts), &bitmap);
- REPORTER_ASSERT(reporter, pixelsInstalled);
-
- if (!pixelsInstalled) {
- return;
- }
-
- SkPixelRef* pixelRef = bitmap.pixelRef();
- SkISize yuvSizes[3];
- bool sizesComputed = (NULL != pixelRef) && pixelRef->getYUV8Planes(yuvSizes, NULL, NULL, NULL);
- REPORTER_ASSERT(reporter, sizesComputed);
-
- if (!sizesComputed) {
- return;
- }
-
- // Allocate the memory for YUV
- size_t totalSize(0);
- size_t sizes[3], rowBytes[3];
- const int32_t expected_sizes[] = {128, 64, 64};
- for (int i = 0; i < 3; ++i) {
- rowBytes[i] = yuvSizes[i].fWidth;
- totalSize += sizes[i] = rowBytes[i] * yuvSizes[i].fHeight;
- REPORTER_ASSERT(reporter, rowBytes[i] == (size_t)expected_sizes[i]);
- REPORTER_ASSERT(reporter, yuvSizes[i].fWidth == expected_sizes[i]);
- REPORTER_ASSERT(reporter, yuvSizes[i].fHeight == expected_sizes[i]);
- }
- SkAutoMalloc storage(totalSize);
- void* planes[3];
- planes[0] = storage.get();
- planes[1] = (uint8_t*)planes[0] + sizes[0];
- planes[2] = (uint8_t*)planes[1] + sizes[1];
-
- // Get the YUV planes
- REPORTER_ASSERT(reporter, pixelRef->getYUV8Planes(yuvSizes, planes, rowBytes, NULL));
-}
« no previous file with comments | « src/images/SkImageDecoder_libjpeg.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698