| 4642ae0614dce6559d64765df1005f8e01b82ece |
18-Feb-2016 |
Aurimas Liutikas <aurimas@google.com> |
Suppressed unused parameter warnings in frameworks/base/tests/Camera2Tests
Bug: 27149500
Change-Id: I3e522d58db88d2933ae82f6f448a8671316b0b35
impleCamera/jni/Android.mk
impleCamera/jni/colorspace.cpp
impleCamera/jni/sobeloperator.cpp
|
| c2a0b4482d7144e8382346ea4c22c7b89368fec0 |
02-Oct-2014 |
Neil Fuller <nfuller@google.com> |
resolved conflicts for merge of ee665151 to lmp-mr1-dev-plus-aosp
Change-Id: I2588c65b7a9fa43f968151a206924a804f0595a7
|
| 33253a4baa6279f81a73425b49dfb6abe5f5416e |
01-Oct-2014 |
Neil Fuller <nfuller@google.com> |
Switch from FloatMath -> Math and Math.hypot where possible
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
impleCamera/src/androidx/media/filterfw/CropFilter.java
|
| fd887436bd111e4d2c7307578a51b5070025b7f2 |
04-Sep-2014 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Final API revisions
- Rename listeners to callbacks. Listeners are single-method and are interfaces,
while callbacks are abstract may get more methods in the future.
- Use register/unregister for registering callbacks, not add/remove.
Bug: 17389922
Change-Id: Ic6b46ad79cb43a43a85e2a4b63f059d3af99798b
impleCamera/src/androidx/media/filterfw/samples/simplecamera/Camera2Source.java
|
| 0a160acf297b583e12a9710c929c4ba9a38f7353 |
02-Jul-2014 |
Eino-Ville Talvala <etalvala@google.com> |
Camera2: Hide all the deprecated methods and interfaces
Leave them in for now until bundled clients complete updating
Change-Id: Ibd0fc971258ce6b649000c48dd7a6716f1ab91d4
impleCamera/Android.mk
impleCamera/src/androidx/media/filterfw/samples/simplecamera/Camera2Source.java
|
| db075afc85b6b50a5d3a988a17ed0d4e09ef0823 |
21-May-2014 |
Igor Murashkin <iam@google.com> |
camera2: Add partial results to the capture listener (API change)
* Also adds capture sequence aborted callback
Bug: 12492876
Change-Id: I56ec8edbcda8b64c2262ff7472961ac78042c7f4
impleCamera/src/androidx/media/filterfw/samples/simplecamera/Camera2Source.java
|
| 8a985d24ce9a38f40ed88fecbdcd0e75e3a68f44 |
25-Feb-2014 |
John Spurlock <jspurlock@google.com> |
Tabs -> spaces in frameworks/base.
Change-Id: I5a84e8e93ac99b5ed0212b37bf66efa5e53864be
impleCamera/src/androidx/media/filterfw/GraphReader.java
|
| 83511d2f49c9e272f328730586c3d0a7852247f2 |
16-Jan-2014 |
Andy Hung <hunga@google.com> |
Add "throws IOException" to MediaCodec factory methods
android.media.MediaCodec
(createByCodecName|createDecoderByType|createEncoderByType)
now explicitly throws IOException.
Requires changes to existing code for declaration compatibility.
Bug: 11364276
Change-Id: I105ecb7c4bd49bf803111253cd23bab161c988f9
Signed-off-by: Andy Hung <hunga@google.com>
impleCamera/src/androidx/media/filterfw/decoder/AudioTrackDecoder.java
impleCamera/src/androidx/media/filterfw/decoder/CpuVideoTrackDecoder.java
impleCamera/src/androidx/media/filterfw/decoder/GpuVideoTrackDecoder.java
|
| 8ca55fc980a567270d397c7392fd5fa8490f6d42 |
07-Nov-2013 |
Andy Hung <hunga@google.com> |
Revert "Add "throws IOException" to MediaCodec constructors (3)"
This reverts commit 52d8aa79a31c5042d2b43d06f08fa28489b27d1b.
Change-Id: Ic706e0fb469931664499d00fa3a221726b258673
impleCamera/src/androidx/media/filterfw/decoder/AudioTrackDecoder.java
impleCamera/src/androidx/media/filterfw/decoder/CpuVideoTrackDecoder.java
impleCamera/src/androidx/media/filterfw/decoder/GpuVideoTrackDecoder.java
|
| 52d8aa79a31c5042d2b43d06f08fa28489b27d1b |
04-Nov-2013 |
Andy Hung <hunga@google.com> |
Add "throws IOException" to MediaCodec constructors (3)
Change to add "throws IOException" to android.media.MediaCodec
(createByCodecName|createDecoderByType|createEncoderByType). The exception was
previously thrown through the native JNI, but not explicitly declared.
Requires changes to existing code for declaration compatibility.
Bug: 11364276
Change-Id: Ia0d3481397285cb1503bedde37d4651934b3a481
Signed-off-by: Andy Hung <hunga@google.com>
impleCamera/src/androidx/media/filterfw/decoder/AudioTrackDecoder.java
impleCamera/src/androidx/media/filterfw/decoder/CpuVideoTrackDecoder.java
impleCamera/src/androidx/media/filterfw/decoder/GpuVideoTrackDecoder.java
|
| 69b94f7c5520f3fa817a7bb1e4d1205b593e6c47 |
16-Oct-2013 |
Igor Murashkin <iam@google.com> |
SmartCamera: Fix to build against latest camera2 api
Bug: 10818732
Change-Id: I536021b9663331532e2f4c21a4fc0f3de5da9aa9
impleCamera/Android.mk
impleCamera/src/androidx/media/filterfw/samples/simplecamera/Camera2Source.java
impleCamera/tests/Android.mk
|
| bd7f343c7510aa512ceb6d6833ca0e4f2aa2a1d2 |
21-Sep-2013 |
Igor Murashkin <iam@google.com> |
Camera2Tests: update SmartCamera for async api
Change-Id: I6eb541c96ee50756c35e7785fdae63e8e45e2726
impleCamera/Android.mk
impleCamera/src/androidx/media/filterfw/samples/simplecamera/Camera2Source.java
|
| 227b47625d7482b5b47ad0e4c70ce0a246236ade |
19-Sep-2013 |
Benjamin Hendricks <coolbnjmn@google.com> |
Camera2Tests: Add SmartCamera App
Bug: 10818732
Change-Id: I6ac08ecab3a1e04116be2f7764d0d5d4f29c5cd9
ndroid.mk
EADME.txt
impleCamera/.classpath
impleCamera/.project
impleCamera/Android.mk
impleCamera/AndroidManifest.xml
impleCamera/assets/0002_000390.jpg
impleCamera/assets/frsdk_expression_modules/BCLeyesclosed_100.emd
impleCamera/assets/frsdk_expression_modules/BCLjoy_100.emd
impleCamera/ic_launcher-web.png
impleCamera/jni/Android.mk
impleCamera/jni/Application.mk
impleCamera/jni/brightness.cpp
impleCamera/jni/brightness.h
impleCamera/jni/colorspace.cpp
impleCamera/jni/colorspace.h
impleCamera/jni/contrast.cpp
impleCamera/jni/contrast.h
impleCamera/jni/exposure.cpp
impleCamera/jni/exposure.h
impleCamera/jni/frametovalues.cpp
impleCamera/jni/frametovalues.h
impleCamera/jni/histogram.cpp
impleCamera/jni/histogram.h
impleCamera/jni/imgprocutil.h
impleCamera/jni/pixelutils.cpp
impleCamera/jni/pixelutils.h
impleCamera/jni/sobeloperator.cpp
impleCamera/jni/sobeloperator.h
impleCamera/jni/stats_scorer.cpp
impleCamera/jni/stats_scorer.h
impleCamera/proguard-project.txt
impleCamera/project.properties
impleCamera/res/drawable-hdpi/black_screen.jpg
impleCamera/res/drawable-hdpi/ic_launcher.png
impleCamera/res/drawable-hdpi/ic_menu_gallery.png
impleCamera/res/drawable-hdpi/ic_menu_quill.png
impleCamera/res/drawable-hdpi/ic_menu_save.png
impleCamera/res/drawable-ldpi/ic_launcher.png
impleCamera/res/drawable-mdpi/ic_launcher.png
impleCamera/res/drawable-nodpi/android_figure.png
impleCamera/res/drawable-nodpi/oldframe.png
impleCamera/res/drawable-nodpi/polaroid.png
impleCamera/res/drawable-xhdpi/ic_launcher.png
impleCamera/res/layout/imageview.xml
impleCamera/res/layout/simplecamera.xml
impleCamera/res/raw/camera_graph.xml
impleCamera/res/values-v11/styles.xml
impleCamera/res/values-v14/styles.xml
impleCamera/res/values/strings.xml
impleCamera/res/values/styles.xml
impleCamera/src/androidx/media/filterfw/BackingStore.java
impleCamera/src/androidx/media/filterfw/BranchFilter.java
impleCamera/src/androidx/media/filterfw/BrightnessFilter.java
impleCamera/src/androidx/media/filterfw/CameraStreamer.java
impleCamera/src/androidx/media/filterfw/ColorSpace.java
impleCamera/src/androidx/media/filterfw/ColorfulnessFilter.java
impleCamera/src/androidx/media/filterfw/CropFilter.java
impleCamera/src/androidx/media/filterfw/Filter.java
impleCamera/src/androidx/media/filterfw/FilterFactory.java
impleCamera/src/androidx/media/filterfw/FilterGraph.java
impleCamera/src/androidx/media/filterfw/Frame.java
impleCamera/src/androidx/media/filterfw/FrameBuffer1D.java
impleCamera/src/androidx/media/filterfw/FrameBuffer2D.java
impleCamera/src/androidx/media/filterfw/FrameImage2D.java
impleCamera/src/androidx/media/filterfw/FrameManager.java
impleCamera/src/androidx/media/filterfw/FrameQueue.java
impleCamera/src/androidx/media/filterfw/FrameSlotSource.java
impleCamera/src/androidx/media/filterfw/FrameSlotTarget.java
impleCamera/src/androidx/media/filterfw/FrameType.java
impleCamera/src/androidx/media/filterfw/FrameValue.java
impleCamera/src/androidx/media/filterfw/FrameValues.java
impleCamera/src/androidx/media/filterfw/GLToolbox.java
impleCamera/src/androidx/media/filterfw/GraphExporter.java
impleCamera/src/androidx/media/filterfw/GraphInputSource.java
impleCamera/src/androidx/media/filterfw/GraphOutputTarget.java
impleCamera/src/androidx/media/filterfw/GraphReader.java
impleCamera/src/androidx/media/filterfw/GraphRunner.java
impleCamera/src/androidx/media/filterfw/ImageShader.java
impleCamera/src/androidx/media/filterfw/InputPort.java
impleCamera/src/androidx/media/filterfw/MffContext.java
impleCamera/src/androidx/media/filterfw/MotionSensor.java
impleCamera/src/androidx/media/filterfw/NewChromaHistogramFilter.java
impleCamera/src/androidx/media/filterfw/NormFilter.java
impleCamera/src/androidx/media/filterfw/OutputPort.java
impleCamera/src/androidx/media/filterfw/PixelUtils.java
impleCamera/src/androidx/media/filterfw/RenderTarget.java
impleCamera/src/androidx/media/filterfw/ResizeFilter.java
impleCamera/src/androidx/media/filterfw/RotateFilter.java
impleCamera/src/androidx/media/filterfw/ScaleFilter.java
impleCamera/src/androidx/media/filterfw/Signature.java
impleCamera/src/androidx/media/filterfw/SimpleCache.java
impleCamera/src/androidx/media/filterfw/SlotFilter.java
impleCamera/src/androidx/media/filterfw/SobelFilter.java
impleCamera/src/androidx/media/filterfw/StatsFilter.java
impleCamera/src/androidx/media/filterfw/SurfaceHolderTarget.java
impleCamera/src/androidx/media/filterfw/TextViewTarget.java
impleCamera/src/androidx/media/filterfw/TextureSource.java
impleCamera/src/androidx/media/filterfw/Throughput.java
impleCamera/src/androidx/media/filterfw/ThroughputFilter.java
impleCamera/src/androidx/media/filterfw/ToGrayValuesFilter.java
impleCamera/src/androidx/media/filterfw/ToStringFilter.java
impleCamera/src/androidx/media/filterfw/TransformUtils.java
impleCamera/src/androidx/media/filterfw/ValueTarget.java
impleCamera/src/androidx/media/filterfw/VariableSource.java
impleCamera/src/androidx/media/filterfw/ViewFilter.java
impleCamera/src/androidx/media/filterfw/decoder/AudioSample.java
impleCamera/src/androidx/media/filterfw/decoder/AudioTrackDecoder.java
impleCamera/src/androidx/media/filterfw/decoder/CpuVideoTrackDecoder.java
impleCamera/src/androidx/media/filterfw/decoder/DecoderUtil.java
impleCamera/src/androidx/media/filterfw/decoder/GpuVideoTrackDecoder.java
impleCamera/src/androidx/media/filterfw/decoder/MediaDecoder.java
impleCamera/src/androidx/media/filterfw/decoder/TrackDecoder.java
impleCamera/src/androidx/media/filterfw/decoder/VideoTrackDecoder.java
impleCamera/src/androidx/media/filterfw/geometry/Quad.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/AverageFilter.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/AvgBrightnessFilter.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/CSVWriterFilter.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/Camera2Source.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/CameraTestThread.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/ContrastRatioFilter.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/ExposureFilter.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/FaceSquareFilter.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/FloatArrayToSizeFilter.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/FloatArrayToStrFilter.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/IfElseFilter.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/ImageConstants.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/ImageGoodnessFilter.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/MotionSensorWTime.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/SmartCamera.java
impleCamera/src/androidx/media/filterfw/samples/simplecamera/WaveTriggerFilter.java
impleCamera/tests/Android.mk
impleCamera/tests/AndroidManifest.xml
impleCamera/tests/project.properties
impleCamera/tests/res/.README
impleCamera/tests/src/androidx/media/filterfw/FrameSourceFilter.java
impleCamera/tests/src/androidx/media/filterfw/FrameTargetFilter.java
impleCamera/tests/src/androidx/media/filterfw/MffFilterTestCase.java
impleCamera/tests/src/androidx/media/filterfw/MffTestCase.java
impleCamera/tests/src/androidx/media/filterfw/samples/simplecamera/AverageFilterTest.java
impleCamera/tests/src/androidx/media/filterfw/samples/simplecamera/AvgBrightnessFilterTest.java
impleCamera/tests/src/androidx/media/filterfw/samples/simplecamera/ContrastRatioFilterTest.java
impleCamera/tests/src/androidx/media/filterfw/samples/simplecamera/ExposureFilterTest.java
impleCamera/tests/src/androidx/media/filterfw/samples/simplecamera/FaceSquareFilterTest.java
impleCamera/tests/src/androidx/media/filterfw/samples/simplecamera/FloatArrayToSizeFilterTest.java
impleCamera/tests/src/androidx/media/filterfw/samples/simplecamera/FloatArrayToStrFilterTest.java
impleCamera/tests/src/androidx/media/filterfw/samples/simplecamera/IfElseFilterTest.java
impleCamera/tests/src/androidx/media/filterfw/samples/simplecamera/ImageGoodnessFilterTest.java
|