66 Commits

Author SHA1 Message Date
Stephen Hines
b6d04f84c3 Fix app bug related to same input/output bitmap.
Due to our new bitmap storage optimization, we can't reuse the same
bitmap as input and output safely (since we modify the output directly).
This change updates ImageProcessing to appropriately create a distinct
output Bitmap Allocation and actually use it.

Change-Id: Iecf6c2d203bd1c370b8d0a9fb7e69b419d2eb69b
2012-12-06 15:03:21 -08:00
Jason Sams
131549dd7b am 98a09c64: am 43174b7d: am 718fb9f1: Fix sample code issues
* commit '98a09c64d52aa1166a09ab071049bc3536def1cd':
  Fix sample code issues
2012-11-30 13:26:03 -08:00
Jason Sams
718fb9f12e Fix sample code issues
Correct min SDK.
Correct file extension on mandelbrot

Change-Id: I508c22c382f1a930b27d8c5f4414cac3a990a332
2012-11-30 12:32:36 -08:00
Jason Sams
8150941098 Add single channel blur test.
Change-Id: Iec63132ab4d88290ae1bf0d71431d4fe6ec6dd25
2012-11-16 18:05:10 -08:00
Jason Sams
83e185c295 Update ImageProcessing test.
Add async filtering.

Change-Id: I4e32a9b1fe9221b09a7d1433b3da11a5e422d911
2012-11-09 17:34:14 -08:00
Tim Murray
57b35572cc Remove copyBitmap from ImageProcessing.
Change-Id: Ib9079fab3b3d3da429f32c4c6688e6c437eb8795
2012-10-17 15:51:48 -07:00
Jason Sams
10542ec336 Merge "Port ImageProcessing to Filterscript." into jb-mr1-dev 2012-10-12 19:01:38 -07:00
Stephen Hines
d3d6570df4 Port ImageProcessing to Filterscript.
This enables testing of the Filterscript front-end for llvm-rs-cc.

Bug: 7166741
Change-Id: I90bda9d2710c6652336a8c112b5654c5da3d14e4
2012-10-12 14:50:49 -07:00
Jason Sams
4b429417ba Fix crash in ImageProcessing blend test
The blend test would use a stale context
when running all tests.

bug 7327728

Change-Id: I5802b9b382d8893419efe86d33fdfeeb27729e31
2012-10-12 14:30:23 -07:00
Jason Sams
31864d76a3 Fix range on blur intrinsic.
The intrinsic fails when the radius was 0. A blur
of radius 0 is a nop and should be disallowed. Fix the
test to allow sub-pixel radius to be selected.

bug 7273437

Change-Id: I2805674e29d557615eb7ac65c7910d4dffa28b58
2012-10-02 15:21:11 -07:00
Jason Sams
1ebb7202b6 Lighten grain and make live preview gpu friendly.
Preview now does yuv->rgb using the intrinsic
script. Grain uses a smaller wrapped rand buffer
so it is not just rand test.

bug 7216044

Change-Id: If74eedc7d3cf264895133671edc546af9b1527f2
2012-09-28 18:17:47 -07:00
Tim Murray
0e3d40dfbd fix build break
Change-Id: I51603e7c645ce7aaa632e88bdc44578094785fdd
2012-09-26 17:09:00 -07:00
Tim Murray
74478f73b7 fix blend intrinsics, add tests
Bug: 7190126
Change-Id: If69213377282bf5b412508e7af974a1f8d440287
2012-09-26 16:29:08 -07:00
Jason Sams
761d3d0df7 Reduce test warmup time to avoid driving into thermal throttle.
bug 7216044

Change-Id: I72c83e31dc39a0a810d8a453903213bd428dbe29
2012-09-25 15:00:04 -07:00
Jean-Baptiste Queru
07e35aa80b Merge into jb-mr1-dev
Change-Id: Ic72c475635a0eb57a77d3bd621a219001af8baa5
2012-09-25 09:37:11 -07:00
Jason Sams
ae760511d8 Test FS getElementAt
bug 7190126

