summaryrefslogtreecommitdiffstats
path: root/services
Commit message (Collapse)AuthorAgeFilesLines
* Merge "CameraService: fix race condition and wrong last frame number."Jianing Wei2014-04-172-156/+71
|\
| * CameraService: fix race condition and wrong last frame number.Jianing Wei2014-04-172-156/+71
| | | | | | | | Change-Id: Ie2be9a77a0b074497615de38cbb8e8f13b4858ec
* | am e80631aa: am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-152-3/+3
|\ \ | | | | | | | | | | | | | | | * commit 'e80631aa1992ca50af679cd6a018c0ffda7f9b17': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
| * \ am 839d11d1: Merge changes I0a744dc7,Id993a70dMark Salyzyn2014-04-152-3/+3
| |\ \ | | | | | | | | | | | | | | | | | | | | * commit '839d11d1f7be9dff2f06c7d30a9eb39cb6782078': media: use size_t for integer iterator to Vector::size() media: 64 bit compile issues
| | * | media: use size_t for integer iterator to Vector::size()Mark Salyzyn2014-04-152-3/+3
| | | | | | | | | | | | | | | | Change-Id: I0a744dc7815a86a993df9b0623440be620ec8903
| * | | am 65550a0e: am 0370be96: DO NOT MERGE: camera: Fix setParameters for ↵Igor Murashkin2014-03-252-44/+121
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Preview FPS single/range values * commit '65550a0e17852fe657795508e3bf05bdbfb2520b': DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
| | * \ \ am 0370be96: DO NOT MERGE: camera: Fix setParameters for Preview FPS ↵Igor Murashkin2014-03-252-44/+121
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | single/range values * commit '0370be96e33ea0c8fb4069e704deccce43b7403c': DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range values
| | | * | | DO NOT MERGE: camera: Fix setParameters for Preview FPS single/range valuesIgor Murashkin2014-03-252-44/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As a workaround, duplicate CameraParameters into CameraParameters2 to prevent ABI break for some camera HALs that directly link into CameraParameters. CameraParameters2 implements the real fixes needed in the framework, while CameraParameters is left in to satisfy older camera HALs. Bug: 12609188 Change-Id: I82ea6f5de2183dd046d4bf5683600c97f37ab4da
* | | | | | Merge "Camera: don't dereference timestamp if it is missing"Zhijun He2014-04-151-6/+9
|\ \ \ \ \ \
| * | | | | | Camera: don't dereference timestamp if it is missingZhijun He2014-04-141-6/+9
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | Bug: 14059542 Change-Id: I8b45a98ef4b296db314cab3819d11626ac7211be
* | | | | | Merge "Improve resampler filter computation speed"Andy Hung2014-04-151-1/+25
|\ \ \ \ \ \
| * | | | | | Improve resampler filter computation speedAndy Hung2014-04-021-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Approximate speed improvement is 10-15% for filter computation, which is floating point intensive. This will be important for devices without hw floating point support. Change-Id: I10b4e778c8d632b52218a777504b092c189e437f Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | | audioflinger: forward device change to effects in direct threadGlenn Kasten2014-04-141-0/+10
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Device change during offload playback is not informed to effect chain which causes effects still work on unexpected output devices. Add device change notification in direct output thread. Original author wjiang <wjiang@codeaurora.org> CRs-Fixed: 630408 Bug: 14053172 Signed-off-by: Glenn Kasten <gkasten@google.com> Change-Id: I094a99bdf540479cee2fca6614ec35c2fa7d6046
* | | | | | Merge "Update test-resample to handle multichannel"Andy Hung2014-04-121-57/+48
|\ \ \ \ \ \
| * | | | | | Update test-resample to handle multichannelAndy Hung2014-04-101-57/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Option -c # specifies number of channels (mono default). Option -s to specify stereo is removed (-c 2 replaces). Option -h to specify WAV header is removed (WAV is now default). Change-Id: Iba4b83806028a8a9c1ddba6f555182d214ef73ff Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | | Merge "camera3: Remove register_stream_buffers for HAL 3.2+"Vineeta Srivastava2014-04-103-2/+78
|\ \ \ \ \ \ \
| * | | | | | | camera3: Remove register_stream_buffers for HAL 3.2+Igor Murashkin2014-04-093-2/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use 'setprop camera.dev.register_stream 1' to skip the fatal NULL check - This property will be removed before shipping L Bug: 13301331 Bug: 13435680 Change-Id: I16aacd7b22e0a10b34f6fb8501be0256170a8cd5
* | | | | | | | Merge "CameraService: trigger appropriate callbacks for burst capture."Jianing Wei2014-04-1023-309/+389
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | CameraService: trigger appropriate callbacks for burst capture.Jianing Wei2014-04-1023-309/+389
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Instead of tracking CameraMetadata only, now we track both CameraMetadata and CaptureResultExtras, which is not part of the HAL metadata. This will enable the correct callback of onCaptureStarted and onResultReceived given burst requests. * Get last frame number in reply when submitting requests, canceling requests, and flushing device. For repeating requests, this frame number is the last frame number of the previous request. For non-repeating requests, this frame number is the expected last frame number of the current request. The goal is provide frame number to Java side in order to trigger onCaptureSequenceCompleted correctly. * Fix notifyError so that onDeviceError can be called correctly. Bug: 10749500 Change-Id: I2f3dda6c530090055d4a2ff9f0f087bbbe8d9257
* | | | | | | | Add and enable floating point option for audio resamplerAndy Hung2014-04-093-164/+179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Can be tested with test-resample. Change-Id: I8339846d7c647444b6025d33cfa145d5d3658121 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | | | Add floating point to audio resample processingAndy Hung2014-04-092-85/+163
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add template type parameters for input, output data type. Minor change in non-NEON mono channel handling. Minor fixup on comments. Change-Id: I7dc9972d130913718b62f32c02d31f99c06682f2 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | | | Add capability for floating point Kaiser window filtersAndy Hung2014-04-081-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idbb33248bbab2300c2650a4657d8fbc482a5d46c Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | | | Update test-resample to handle floating pointAndy Hung2014-04-081-17/+54
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib34d716fbabcd5eb70f8a5ffcf362e242671d916 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | | | Merge "Fix 64-bit build warnings"Glenn Kasten2014-04-081-10/+11
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix 64-bit build warningsGlenn Kasten2014-04-081-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I667401522cb4ccd41013e2883a4c75ddeca08ef6
* | | | | | | Fix regression in FastMixer statisticsGlenn Kasten2014-04-071-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some point, the mSampleRate in FastMixerDumpState stopped being initialized correctly. I'm not sure when this happened, it doesn't seem to be introduced in recent CLs. This lack of initialization caused some of the FastMixer statistics based on sample rate to be useless. Change-Id: Id2a96d606130a90c4c4f1bddd59778f6c6428a9c
* | | | | | Change references of Q19.12 to Q4.27 for clarityAndy Hung2014-04-025-9/+10
|/ / / / / | | | | | | | | | | | | | | | | | | | | Change-Id: I5beb7daf6ff9bc123ff3582f7c294edcaf8652f6 Signed-off-by: Andy Hung <hunga@google.com>
* | | | | Merge "FastMixer use FastThread and FastMixerState use FastThreadState"Glenn Kasten2014-04-013-18/+13
|\ \ \ \ \
| * | | | | FastMixer use FastThread and FastMixerState use FastThreadStateGlenn Kasten2014-03-313-18/+13
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I594c973e9f575113bdefee6f4cf8c29d8beac1f3
* | | | | | Merge changes I5748f47d,I3f074933Glenn Kasten2014-04-014-1/+117
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | * changes: Add FastThread.h Add FastThreadState
| * | | | | Add FastThread.hGlenn Kasten2014-03-311-0/+38
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5748f47dbfa42c14cc93973742e05ac963bf3ba8
| * | | | | Add FastThreadStateGlenn Kasten2014-03-313-1/+79
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3f07493375ace6e5cfdcd02ad90c4b6fad543b0c
* | | | | | Add FIXMEs to createRecord for fast captureGlenn Kasten2014-03-312-9/+13
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I759be200fae32969212c52a409f46f2e704081e3
* | | | | Merge "Mark the logging heap read-only to media.log service"Glenn Kasten2014-03-281-1/+1
|\ \ \ \ \
| * | | | | Mark the logging heap read-only to media.log serviceGlenn Kasten2014-03-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie26a9e7e37c951774c71d2c53886db52dd5479aa
* | | | | | Merge "Camera3: fix HAL3.x version check issue"Zhijun He2014-03-275-5/+17
|\ \ \ \ \ \
| * | | | | | Camera3: fix HAL3.x version check issueZhijun He2014-03-275-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Camera service should support HAL3.x instead of only HAL3.0. Bug: 13609405 Change-Id: If7e86f9abe019547fc0be2e11337551cd7c57870
* | | | | | | Fix the buildEric Laurent2014-03-262-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2169a3d26f4e35e5cfa35a1264175aab6ac4db41
* | | | | | | Merge "audio policy: remove obsolete AudioPolicyManager class members"Eric Laurent2014-03-272-38/+0
|\ \ \ \ \ \ \
| * | | | | | | audio policy: remove obsolete AudioPolicyManager class membersEric Laurent2014-03-262-38/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove mHasA2dp, mHasUsb and mHasRemoteSubmix members from AudoPolicyManager. They are not needed any more since we use device descriptors with additional attributes. Also remove obsolete limitation on device address length (MAX_DEVICE_ADDRESS_LEN). Change-Id: Iffe760a521692a4b50be3f6b935af84afb61bb86
* | | | | | | | Merge "audio policy: use new audio device representation"Eric Laurent2014-03-272-281/+549
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | audio policy: use new audio device representationEric Laurent2014-03-262-281/+549
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Represent audio devices with more attributes than just the type (audio_device_t). This is in preparation for new routing APIs allowing device selection based on more criteria than just the type (address, channel mask...) A new class DeviceDescriptor is created and used by functions needing more information than just the device type. Bit fields for available and supported input or output devices are replaced by vectors of device descriptors. Each available device is allocated a unique ID for future use. Removed obsolete mA2dpDeviceAddress, mScoDeviceAddress and mUsbCardAndDevice fields replaced by address stored in DeviceDescriptor. Policy decisions like getDeviceForStrategy() are still based only on the device type. Change-Id: I5de3b3ffb12ff8dcfb746782ab1e6b15bf040d0c
* | | | | | | | Merge "Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>"Glenn Kasten2014-03-261-12/+12
|\ \ \ \ \ \ \ \
| * | | | | | | | Use symbol AUDIO_IO_HANDLE_NONE from <system/audio.h>Glenn Kasten2014-03-261-12/+12
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: Id6b1aa17558eb73e17f22b8eab6cd02e00a96dff
* | | | | | | | Merge "Use LOG_ALWAYS_FATAL instead of LOG_FATAL"Glenn Kasten2014-03-264-15/+15
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Use LOG_ALWAYS_FATAL instead of LOG_FATALGlenn Kasten2014-03-264-15/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | LOG_FATAL is compiled out in most builds, so the assertion checks were not being performed. Change-Id: I774f0985ab9c5ccecd8989a0f1c940386b73fc35
* | | | | | | | Merge "Use symbolic constants from <system/audio.h>"Glenn Kasten2014-03-261-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Use symbolic constants from <system/audio.h>Glenn Kasten2014-03-251-1/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AUDIO_INTERLEAVE_* AUDIO_STREAM_MIN AUDIO_SESSION_ALLOCATE Change-Id: I31dd6f327204685e50716079ce21c4ba206dff11
* | | | | | | | Merge "Use symbol AUDIO_DEVICE_NONE from <system/audio.h>"Glenn Kasten2014-03-261-2/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Use symbol AUDIO_DEVICE_NONE from <system/audio.h>Glenn Kasten2014-03-251-2/+2
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I61f882c5e7c949bf00d3bfc745ebf3b5e1c42a58