summaryrefslogtreecommitdiffstats
path: root/media/mca
Commit message (Collapse)AuthorAgeFilesLines
* Add missing <string.h> includes.Elliott Hughes2015-01-253-0/+3
| | | | Change-Id: I188bfe1388fa49f6f79d247aa0d0f4fb089de503
* Cleanup Obsolete LOCAL_PRELINK_MODULE.Ying Wang2014-12-163-15/+0
| | | | | Bug: 18675947 Change-Id: If4909c5f8495136d381b289a3d55e811313abccc
* Adjust format strings to work on both 32-bit and 64-bit buildsBernhard Rosenkränzer2014-12-051-2/+2
| | | | | | | | Adjust format strings to not produce Clang warnings in both 32-bit and 64-bit builds Change-Id: I76c29d8d5d0fb4b5e9d9518077652370ffe9e871 Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* Merge "Add -Wno-unused-parameter to LOCAL_CFLAGS"Chih-hung Hsieh2014-12-041-1/+1
|\
| * Add -Wno-unused-parameter to LOCAL_CFLAGSBernhard Rosenkränzer2014-11-241-1/+1
| | | | | | | | | | | | | | | | | | Some JNI functions ignore the JNI environment and class information, but still take the parameters -- causing a build failure with clang (and gcc with -Wextra enabled). Ignore this. Change-Id: I049fcf65991b19d2416fce105699311803b43cfc Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* | Remove unused variables and functions, don't warn about unused parametersBernhard Rosenkränzer2014-11-231-7/+0
|/ | | | | | | | | Remove unused variables and static functions clang complains about, disable warnings about unused parameters (needed for clang and for gcc with -Wextra enabled) Change-Id: I76a22cd0158b3c7375c54e3d4d15bc1ac448591e Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
* Move frameworks/base over to libc++.Dan Albert2014-11-124-9/+3
| | | | | Bug: 15193147 Change-Id: I96109d2d383f0c8a4aaa611f29fcf887afb3c69e
* Frameworks/base: Wall Werror in media/mcaAndreas Gampe2014-11-109-19/+27
| | | | | | Turn on -Wall -Werror in media/mca. Fix warnings. Change-Id: I2a43df1d0639babe240b91942a5ea3f8babdef93
* resolved conflicts for merge of ee665151 to lmp-dev-plus-aospNeil Fuller2014-10-021-1/+1
|\ | | | | | | Change-Id: I97671e62de26919e391dbb2686511584c59ab990
| * Switch from FloatMath -> Math and Math.hypot where possibleNeil Fuller2014-10-011-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The motivation is an API change: FloatMath is going to be deprecated and/or removed. Performance is not the goal of this change. That said... Math is faster than FloatMath with AOT compilation. While making the change, occurances of: {Float}Math.sqrt(x * x + y * y) and {Float}Math.sqrt({Float}Math.pow(x, 2) + {Float}Math.pow(y, 2)) have been replaced with: {(float)} Math.hypot(x, y) Right now there is no runtime intrinsic for hypot so is not faster in all cases for AOT compilation: Math.sqrt(x * x + y * y) is faster than Math.hypot(x, y) with AOT, but all other combinations of FloatMath, use of pow() etc. are slower than hypot(). hypot() has the advantage of being self documenting and could be optimized in future. None of the behavior differences around NaN and rounding appear to be important for the cases looked at: they all assume results and arguments are in range and usually the results are cast to float. Different implementations measured on hammerhead / L: AOT compiled: [FloatMath.hypot(x, y)] benchmark=Hypot_FloatMathHypot} 633.85 ns; σ=0.32 ns @ 3 trials [FloatMath.sqrt(x*x + y*y)] benchmark=Hypot_FloatMathSqrtMult} 684.17 ns; σ=4.83 ns @ 3 trials [FloatMath.sqrt(FloatMath.pow(x, 2) + FloatMath.pow(y, 2))] benchmark=Hypot_FloatMathSqrtPow} 1270.65 ns; σ=12.20 ns @ 6 trials [(float) Math.hypot(x, y)] benchmark=Hypot_MathHypot} 96.80 ns; σ=0.05 ns @ 3 trials [(float) Math.sqrt(x*x + y*y)] benchmark=Hypot_MathSqrtMult} 23.97 ns; σ=0.01 ns @ 3 trials [(float) Math.sqrt(Math.pow(x, 2) + Math.pow(y, 2))] benchmark=Hypot_MathSqrtPow} 156.19 ns; σ=0.12 ns @ 3 trials Interpreter: benchmark=Hypot_FloatMathHypot} 1180.54 ns; σ=5.13 ns @ 3 trials benchmark=Hypot_FloatMathSqrtMult} 1121.05 ns; σ=3.80 ns @ 3 trials benchmark=Hypot_FloatMathSqrtPow} 3327.14 ns; σ=7.33 ns @ 3 trials benchmark=Hypot_MathHypot} 856.57 ns; σ=1.41 ns @ 3 trials benchmark=Hypot_MathSqrtMult} 1028.92 ns; σ=9.11 ns @ 3 trials benchmark=Hypot_MathSqrtPow} 2539.47 ns; σ=24.44 ns @ 3 trials Bug: https://code.google.com/p/android/issues/detail?id=36199 Change-Id: I06c91f682095e627cb547d60d936ef87941be692
* | resolved conflicts for merge of 1a4527ce to lmp-dev-plus-aospDan Albert2014-09-191-1/+3
|\ \ | |/ | | | | Change-Id: Iee4e93e3a2b049ec5f13166dbbffdd77b301fe5c
| * Clean up makefile cruft.Dan Albert2014-09-111-1/+3
| | | | | | | | | | | | The build system already takes care of all these things. Change-Id: Idef80b554e07cef5e5ed2adf1b5740a76f13ef6d
* | GLConsumer: Stop using default constructor paramsDan Stoza2014-06-241-1/+2
| | | | | | | | | | | | | | | | Removes the dependency on default constructor parameters for GLConsumer so that a different constructor prototype can safely be added. Change-Id: I0da924bbd4c141edbf305598c1be8bc575654680
* | Remove deprecated BufferQueue constructorDan Stoza2014-03-121-3/+5
| | | | | | | | | | Bug: 13415624 Change-Id: I2a7cea5806869bcd6aeaeee7dee97d80f819c9aa
* | Resolved conflicts for merge of 28c6ec02 to masterNarayan Kamath2014-01-161-2/+2
|\ \ | |/ | | | | Change-Id: Idf1cabf2694dfa13d928df944d346f5e051b6948
| * AArch64: Use long for pointers in media classesAshok Bhat2014-01-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | For storing pointers, long is used in media classes, as native pointers can be 64-bit. In addition, some minor changes have been done to conform with standard JNI practice (e.g. use of jint instead of int in JNI function prototypes) Change-Id: Idc4ca0124d03df7f9cef412488abafd020e5e774 Signed-off-by: Ashok Bhat <ashok.bhat@arm.com> Signed-off-by: Marcus Oakland <marcus.oakland@arm.com> Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
* | Remove unused imports from frameworks/base.John Spurlock2013-11-2079-326/+0
|/ | | | Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
* fix-up dependencies to gl headersMathias Agopian2013-08-082-0/+5
| | | | Change-Id: I9f176847587db1f9ccee2bc425106d277ffceee6
* Clearly separate consumer and producer interfacesMathias Agopian2013-08-061-2/+1
| | | | | Bug: 9265647 Change-Id: Ic68e91788d0a05251e1d2fb9f9d4de403c7099bf
* am b56f10aa: am 32c308a5: Merge "If media wants ASCII lowercasing, it needs ↵Elliott Hughes2013-08-021-1/+3
|\ | | | | | | | | | | | | to ask for it." * commit 'b56f10aa66914aeb880c624ed6e938e1941ff820': If media wants ASCII lowercasing, it needs to ask for it.
| * If media wants ASCII lowercasing, it needs to ask for it.Elliott Hughes2013-08-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html Use toLowerCase(Locale.ROOT) if you want ASCII for machine consumption, and use toLowerCase(Locale.getDefault()) if you want the user's locale's casing rules for human consumption. Bug: https://code.google.com/p/android/issues/detail?id=58359 Change-Id: Id9005a17e34217a81bef3b40031b9e2e6272f45d
* | always pass the BufferQueue explicitely to consumersMathias Agopian2013-07-121-1/+2
|/ | | | Change-Id: I32e380979a3f4c6b1dfb440cc5b5c3d30d7607db
* Add liblogYing Wang2013-04-092-5/+2
| | | | | Bug: 8580410 Change-Id: I746aa8258866508c3a725d0773faf4518096548f
* Refactoring: Rename SurfaceTextureClient to SurfaceMathias Agopian2013-02-153-5/+5
| | | | Change-Id: I5a218ca11abeeec05e3a4c3cfc581bcc788814ea
* Rename ISurfaceTexture and SurfaceTextureAndy McFadden2012-12-184-11/+11
| | | | | | | | | | The C++ class names don't match what the classes do, so rename ISurfaceTexture to IGraphicBufferProducer, and SurfaceTexture to GLConsumer. Bug 7736700 Change-Id: I08e677faf2ebb418ef131d0a8008e01037db0e50
* Fix typoAndrew Hsieh2012-12-122-8/+8
| | | | | | Changed ANDROID_BITMAP_RESUT_SUCCESS -> ANDROID_BITMAP_RESULT_SUCCESS Change-Id: I3d5525d7dacbf8f007e3230e1ca87b69245a96b1
* am 58ed5d74: am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-071-0/+0
|\ | | | | | | | | * commit '58ed5d748c0b9b64845975ef5844ad313de7c3f6': Correct executable bit for source files
| * am 768d9e1a: Merge "Correct executable bit for source files"Kenny Root2012-11-071-0/+0
| |\ | | | | | | | | | | | | * commit '768d9e1a72ceee7d4a5f608776b87b62d6ce4a04': Correct executable bit for source files
| | * Correct executable bit for source filesKenny Root2012-11-071-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | Many media files and source code files were marked as executable in Git. Remove those. Also a shell script and python script were not marked as executable. Change-Id: Ieb51bafb46c895a21d2e83696f5a901ba752b2c5
* | | Remove obsolete references to libmedia_nativeGlenn Kasten2012-10-301-2/+1
|/ / | | | | | | | | Bug: 6654403 Change-Id: I05d8e81fd31617b587fd1228a303c40db83e7f2d
* | Fix b/7087723 Patch leftover after tapping the red eye areaRuei-sung Lin2012-09-121-5/+1
| | | | | | | | Change-Id: I06f5c491b09cf13698f001e8b11f42506fda5bbd
* | Add context support to backdropper filter.Mike Dodd2012-09-061-0/+3
| | | | | | | | | | | | Part of b/7028438 Change-Id: Idcae38b452abc847c7b869a5568d1c5d831411b7
* | Add context support into the filter framework.Teng-Hui Zhu2012-08-211-1/+12
|/ | | | | | | Basically we need the context to pass the content URI into MediaPlayer. bug:6837809 Change-Id: I9390b57baff06f80246584fb3a4b746e1a308ff2
* Crash in SurfaceTextureTarget filter openPannag Sanketi2012-06-201-3/+12
| | | | | | | | | | | | | | If the filter graph in an app closes out, the SurfaceTextureTarget filter was losing the reference to the original surfacetexture, and the app would re-start the graph without setting the surfacetexture again, thus leading to a crash in registering a surface from surfacetexture. Typical scenarios is start/stop immediately in camera effects recording. Fix part of b/6651352 Fix part of b/6655597 Change-Id: Ib2bae7e886784e91b3a886f7ccd439ff190feb22
* Add property to override backdropper effect threshold.Eino-Ville Talvala2012-06-131-2/+26
| | | | | | | Also, change the default background mean to be the first incoming frame. Bug: 6600585 Change-Id: I2181e75711d48d01f48e3fb1d604eb467f08fda4
* Fix b/6575950 make shader program to support different precisions.Ruei-sung Lin2012-05-297-76/+106
| | | | | | | | | | | | | 1. In shade code of Vignette and Fisheye, change from pixel coordinates to texture coordinates to avoid overflow. 2. Fix bug in ColorTemperature shader code 3. Revise shader code pseudo random number generator (used by BlackWhite, Grain, Lomo, Documentary filters) to ensure it produces no artifacts among devices with different precisions. Change-Id: Ifb67f12f114bc9cd7fbfa74f7782f130c5244e5d
* Fix bad aspect ratios for recorded effectsPannag Sanketi2012-05-231-4/+11
| | | | | | Fix b/6530189 Fix b/6535207 Change-Id: I6ef09bd619acc31af53d9991335cda33b7c08908
* Fixing the weird preview size w/ effects on cameraPannag Sanketi2012-05-172-5/+15
| | | | | | | | | | | | | The aspect ratio sent from the camera app to the SurfaceTextureTarget filter does not really matter now since the camera app handles the re-sizing. Hence, the SurfaceTextureTarget filter needs to be render in "stretch" mode all the time even though the aspect ratio sent to the filter might indicate otherwise. The filter still needs the correct frame size for things other than determining aspect ratio. Fix b/6430124 Change-Id: Ie7fa5cd2adf2a8d41e6e005418f6c6fd738ed85d
* Merge "Adding disconnect call to the SurfaceTextureTarget" into jb-devPannag Sanketi2012-05-101-8/+31
|\
| * Adding disconnect call to the SurfaceTextureTargetPannag Sanketi2012-05-091-8/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | Related to b/5873421. When an app using the SurfaceTextureTarget filter and the activity goes out of focus such as onPause(), the underlying surfacetexture might not be available anymore to the filter. The filter needs to be told about that so that it does try to render into the surface corresponding to the surfacetexture. For example, in Camera app, the VideoCamera activity has to let the underlying effects graph know about the disconnect in the onPause() method. Change-Id: Iee3af16715432d84fef4438d1671f4d6d261b3d7
* | pseudo random number generator in shader with limited precisionsRuei-sung Lin2012-05-096-76/+87
| | | | | | | | Change-Id: I3289155824bf71b274c00d1b16366bb319588831
* | Fix b/5974573 Please increase intensity of film grain effectRuei-sung Lin2012-05-031-41/+42
| | | | | | | | Change-Id: Ia984aa91bf3ae8aef47e24a0074b1b0f1624c1a0
* | Fix b/5974247Ruei-sung Lin2012-05-023-110/+15
|/ | | | Change-Id: I8c5cf035f195142607875739604d163c7a43e305
* Fix b/5821633: Could not activate GLEnvironmentRuei-sung Lin2012-04-301-2/+6
| | | | Change-Id: I35a05eb24299b85a869b973599a091381369aac2
* Resolving the black screen / crash in effectsPannag Sanketi2012-04-261-3/+18
| | | | | | | | b:/6278826 The SurfaceTextureTarget Filter was not unregistering the surface on closing leading to crashes and blank screens. Change-Id: Ia9f6fc69b92d5a5e2e1e3803969152d11528aa3d
* Multi-Project Commit: Move of filterfw out of system/media (2 of 7)Marius Renn2012-03-27245-0/+31004
This is part of the multi-project commit to move the filter-framework from system/media/mca to frameworks/base/media/mca. Note that the filter-framework will soon be replaced with a refactored version currently under API review (also to go under frameworks/base). This move is done now to unblock the PDK efforts. Change-Id: I9f42be5a12a9e8157512be11f04e38e4548970be
generated by cgit v1.1 at 2024-05-25 13:31:11 +0000