Change-Id: I1fbaa77af051cf44134f8bfe56339ce5d3b7edbb
2012-09-24 17:42:14 -07:00
Jason Sams
c4b95cfc7b Test image for 2 input tests.
bug 7216044

Change-Id: I79794c1b12f618d03b27b316126cab9b3e4c9c38
2012-09-24 12:54:46 -07:00
Jason Sams
ac4bd00c1f Change 5x5 convolve to better test impl.
bug 7216044

Change-Id: I7165606a3ebf96ea3f401ed14d46f5105ed75ce4
2012-09-23 16:32:32 -07:00
Jason Sams
ed0b4f961f Force destroy scripts in imageProcessing.
bug 7216044

Change-Id: I6292513c08e75269e79d2210de898ef28931c986
2012-09-23 10:59:35 -07:00
Jason Sams
82c8cdabc4 Merge "Add run all button to image processing test." into jb-mr1-dev 2012-09-21 18:13:16 -07:00
Jason Sams
b94d69a226 Add run all button to image processing test.
Change-Id: I11b4f803151ee7dc1e4b86f402196c1b856bd950
2012-09-21 17:42:13 -07:00
Tim Murray
0e64d892d6 Add Mandelbrot test to ImageProcessing.
Change-Id: I1d5478d58609394111410fbfd9f48b5018f385b1
2012-09-21 14:46:45 -07:00
Jason Sams
36fa5a42ba Fix aprox fs function names
bug b206696

Change-Id: I64c092c1f6b8d990783bf5d31db37e12a4dbdb82
2012-09-20 17:30:34 -07:00
Jason Sams
97e9ee2ea8 Cleanup blur test, remove deprecated functions.
Change-Id: I4136110692fdba8a644806fe8c92bfaacc930ca6
2012-09-20 01:07:35 -07:00
Jason Sams
08a81583c1 Add Kernel, Method, and field IDs
bug 7182873

Change-Id: I066a359bb04027e9376dac088560f042c496b10e
2012-09-18 12:32:10 -07:00
Jason Sams
80d819033d Unhide intrinsics and document API.
Change-Id: I0233245c68f9a08780213062e62cfea6cf909c13
2012-09-13 17:00:48 -07:00
Jason Sams
8a95803738 Fix bugs in grain where values could go out of bounds.
Change-Id: Ib2cc3177424cf24bc81b75786dfd9be30fea5378
2012-09-13 11:07:33 -07:00
Jason Sams
3a5b801176 LUT intrinsic and CrossProcess test.
5x5 convolve and test
Gauss blur and test


Change-Id: Ic2f5d583cbdc1793ec8c8e2beea783d4ec34a57f
2012-09-08 22:16:22 -07:00
Jason Sams
c1ccbf5231 Add greyscale intrinsic test.
Change-Id: I24c9b8769ab7fe2fed9ef17f7ff1063c60977c41
2012-09-06 23:54:05 -07:00
Jason Sams
8fd5853c1c Document ColorMatrix intrinsic and add helpers
Increase size of test image.
Add helpers for greyscale and yuv<>rgb conversions

Change-Id: I6cdd06ae23623b47f5034585ed5d385ff11348ac
2012-09-06 23:29:36 -07:00
Jason Sams
6d617c2ddd Merge "Stabilize perf data." into jb-mr1-dev 2012-09-05 13:50:36 -07:00
Jason Sams
76fb2973b9 Stabilize perf data.
Change-Id: I75fb31b1bb6e6a7a5a82b86fd4a6639dd328ceaa
2012-09-05 13:18:43 -07:00
Jason Sams
5729fcdf95 Add ColorMatrix Intrinsic.
Add better intrinsic testing.
Include reference .rs for each intrinsic.

