summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* audioflinger: send priority request from a threadEric Laurent2012-09-133-38/+106
| | | | | | | | | | | | | | | | | | | When creating a fast AudioTrack, a request is sent to SchedulingPolicyService to elevate the requesting thread priority. This generates a binder call into system_server process and to a JAVA service via JNI. If the thread from which the track was created is in the system_server process and does not have the "can call java" attribute, a crash occurs because the binder optimization reuses the same thread to process the returning binder call and no JNI env is present. The fix consists in sending the priority change request from the AudioFlinger mixer thread, not from the binder thread. This also reverts the workaround in commit 73431968 Bug 7126707. Change-Id: I3347adf71ffbb56ed8436506d4357eab693078a3
* Handle audio HAL returning 0 bytes in record threadJean-Michel Trivi2012-09-131-4/+4
| | | | | | | Enter standby when HAL returns an error, but also consider 0 bytes returned as NOT_ENOUGH_DATA. Change-Id: Ica83142310e9c176f936e0440571a6034cbc575f
* Merge "Workaround for track recreation bug" into jb-mr1-devJean-Michel Trivi2012-09-131-1/+2
|\
| * Workaround for track recreation bugJean-Michel Trivi2012-09-121-1/+2
| | | | | | | | | | | | | | | | Ignore thread can call Java parameter to work around bug where AudioTrack instance gets recreated when key clicks are enabled and WFD gets turned on, with the wrong parameters. Change-Id: Ia42c8704b46fe3ffea560b05b60939fa2e4b29e1
* | Merge "Don't deadlock on AudioRecord start when reads return 0" into jb-mr1-devEric Laurent2012-09-131-8/+14
|\ \
| * | Don't deadlock on AudioRecord start when reads return 0Jean-Michel Trivi2012-09-121-8/+14
| |/ | | | | | | | | | | | | | | | | | | | | When calling start() on an AudioRecord with a HAL that returns 0 on a read() operation, the start blocking condition was never unblocked. Add a boolean to track the first read operation so the returned number of bytes (mBytesRead) is only evaluated after that first read. Change-Id: I8c735a00d48cd6a0da467ccdf75d3616b38f6afa
* | Better video bandwidth utilization by not lying about the frame rate.Andreas Huber2012-09-133-2/+13
| | | | | | | | | | | | log network bandwidth used (for data traffic). Change-Id: I043018624b3f02d94fa9c0cb9d15a6b2f2bd2eab
* | Various improvements to cleanly shutdown a wfd session.Andreas Huber2012-09-136-49/+86
| | | | | | | | Change-Id: I86f0a27d7e8eb96200153bab847a862f21a19d13
* | Merge "Audio and video bitrate are now configurable through system ↵Andreas Huber2012-09-131-2/+23
|\ \ | | | | | | | | | properties" into jb-mr1-dev
| * | Audio and video bitrate are now configurable through system propertiesAndreas Huber2012-09-131-2/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | adb shell setprop media.wfd.audio-bitrate 64000 adb shell setprop media.wfd.video-bitrate 10000000 are the defaults. Change-Id: Ib4d700748bdac2adffc6e7e31aff9c9f998e20f0
* | | Merge "Use proper number of video buffers to be acquired simultaneously ↵Andreas Huber2012-09-131-2/+1
|\ \ \ | | | | | | | | | | | | from" into jb-mr1-dev
| * | | Use proper number of video buffers to be acquired simultaneously fromAndreas Huber2012-09-131-2/+1
| |/ / | | | | | | | | | | | | | | | SurfaceMediaSource, this should match the number of encoder input buffers. Change-Id: Ibeb102337fd23698c5321c63dd3cb00b93e632b0
* | | Throttle SurfaceMediaSource.Andreas Huber2012-09-132-12/+39
|/ / | | | | | | Change-Id: I214ce60f8d94df9c07041577e34ed1ad5e199fdb
* | Camera2: Fix ZSL bugs.Eino-Ville Talvala2012-09-123-24/+52
|/ | | | | | | | | | | | The ZSL processor was discarding buffers too often, and waiting for new buffers with mutexes held. Also adds basic fallback to regular capture in case the ZSL queue doesn't contain a suitable buffer. Bug: 7147043 Change-Id: I5721267ef08dbc87ef9d8ec47f333db5f67e41c1
* am a923dd4e: am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last ↵Jean-Baptiste Queru2012-09-121-0/+3
|\ | | | | | | | | | | | | output frame" * commit 'a923dd4e6c14f5cba2fc5f6f152619ec6bc70c5d': avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
| * am 1b0ae9e4: Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"Jean-Baptiste Queru2012-09-121-0/+3
| |\ | | | | | | | | | | | | * commit '1b0ae9e47273357e19a9beb22466319753e8242d': avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame
| | * Merge "avcenc: Set OMX_BUFFERFLAG_EOS on the last output frame"Jean-Baptiste Queru2012-09-121-0/+3
| | |\
| | | * avcenc: Set OMX_BUFFERFLAG_EOS on the last output frameMartin Storsjo2012-08-291-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | Without this, the caller might hang waiting for more output buffers. Change-Id: Ief6be00b7600be8498a953e8e88f0582ea8fce85
* | | | Merge "Various improvements to the wifi display implementation." into jb-mr1-devAndreas Huber2012-09-129-66/+448
|\ \ \ \
| * | | | Various improvements to the wifi display implementation.Andreas Huber2012-09-129-66/+448
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using a MediaPuller now, audio and video on their separate threads. No more flushing the RTP stream on audio tracks, since it wastes too much of a full size UDP packet. Change-Id: I53346b4aea739c3142da13bd179428503a3c98b0
* | | | | am fd07d616: am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."Elliott Hughes2012-09-122-2/+4
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | * commit 'fd07d61614e4b358349d1d46a32f9477784404c4': Don't include <linux/socket.h> directly.
| * | | | am fbe1cc92: Merge "Don\'t include <linux/socket.h> directly."Elliott Hughes2012-09-122-2/+4
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'fbe1cc92d9e8930700c15f68717dd66fc1523177': Don't include <linux/socket.h> directly.
| | * | | Merge "Don't include <linux/socket.h> directly."Elliott Hughes2012-09-122-2/+4
| | |\ \ \
| | | * | | Don't include <linux/socket.h> directly.Elliott Hughes2012-09-112-2/+4
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | In newer versions of Linux, stuff you need isn't in that file any more. Change-Id: I62923ed2d92a75ff3182ba2ae27578ce7bde8356
* | | | | Merge "Camera2: Use full pixel array for ZSL stream" into jb-mr1-devEino-Ville Talvala2012-09-111-3/+4
|\ \ \ \ \
| * | | | | Camera2: Use full pixel array for ZSL streamEino-Ville Talvala2012-09-111-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For efficiency, use full pixel array size for the ZSL output/input streams, instead of the final picture size. Bug: 7139362 Change-Id: I98ad4f5a1ca283efe87ae60bf0cf39573e22d2f3
* | | | | | Merge "Camera2: Configure ZSL at the right time." into jb-mr1-devEino-Ville Talvala2012-09-112-10/+9
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Camera2: Configure ZSL at the right time.Eino-Ville Talvala2012-09-112-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ZSL enable was too early in the camera startup sequence, resulting it being turned off most of the time. Bug: 7148012 Change-Id: Ie144dd960d018a34b0bc77c88208ca22b7112772
* | | | | | Merge "Add getError and setError to propagate error code from ↵Edwin Wong2012-09-113-1/+25
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | WVMMediaExtractor up to player." into jb-mr1-dev
| * | | | | | Add getError and setError to propagate error code from WVMMediaExtractor up ↵Edwin Wong2012-09-113-1/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to player. The two virtual functions provides a path for the player(AwesomePlayer) to retrieve the last error from WVMMediaExtractor container. Change-Id: Iee8d4a3eccf82af95eb3d4d465f069daced4aa1a related-to-bug: 7073630
* | | | | | | Merge "Camera1: Fix enable shutter sound command error handling." into ↵Eino-Ville Talvala2012-09-111-4/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev
| * | | | | | | Camera1: Fix enable shutter sound command error handling.Eino-Ville Talvala2012-09-111-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return the error codes from calls to enableShutterSound to the caller, and don't call the HAL with the enable shutter sound command. Change-Id: Ibe4943bd1cd0fcd1832fd904f12dd2f78fec06a5
* | | | | | | | Merge "Camera: Add HDR scene mode constants." into jb-mr1-devEino-Ville Talvala2012-09-112-0/+5
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Camera: Add HDR scene mode constants.Eino-Ville Talvala2012-09-102-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I78b1f8ca3c1a03222ed363db26d9a09cf0b13528
* | | | | | | | Merge "Communicate audio session ID to downmixer" into jb-mr1-devJean-Michel Trivi2012-09-115-14/+17
|\ \ \ \ \ \ \ \
| * | | | | | | | Communicate audio session ID to downmixerJean-Michel Trivi2012-09-105-14/+17
| | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio downmixer effect might need the audio session Id, pass it from the track creation in AudioFlinger to the downmix effect creation in AudioMixer. Change-Id: I5e29540542ae89cf4a0cdb537b3e67f04442a20a
* | | | | | | | am ed757e97: am 290ac693: Merge "Stop building the unused host libmtp static ↵Elliott Hughes2012-09-111-28/+0
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | / / | |_|_|_|_|/ / |/| | | | | | | | | | | | | | | | | | | | library." * commit 'ed757e9729b325f00e70f506ad6e217910563d0a': Stop building the unused host libmtp static library.
| * | | | | | am 290ac693: Merge "Stop building the unused host libmtp static library."Elliott Hughes2012-09-111-28/+0
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | * commit '290ac69379e649a2fed1d9441a17e39c6a912d8c': Stop building the unused host libmtp static library.
| | * | | | | Merge "Stop building the unused host libmtp static library."Elliott Hughes2012-09-111-28/+0
| | |\ \ \ \ \
| | | * | | | | Stop building the unused host libmtp static library.Elliott Hughes2012-09-111-28/+0
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the need to support the bionic mktime_tz and localtime_tz extensions on glibc, which makes my life easier. Bug: 7012465 Change-Id: Ibfa187f2857dda7bd1536348e314a80abacb9d1e
* | | | | | | Merge "Limit maximum equalizer gain." into jb-mr1-devEric Laurent2012-09-112-40/+68
|\ \ \ \ \ \ \
| * | | | | | | Limit maximum equalizer gain.Eric Laurent2012-09-102-40/+68
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Limit maximum gain in all EQ bands according to current volume so that total gain (current volume + band gain) does not exceed a certain limit. The gain difference between bands is preserved. Change-Id: Ice5a9705a0b3353e8778b4c539a29ca9cdf60390
* | | | | | | Merge "Camera2: Temporarily stop pre-allocation of recording stream." into ↵Eino-Ville Talvala2012-09-101-7/+2
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | jb-mr1-dev
| * | | | | | Camera2: Temporarily stop pre-allocation of recording stream.Eino-Ville Talvala2012-09-101-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When recordingHint is set, don't pre-allocate recording stream on preview start. Bug: 7137947 Change-Id: I06b5f6d7dbb21d4d0747974ba001b0c8929a0b02
* | | | | | | Merge "Camera2: Clean up the right streams." into jb-mr1-devEino-Ville Talvala2012-09-101-3/+16
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Camera2: Clean up the right streams.Eino-Ville Talvala2012-09-101-3/+16
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Change-Id: I780c3e8e255f6a185e0edf1d76f35afdc74dff48
* | | | | | Merge "audio effects: no audio preprocessing by default" into jb-mr1-devEric Laurent2012-09-101-15/+24
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | audio effects: no audio preprocessing by defaultEric Laurent2012-09-101-15/+24
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The audio preprocessings are not included in the default audio_effect.conf file anymore as the audio HAL has to provide support for them. Each product implementing one or more audio pre processing must provide a specific audio_effects.conf file. Change-Id: I3b2f636f7a8748829798d4b9057d269db9424d62
* | | | | Merge "Enable audio streaming to a wifi display. Remove startup delay hack." ↵Andreas Huber2012-09-102-11/+4
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | into jb-mr1-dev
| * | | | | Enable audio streaming to a wifi display. Remove startup delay hack.Andreas Huber2012-09-102-11/+4
| |/ / / / | | | | | | | | | | | | | | | Change-Id: I2e163db1595bb504de3a2e99cace191aa90708ca