AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update SK_IMAGE_VERSION to test RAW

Browse Source 
Bump SK_IMAGE_VERSION to test the images in v2 in GoogleStorage, which
includes the images from v1 plus test images for SkRawCodec.

Only define skia_decodes_raw on platforms that support it, rather than
defining it always and checking additional conditions to determine
whether to support raw. Further, define it and SK_CODEC_DECODES_RAW
for all targets, so we can use the compile flag in other targets.

In DM, exclude the raw extensions if SK_CODEC_DECODES_RAW is not defined.

Blacklist raw extensions on NexusPlayer, which was running out of memory
when running them.

BUG=skia:4829

GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1612113002

Review URL: https://codereview.chromium.org/1612113002
This commit is contained in:
scroggo 2016-02-02 11:56:33 -08:00 committed by Commit bot
parent 136f517627
commit 1497f9f264
7 changed files with 107 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
SK_IMAGE_VERSION
View File

@ -1 +1 @@
1
2

2
dm/DM.cpp
View File

@ -537,8 +537,10 @@ static void gather_srcs() {
static const char* const exts[] = {
"bmp", "gif", "jpg", "jpeg", "png", "webp", "ktx", "astc", "wbmp", "ico",
"BMP", "GIF", "JPG", "JPEG", "PNG", "WEBP", "KTX", "ASTC", "WBMP", "ICO",
#ifdef SK_CODEC_DECODES_RAW
"arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw",
"ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW",
#endif
};
for (int i = 0; i < FLAGS_images.count(); i++) {
const char* flag = FLAGS_images[i];

11
gyp/codec.gyp
View File

@ -68,8 +68,7 @@
'TURBO_HAS_SKIP',
],
'conditions': [
# FIXME: fix the support for ChromeOS [DNG SDK issue with clock_gettime()].
['skia_codec_decodes_raw and skia_os != "chromeos"', {
['skia_codec_decodes_raw', {
'dependencies': [
'raw_codec',
],
@ -77,7 +76,7 @@
],
}, {
# RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be
# controlled by SK_CODEC_DECODES_RAW flag.
# controlled by skia_codec_decodes_raw flag.
'target_name': 'raw_codec',
'product_name': 'raw_codec',
'type': 'static_library',
@ -111,13 +110,7 @@
'include_dirs': [
'../include/codec',
],
'defines': [
'SK_CODEC_DECODES_RAW',
],
},
'defines': [
'SK_CODEC_DECODES_RAW',
],
'conditions': [
['skia_arch_type == "x86" or skia_arch_type == "arm"', {
'defines': [

5
gyp/common_conditions.gypi
View File

@ -12,6 +12,11 @@
'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
],
'conditions' : [
[ 'skia_codec_decodes_raw', {
'defines': [
'SK_CODEC_DECODES_RAW',
],
}],
['skia_pic', {
'cflags': [
'-fPIC',

14
gyp/common_variables.gypi
View File

@ -38,10 +38,6 @@
'variables': { # level 1
'angle_path%': '../',
# RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be controlled
# by this variable.
'skia_codec_decodes_raw%': 1,
'variables': { # level 2
# Variables needed by conditions list within the level-2 variables dict.
@ -62,6 +58,14 @@
}, {
'skia_arch_type%': 'x86',
}],
# RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be
# controlled by skia_codec_decodes_raw.
['skia_os == "chromeos"', {
# FIXME: fix the support for ChromeOS [DNG SDK issue with clock_gettime()].
'skia_codec_decodes_raw%' : 0,
}, {
'skia_codec_decodes_raw%' : 1,
}],
],
'arm_version%': 0,
'arm_neon%': 0,
@ -72,6 +76,7 @@
# so that siblings of the level-2 'variables' dict can see them.
# (skia_os will depend on skia_android_framework.)
'skia_android_framework%': '<(skia_android_framework)',
'skia_codec_decodes_raw%': '<(skia_codec_decodes_raw)',
'skia_arch_type%': '<(skia_arch_type)',
'arm_version%': '<(arm_version)',
'arm_neon%': '<(arm_neon)',
@ -214,6 +219,7 @@
'skia_gpu_extra_tests_path%': '<(skia_gpu_extra_tests_path)',
'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)',
'skia_android_framework%': '<(skia_android_framework)',
'skia_codec_decodes_raw%': '<(skia_codec_decodes_raw)',
'skia_use_android_framework_defines%': '<(skia_use_android_framework_defines)',
'skia_use_system_json%': '<(skia_use_system_json)',
'skia_android_path_rendering%': '<(skia_android_path_rendering)',

80
tools/dm_flags.json
View File

@ -1435,6 +1435,86 @@
"gm",
"_",
"image-cacherator-from-ctable",
"_",
"image",
"_",
".arw",
"_",
"image",
"_",
".cr2",
"_",
"image",
"_",
".dng",
"_",
"image",
"_",
".nef",
"_",
"image",
"_",
".nrw",
"_",
"image",
"_",
".orf",
"_",
"image",
"_",
".raf",
"_",
"image",
"_",
".rw2",
"_",
"image",
"_",
".pef",
"_",
"image",
"_",
".srw",
"_",
"image",
"_",
".ARW",
"_",
"image",
"_",
".CR2",
"_",
"image",
"_",
".DNG",
"_",
"image",
"_",
".NEF",
"_",
"image",
"_",
".NRW",
"_",
"image",
"_",
".ORF",
"_",
"image",
"_",
".RAF",
"_",
"image",
"_",
".RW2",
"_",
"image",
"_",
".PEF",
"_",
"image",
"_",
".SRW",
"--match",
"~ResourceCache"
],

7
tools/dm_flags.py
View File

@ -159,6 +159,13 @@ def get_args(bot):
blacklist.extend([ '2ndpic-8888', 'gm', '_', test])
blacklist.extend(['serialize-8888', 'gm', '_', test])
# NexusPlayer runs out of memory running RAW codec tests
if 'NexusPlayer' in bot:
r = ["arw", "cr2", "dng", "nef", "nrw", "orf", "raf", "rw2", "pef", "srw",
"ARW", "CR2", "DNG", "NEF", "NRW", "ORF", "RAF", "RW2", "PEF", "SRW"]
for raw_ext in r:
blacklist.extend(('_ image _ .%s' % raw_ext).split(' '))
if blacklist:
args.append('--blacklist')
args.extend(blacklist)