Change-Id: I327649f16ac8f641c2bd96f7b16f51874a3e820e
2012-09-04 19:57:40 -07:00
Jason Sams
c3f6d184bb update image processing to fix ScriptGroup names.
Change-Id: Id3be5142ad740af65f3ce19b9d8047926bb55a85
2012-09-04 15:25:34 -07:00
Jason Sams
f9678070a0 Merge "Fix bug in grain." into jb-mr1-dev 2012-08-21 17:09:56 -07:00
Jason Sams
a8309cb7ee Merge "Move the kernel launch to specific intrinsic class." into jb-mr1-dev 2012-08-21 17:08:17 -07:00
Jason Sams
f1c051b6f2 Fix bug in grain.
Compare with 0 was done against unsigned which did not
correctly clamp.

Change-Id: I6dbff36190c279961017e57db3aaba51c60a0ad3
2012-08-21 15:54:07 -07:00
Jason Sams
19e1086df1 Move the kernel launch to specific intrinsic class.
This allows support of both input types. Kernel source
and global source.

Change-Id: Iea60bebd79c786795eae81c14cbec352b470a9c0
2012-08-21 15:53:29 -07:00
Rajeev Sharma
50b1ba0083 Fisheye filter: approx version, general performance improvements
Lightly refactor original filter and rework math for performance.  Add approx
version which uses approx_rsqrt, approx_sqrt, and the new approx_atan function.

Change-Id: I796d50da05c1684167696ea4da37d7d75fc78626
2012-08-15 21:50:42 -07:00
Jason Sams
6ab97682fd Intrinsics test
Change-Id: I1847ad0c9190100eb84f7e052dd9f3bff81dc447
2012-08-14 12:06:00 -07:00
Jason Sams
dc39e86cdc Fix build issue with new error checks.
Change-Id: Iccb9c12e0427622964a52806652eaddfb5834240
2012-08-10 16:29:00 -07:00
Jason Sams
423ebcb4dc Implement ScriptGroup and add test.
Change-Id: I6ce0479c20f425d501c759c15717aa8b418c3f5f
2012-08-10 16:02:33 -07:00
Rajeev Sharma
8fa57118ad Add approximate version of Vignette filter to Image Processing test
Currently uses approx_recip and approx_length (thus approx_sqrt).  Will use
approx_exp once this is implemented.

Change-Id: I9f01023105e82a82262100d8ed831e9250a05ed8
2012-08-06 14:22:54 -07:00
Rajeev Sharma
c1deaa221f Vignette filter: precompute more values, simplify math, cleanup code
Change-Id: I29cfc313a5173fd393944dd9af58d0111a3d726a
2012-08-01 15:46:30 -07:00
Jason Sams
41bd3508e7 save 2ms replace div with mul.
Change-Id: I13d80b074b70cd2edd71f33e2881aa367b7652c7
2012-07-30 16:41:18 -07:00
Rajeev Sharma
bb0dbf7373 Add vignette filter to Image Processing test
Add a vignette filter, mostly based on the GLSL version in
android.filterpacks.imageproc.VignetteFilter but with more input options.

Change-Id: I6f38a0ca09d35566104ec8e8523548399b8704a0
2012-07-27 11:03:52 -07:00
Rajeev Sharma
bb2c947636 Add fisheye filter to Image Processing benchmark
Add a fisheye filter, mostly based on the GLSL version in
android.filterpacks.imageproc.FisheyeFilter but with the configurable center
functionality from the JNI version in the original PhotoEditor.

Change-Id: I6be7d82bf2ad564919f9e675ac9a445fae6c440a
2012-07-27 11:01:36 -07:00
Jason Sams
4a45de8c5f Add film grain test.
Change-Id: Ic7c7d7f66fbcf9a9e7a031a4c34f9a1372f0a7b7
2012-07-20 15:40:45 -07:00
Jason Sams
52541816fb Refactor ImageProcessing benchmark and stabilize results.
Change-Id: I3d43bf855515a3ab707089e97cc310b561683f5f
2012-07-19 16:31:47 -07:00
Jason Sams
75ec67848c Add fp_relaxed pragma to image processing test.
BUG=4540719

Change-Id: I147587b50106208a2280712ae69ca2bc111a2b77
2012-03-28 17:58:52 -07:00