OSDN Git Service
Eric Laurent [Tue, 3 Jul 2012 19:23:02 +0000 (12:23 -0700)]
audio policy: fix delayed command insertion
When inserting a delayed command in the audio policy service
command thread queue, later similar commands are filtered out.
In case of volume commands and delayed unmuting, this can cause
a problem where a new volume command can cause the timing of a
delayed unmuting command to not be honored.
This change makes that a volume command gets the time stamp of
any delayed command it replaces.
Bug
6720482.
Change-Id: I216f85ac0ea46e4a046d3483e9e9b7ffe6c34a08
Eric Laurent [Tue, 3 Jul 2012 19:22:18 +0000 (12:22 -0700)]
Merge "audioflinger: fix effect disconnect deadlock"
The Android Open Source Project [Tue, 3 Jul 2012 19:14:26 +0000 (12:14 -0700)]
The Android Open Source Project [Tue, 3 Jul 2012 19:11:47 +0000 (12:11 -0700)]
Reconcile with jb-release
Change-Id: I7c52b8e82465f28b32e8ebf6df56c258458f2cd3
Eric Laurent [Mon, 25 Jun 2012 18:38:29 +0000 (11:38 -0700)]
audioflinger: fix effect disconnect deadlock
Fix possible deadlock when several EffectHandles on the same
EffectModule are destroyed simultaneously:
A wp on an EffectHandle should not be promoted to a local sp
with ThreadBase mutex held as the EffectHandle destructor can be
called when the sp gets out of scope which will call
ThreadBase::disconnectEffect() and try to acquire the mutex.
Use raw pointers instead of weak pointers for the list of handles
on an EffectModule.
Bug
6679606.
Change-Id: Ice8b602fb03a7d363c44ce3dced8a53540d96270
Glenn Kasten [Mon, 2 Jul 2012 19:42:44 +0000 (12:42 -0700)]
Use audio_channel_mask_t more consistently
In IAudioFlinger::createTrack() and IAudioFlinger::openRecord(),
declare input parameter to use correct type audio_channel_mask_t.
In IAudioFlinger::getInputBufferSize(), input parameter is now channel mask
instead of channel count.
Remove unused IAudioFlinger::channelCount(audio_io_handle_t).
In AudioRecord::getMinFrameCount() and AudioSystem::getInputBufferSize(),
input parameter is channel mask instead of channel count.
Change-Id: Ib2f1c29bea70f016b3cfce83942ba292190ac965
Glenn Kasten [Mon, 2 Jul 2012 23:10:16 +0000 (16:10 -0700)]
Remove longStandbyExit
It was never set (the assignment was within an "if" that was never true).
Change-Id: I01cc68e9df6b190eece621b2aa9858b4361880ce
Glenn Kasten [Mon, 2 Jul 2012 23:11:18 +0000 (16:11 -0700)]
Fix uninitialized field EffectModule::mPinned
Also mark EffectModule::mId and EffectModule::mSessionId const, and
document the initialization of other fields in EffectModule.
Change-Id: Ic1ca008e75e9b5924743ffc35bef80057f3a0669
Glenn Kasten [Sun, 18 Mar 2012 17:33:27 +0000 (10:33 -0700)]
Compare sp<> to 0 and raw pointers to NULL
Change-Id: I50ff8a010d349d1d7e3dffa04a6331814c2128b0
James Dong [Mon, 2 Jul 2012 20:25:37 +0000 (13:25 -0700)]
Merge "Fixed a video editor crash due to "divided by 0""
The Android Automerger [Mon, 2 Jul 2012 19:54:56 +0000 (12:54 -0700)]
merge in jb-release history after reset to jb-dev
Eric Laurent [Mon, 2 Jul 2012 19:45:53 +0000 (12:45 -0700)]
am
dbbd5b86: am
109347d4: audioflinger: fix regression in attachAuxEffect().
* commit '
dbbd5b860a3a26bea3376410f75f27530d9cd10b':
audioflinger: fix regression in attachAuxEffect().
Eric Laurent [Mon, 2 Jul 2012 19:43:14 +0000 (12:43 -0700)]
am
109347d4: audioflinger: fix regression in attachAuxEffect().
* commit '
109347d421413303eb1678dd9e2aa9d40acf89d2':
audioflinger: fix regression in attachAuxEffect().
Eric Laurent [Mon, 2 Jul 2012 19:31:03 +0000 (12:31 -0700)]
audioflinger: fix regression in attachAuxEffect().
Commit
717e1286 introduced a regression in PlaybackThread::Track::attachAuxEffect()
when called with an effect ID of 0 to detach the auxiliary effect.
It is normal in this case that AudioFlinger::getEffectThread_l() returns 0.
Bug
6768757.
Change-Id: I7430bd1aad2f68da38f7c3e4794e7ad657bfc6be
Eric Laurent [Sun, 1 Jul 2012 16:36:38 +0000 (09:36 -0700)]
am
651f9e7c: am
717e1286: audioflinger: fix auxiliary effect attachment
* commit '
651f9e7c972b58a49066081187161268bcf9237a':
audioflinger: fix auxiliary effect attachment
Eric Laurent [Sun, 1 Jul 2012 16:33:59 +0000 (09:33 -0700)]
am
717e1286: audioflinger: fix auxiliary effect attachment
* commit '
717e128691f083a9469a1d0e363ac6ecd5c65d58':
audioflinger: fix auxiliary effect attachment
James Dong [Sat, 30 Jun 2012 01:39:46 +0000 (18:39 -0700)]
Fixed a video editor crash due to "divided by 0"
The crash was because the video sample was too short and has 0 duration (or a single frame video).
This patch is just simply not to support 0 duration video for editing.
Change-Id: I2c7ff78b1e884a4d3a5051f87cdbeeb5dc3078a6
related-to-bug:
6670656
Eric Laurent [Fri, 29 Jun 2012 23:36:52 +0000 (16:36 -0700)]
audioflinger: fix auxiliary effect attachment
Auxiliary effects (Reverb) are global effects and as such follow
the default rule which is to attach them to the output thread that
handles music streams by default. This causes a problem when several
threads are eligible to handle music streams as tracks can be attached
to either thread based on criteria unknown when teh effect is created.
The fix consists in moving the auxiliary effect if necessary when an
AudioTrack is attached to it and this track is not on the same
output thread.
Bug
6608561.
Change-Id: Ib32c3cabc731b2046aba728be1771982999c6069
James Dong [Fri, 29 Jun 2012 22:14:20 +0000 (15:14 -0700)]
Fixed a media server crash due to unintialized mRecord member variable
mRecord is not properly initialized if the call to AudioRecord::getMinFrameCount() fails.
media server crashes when the unintialized mRecord object is deleted in AudioSource's destructor.
Change-Id: Ia89222789d044c11c9957a99725bc89f9c709e17
related-to-bug:
6744014
Nick Kralevich [Tue, 26 Jun 2012 20:32:23 +0000 (13:32 -0700)]
Add mode when open(O_CREAT) is used.
When creating a new file using open(..., O_CREAT), it is an error
to fail to specify a creation mode. If a mode is not specified, a
random stack provided value is used as the "mode".
This will become a compile error in a future Android change.
Change-Id: I36a3d67d294a915c1f79632a1b0ba45edd1214b1
Glenn Kasten [Tue, 26 Jun 2012 00:28:11 +0000 (17:28 -0700)]
Merge "AudioRecord comments"
Glenn Kasten [Mon, 25 Jun 2012 20:45:12 +0000 (13:45 -0700)]
AudioRecord comments
Group the private fields according to how they are used
Change-Id: I7ce3d0939510c10f34bd91a55f6e03afc8e7d43c
Glenn Kasten [Mon, 25 Jun 2012 21:18:56 +0000 (14:18 -0700)]
Merge "Remove acoustics from AudioSystem::getInput()"
Glenn Kasten [Fri, 22 Jun 2012 20:43:51 +0000 (13:43 -0700)]
Remove acoustics from AudioSystem::getInput()
Change-Id: I29fb3ee5664c1f0ee0409c1bb2be087ecca637db
Eric Laurent [Mon, 25 Jun 2012 18:29:21 +0000 (11:29 -0700)]
Merge "audioflinger: fix setStreamOutput()"
Glenn Kasten [Thu, 21 Jun 2012 23:24:00 +0000 (16:24 -0700)]
Use audio_channel_mask_t in AudioRecord
Change-Id: I9e1b918b2635d961604a4a9d88eb1c7179a167a7
Glenn Kasten [Thu, 21 Jun 2012 23:24:14 +0000 (16:24 -0700)]
Remove unused AudioRecord::channels()
It was declared but never implemented or called.
Change-Id: If5846147fcbd7f6d4187971e2044dd6fd3252b42
Glenn Kasten [Thu, 21 Jun 2012 23:22:09 +0000 (16:22 -0700)]
Include what you use
Change-Id: I12ef9367d05dbe069c037b1b4acd6347a8cf3ece
Glenn Kasten [Mon, 25 Jun 2012 15:35:48 +0000 (08:35 -0700)]
Merge "Remove AudioRecord record_flags"
The Android Open Source Project [Mon, 25 Jun 2012 15:00:18 +0000 (08:00 -0700)]
The Android Open Source Project [Mon, 25 Jun 2012 14:57:15 +0000 (07:57 -0700)]
Reconcile with jb-release
Change-Id: I1ce46fa6332f684c76c276117c7b406bdd5e9336
Jesse Hall [Wed, 13 Jun 2012 21:52:12 +0000 (14:52 -0700)]
Provide new argument to BufferQueue::releaseBuffer
Change-Id: Ib86f1af80a0d2833535a0ad170dce5ac061eec75
The Android Automerger [Sat, 23 Jun 2012 01:21:17 +0000 (18:21 -0700)]
merge in jb-release history after reset to jb-dev
Jamie Gennis [Fri, 22 Jun 2012 22:23:50 +0000 (15:23 -0700)]
am
e6cb412b: am
33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev
* commit '
e6cb412b677966c25b424766dc6ceb2787d49caa':
SurfaceMediaSource: keep refs to current buffers
Jamie Gennis [Fri, 22 Jun 2012 22:20:48 +0000 (15:20 -0700)]
am
33e28dd3: Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev
* commit '
33e28dd3c033641f4db9d1b99c7c88d6d08c61f7':
SurfaceMediaSource: keep refs to current buffers
Jamie Gennis [Fri, 22 Jun 2012 22:18:26 +0000 (15:18 -0700)]
Merge "SurfaceMediaSource: keep refs to current buffers" into jb-dev
Jamie Gennis [Fri, 22 Jun 2012 21:42:00 +0000 (14:42 -0700)]
SurfaceMediaSource: keep refs to current buffers
This change fixes a bug in SurfaceMediaSource where it would not keep a
reference to all of the Gralloc buffers that the video encoder is currently
using.
Bug:
6655597
Change-Id: Ifd99976cc7ae57ed724bbf2bbcff357a39497391
Glenn Kasten [Wed, 7 Mar 2012 16:16:36 +0000 (08:16 -0800)]
Remove AudioRecord record_flags
Change-Id: I021ddcc1bcb63132a4597d13e3d09db2a5f2c628
The Android Open Source Project [Fri, 22 Jun 2012 15:18:25 +0000 (08:18 -0700)]
am
5ca15ccf: Reconcile with jb-release
* commit '
5ca15ccf7336d5aa5a7b563742757fa37092eb48':
Revert input buffer count for the SoftAAC* decoders back to 4.
The Android Open Source Project [Fri, 22 Jun 2012 15:16:51 +0000 (08:16 -0700)]
Reconcile with jb-release
Change-Id: Iea91c1026e7fc3a59815e01e4e4168f875527e7c
Jamie Gennis [Wed, 13 Jun 2012 23:29:51 +0000 (16:29 -0700)]
Update ANativeWindow client code for sync
This change updates all the uses of ANativeWindow to use the new ANW functions
that accept and return Sync HAL fence file descriptors.
Change-Id: Id7db42d8d6380f8b440d88476ce9211c6225fb16
Glenn Kasten [Thu, 21 Jun 2012 18:43:33 +0000 (11:43 -0700)]
Merge "Workaround for corrupt Vorbis comment"
Andreas Huber [Wed, 20 Jun 2012 19:46:38 +0000 (12:46 -0700)]
Revert input buffer count for the SoftAAC* decoders back to 4.
This improves the netflix bandwidth change responsiveness.
With the old count of 32 the audio decoder running at a higher
priority would starve the video decoder for about 1 sec while
draining the input data.
I haven't been able to break any stream playback using MediaCodec
using the lower count, even though I'm sure I had a good reason
to increase it in the first place (see bug
6478823)
Change-Id: I7fd3e71794b0cc1570ea9d27d1d869ab1e1750c4
related-to-bug:
6685031
Andreas Huber [Wed, 20 Jun 2012 21:34:49 +0000 (14:34 -0700)]
am
e77c76dc: am
39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.
* commit '
e77c76dc57f88ec9e6b370dcba8a8c3e0684461d':
Revert input buffer count for the SoftAAC* decoders back to 4.
Andreas Huber [Wed, 20 Jun 2012 21:31:30 +0000 (14:31 -0700)]
am
39a31135: Revert input buffer count for the SoftAAC* decoders back to 4.
* commit '
39a3113539f9bcc86a8efe562780c23ac8731098':
Revert input buffer count for the SoftAAC* decoders back to 4.
Andreas Huber [Wed, 20 Jun 2012 19:46:38 +0000 (12:46 -0700)]
Revert input buffer count for the SoftAAC* decoders back to 4.
This improves the netflix bandwidth change responsiveness.
With the old count of 32 the audio decoder running at a higher
priority would starve the video decoder for about 1 sec while
draining the input data.
I haven't been able to break any stream playback using MediaCodec
using the lower count, even though I'm sure I had a good reason
to increase it in the first place (see bug
6478823)
Change-Id: I7fd3e71794b0cc1570ea9d27d1d869ab1e1750c4
related-to-bug:
6685031
Eric Laurent [Wed, 20 Jun 2012 19:26:32 +0000 (12:26 -0700)]
audioflinger: fix setStreamOutput()
AudioFlinger::setStreamOutput() should also work for direct outputs.
Also ignore the destination output specified to match the expected
behavior which is to invalidate all tracks using the specified stream
type so that they can be re created on the correct ouput thread.
Do not send STREAM_CONFIG_CHANGED event wich is ignored by AudioSystem
anyway since the stream to output cache has been removed.
Change-Id: I13d9d47922923b630dd755717875424c16be4637
Glenn Kasten [Tue, 19 Jun 2012 21:44:41 +0000 (14:44 -0700)]
Workaround for corrupt Vorbis comment
Bug:
6682991
Change-Id: I8b0d91ab76b700ab981f2524124109234023a9da
Eric Laurent [Fri, 15 Jun 2012 21:45:03 +0000 (14:45 -0700)]
audio policy: acquire lock for volume functions
Acquire the AudioPolicyService mutex when executing
setStreamVolumeIndex() and getStreamVolumeIndex().
These functions have become more complex and iterate on the
list of opened outputs and it is safer to acquire the
AudioPolicyService mutex to avoid concurrency with other
functions.
Bug
6626532.
Change-Id: Ifdcbbbf13338fd9a59f694d43faa7ade143f94bf
The Android Open Source Project [Tue, 19 Jun 2012 13:16:25 +0000 (06:16 -0700)]
The Android Open Source Project [Tue, 19 Jun 2012 13:13:22 +0000 (06:13 -0700)]
Reconcile with jb-release
Change-Id: Ic4989b359b302c5d72751cdebae3433064770a29
Colin Cross [Mon, 18 Jun 2012 20:10:39 +0000 (13:10 -0700)]
Merge "libstagefright: dynamically load libstagefright_chromium_http"
Glenn Kasten [Mon, 18 Jun 2012 17:52:41 +0000 (10:52 -0700)]
am
4862d1ea: am
eb15716b: Change definition of warmup period
* commit '
4862d1eaa6b3b2bad040d01fe090e8616685c12b':
Change definition of warmup period
Glenn Kasten [Mon, 18 Jun 2012 17:52:41 +0000 (10:52 -0700)]
am
16f07fb7: am
972af221: FastMixer compensates for SRC jitter in audio HAL
* commit '
16f07fb7bb4c284cc0b16f55fe5eabd4a4802590':
FastMixer compensates for SRC jitter in audio HAL
Glenn Kasten [Mon, 18 Jun 2012 17:32:49 +0000 (10:32 -0700)]
am
eb15716b: Change definition of warmup period
* commit '
eb15716b59020f342df62bce5b293f0603b94861':
Change definition of warmup period
Glenn Kasten [Mon, 18 Jun 2012 17:32:13 +0000 (10:32 -0700)]
am
972af221: FastMixer compensates for SRC jitter in audio HAL
* commit '
972af221ae7253e406e0e1ea853e56a3010ed6b1':
FastMixer compensates for SRC jitter in audio HAL
Eino-Ville Talvala [Fri, 15 Jun 2012 19:49:21 +0000 (12:49 -0700)]
Camera2: Move per-frame verbose logs to separate log enable
Bug:
6243944
Change-Id: I5850f8ceb2e603aa555cc71328f64d6a928694a0
Eino-Ville Talvala [Mon, 18 Jun 2012 15:40:39 +0000 (08:40 -0700)]
Merge "Camera2: Handle preview orientation changes."
Eino-Ville Talvala [Mon, 18 Jun 2012 15:40:32 +0000 (08:40 -0700)]
Merge "Camera2: Connect camera parameters to HAL request entries."
The Android Automerger [Sat, 16 Jun 2012 14:01:55 +0000 (07:01 -0700)]
merge in jb-release history after reset to jb-dev
Colin Cross [Fri, 15 Jun 2012 20:56:18 +0000 (13:56 -0700)]
libstagefright: dynamically load libstagefright_chromium_http
dlopen libstagefright_chromium_http to allow it to be on the platform
side of the pdk without getting overwritten during a pdk fusion build.
Change-Id: I391e81d98beab165c3313bc8a71bb370ebb8584d
Eino-Ville Talvala [Fri, 15 Jun 2012 19:47:42 +0000 (12:47 -0700)]
Camera2: Handle preview orientation changes.
- Process sendCommand(CAMERA_CMD_SET_DISPLAY_ORIENTATION)
Bug:
6243944
Change-Id: I92d3bb13312d475703325230487d660a1cb7e0e5
Eino-Ville Talvala [Fri, 15 Jun 2012 19:42:30 +0000 (12:42 -0700)]
Camera2: Connect camera parameters to HAL request entries.
- All fields in Camera.Parameters are mapped to HAL2 entries, and
communicated to the HAL.
- Preview stream properly updated on parameter changes
- Slight code rearrangment for improved clarity
Bug:
6243944
Change-Id: I2a1db5c148809a62ba3524fb659dd6065affff8e
Glenn Kasten [Wed, 13 Jun 2012 21:59:07 +0000 (14:59 -0700)]
Change definition of warmup period
Previously, warmup was considered done as soon as any write() took
more than 0.5 nominal cycle time. In practice, this was always the
first write() that turned on power to the output path, and it didn't
accurately account for filling the full kernel buffer queue, or for
buffering in the HAL sample rate conversion.
Now warmup is considered done when a write() _after_ the first write
takes more than 0.5 nominal cycle time.
This will throttle the initial pull rate after coming out of standby.
When combined with another change to throttle the pull rate for
devices with HAL sample rate conversion, it may help reduce some of the
notification glitches. The only downside is that it will increase the
warmup time a bit.
Bug:
6508317,
6650846,
6607056
Change-Id: I39f324c5195578170a55308e9601d3a1b41db3e0
Eino-Ville Talvala [Fri, 15 Jun 2012 20:19:26 +0000 (13:19 -0700)]
Merge "Camera2: Minor parameter restructuring"
Eino-Ville Talvala [Fri, 15 Jun 2012 19:37:35 +0000 (12:37 -0700)]
Camera2: Minor parameter restructuring
Will make it easier to update HAL-level parameters.
Bug:
6243944
Change-Id: I3acac3c532de440d46755ce3e1d819ad5ed2e106
Glenn Kasten [Thu, 14 Jun 2012 00:14:03 +0000 (17:14 -0700)]
FastMixer compensates for SRC jitter in audio HAL
Force a sleep if audio HAL write() returns too quickly.
Bug:
6661275
Change-Id: Ie810f5a087b89fb24dab229a0e500af1dee53571
James Dong [Fri, 15 Jun 2012 17:19:22 +0000 (10:19 -0700)]
am
fbb26f51: am
fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-dev
* commit '
fbb26f5101d9ef14251d561dba37f87d001fbbf6':
Fix track selection code in AwesomePlayer
James Dong [Fri, 15 Jun 2012 17:16:34 +0000 (10:16 -0700)]
am
fc42e16d: Merge "Fix track selection code in AwesomePlayer" into jb-dev
* commit '
fc42e16d96b7e1b18b573f40df1319c56f8ab933':
Fix track selection code in AwesomePlayer
James Dong [Fri, 15 Jun 2012 17:14:04 +0000 (10:14 -0700)]
Merge "Fix track selection code in AwesomePlayer" into jb-dev
Glenn Kasten [Fri, 15 Jun 2012 15:26:53 +0000 (08:26 -0700)]
am
ff0fcb26: am
0a14c4ce: Make CPU frequency statistics optional
* commit '
ff0fcb2628613953f454875006bfb78c3fc087d3':
Make CPU frequency statistics optional
Glenn Kasten [Fri, 15 Jun 2012 15:23:44 +0000 (08:23 -0700)]
am
0a14c4ce: Make CPU frequency statistics optional
* commit '
0a14c4ce1a41bc09eb7855fa531a3af629a69139':
Make CPU frequency statistics optional
Insun Kang [Fri, 15 Jun 2012 04:02:45 +0000 (13:02 +0900)]
Fix track selection code in AwesomePlayer
Change-Id: I1c5a2f13f562a0ba253a93b4346cbe2c60099ddd
related-to-bug:
6671977
Glenn Kasten [Fri, 15 Jun 2012 01:30:43 +0000 (18:30 -0700)]
am
59b9dffe: (-s ours) am
362ebcbf: DO NOT MERGE Remove log spam for fast track denied
* commit '
59b9dffe570aac7c3f3826b64b03ad9cff0c59f0':
DO NOT MERGE Remove log spam for fast track denied
Glenn Kasten [Wed, 13 Jun 2012 21:58:49 +0000 (14:58 -0700)]
Make CPU frequency statistics optional
Certain CPUs with dynamic cluster swapping and hotplug
don't report CPU frequency accurately. The file descriptors
used to read the frequency become stale and report bogus data.
So make this feature a build time option for debugging only.
This will also improve performance of the fast mixer loop.
Change-Id: I602f81ec3281a37992769208be08084ed1469e8c
Glenn Kasten [Fri, 15 Jun 2012 00:26:44 +0000 (17:26 -0700)]
am
362ebcbf: DO NOT MERGE Remove log spam for fast track denied
* commit '
362ebcbf100f7fccd37551c77e67c4faa7241b63':
DO NOT MERGE Remove log spam for fast track denied
Glenn Kasten [Thu, 24 May 2012 15:44:00 +0000 (08:44 -0700)]
DO NOT MERGE Remove log spam for fast track denied
Bug:
6531054
Change-Id: Iedf58e810a157aae88b5900da27c81054c437058
Jamie Gennis [Thu, 14 Jun 2012 20:12:59 +0000 (13:12 -0700)]
am
be8cf4a2: am
7b4de101: Merge "stagefright: set scaling mode for blank frames" into jb-dev
* commit '
be8cf4a280b0aa786ba1aa3dad85d51125e0a86f':
stagefright: set scaling mode for blank frames
Jamie Gennis [Thu, 14 Jun 2012 20:10:42 +0000 (13:10 -0700)]
am
7b4de101: Merge "stagefright: set scaling mode for blank frames" into jb-dev
* commit '
7b4de10199f3a1803350e9a65baa671874d9c2f1':
stagefright: set scaling mode for blank frames
Jamie Gennis [Thu, 14 Jun 2012 20:08:08 +0000 (13:08 -0700)]
Merge "stagefright: set scaling mode for blank frames" into jb-dev
Eric Laurent [Thu, 14 Jun 2012 19:14:46 +0000 (12:14 -0700)]
am
4ebbabda: am
192cbbad: Fix audio track pause.
* commit '
4ebbabda6584aeb5ad2714e7db1702d00e84dad4':
Fix audio track pause.
Eric Laurent [Thu, 14 Jun 2012 19:12:52 +0000 (12:12 -0700)]
am
192cbbad: Fix audio track pause.
* commit '
192cbbad773979a6fe3b5a0c223356de4fc3309c':
Fix audio track pause.
Eino-Ville Talvala [Thu, 14 Jun 2012 17:49:45 +0000 (10:49 -0700)]
Camera2: Add more dump information, connect HAL device dump
Bug:
6243944
Change-Id: I79a302f68786d815b9ab9984dbb31d237522416b
Jamie Gennis [Thu, 14 Jun 2012 02:13:16 +0000 (19:13 -0700)]
stagefright: set scaling mode for blank frames
This change sets the ANativeWindow scaling mode before pushing the blank frames
during decoder tear down.
Bug:
6603254
Change-Id: Ic64011645e2d3671b4a8d302ac7f39e6fd3affcd
Eric Laurent [Wed, 13 Jun 2012 15:38:36 +0000 (08:38 -0700)]
Fix audio track pause.
AudioTrack::pause() should signal the control block condition
to release threads waiting for available buffers in obtainBuffer().
Otherwise the behavior relies on the timout on the condition
or the fact that audioflinger will mix a new audio buffer while executing
the pause.
Bug
6653769.
Change-Id: I5f8f73c471fe306070f30b814f32fd4b4dc1d575
Marco Nelissen [Thu, 14 Jun 2012 17:34:51 +0000 (10:34 -0700)]
am
c3c044ab: am
82233b4b: Merge "Better handle invalid duration in Xing/VBRI tags" into jb-dev
* commit '
c3c044ab1b2b5f9bebcff610795b6a1a9b60d01b':
Better handle invalid duration in Xing/VBRI tags
Glenn Kasten [Thu, 14 Jun 2012 17:34:36 +0000 (10:34 -0700)]
am
ea1d16da: am
e6adde40: Merge "Shorten dumpsys media.audio_flinger output" into jb-dev
* commit '
ea1d16da8e28b30a58090e6372ce12d40b99c21f':
Shorten dumpsys media.audio_flinger output
Glenn Kasten [Thu, 14 Jun 2012 17:34:35 +0000 (10:34 -0700)]
am
48a0bfa6: am
49dd5cf3: Merge "Log track name on obtain/releaseBuffer warnings" into jb-dev
* commit '
48a0bfa6f731386f2794ff36d6677d56e98fc6ea':
Log track name on obtain/releaseBuffer warnings
James Dong [Thu, 14 Jun 2012 17:33:38 +0000 (10:33 -0700)]
am
cc0df657: am
e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/" into jb-dev
* commit '
cc0df657cdc8316c2b816c562f269be1706f00ea':
Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/
James Dong [Thu, 14 Jun 2012 17:33:16 +0000 (10:33 -0700)]
am
8fe9840b: am
cac467b3: Merge "Fix one of the potential ANR issues from AwesomePlayer" into jb-dev
* commit '
8fe9840be2ce6aac8a008fc15cb641f858b5a32e':
Fix one of the potential ANR issues from AwesomePlayer
Marco Nelissen [Thu, 14 Jun 2012 16:54:09 +0000 (09:54 -0700)]
am
82233b4b: Merge "Better handle invalid duration in Xing/VBRI tags" into jb-dev
* commit '
82233b4b5bee06f11618a558ae465abbfdedfd6e':
Better handle invalid duration in Xing/VBRI tags
Marco Nelissen [Thu, 14 Jun 2012 16:51:49 +0000 (09:51 -0700)]
Merge "Better handle invalid duration in Xing/VBRI tags" into jb-dev
Glenn Kasten [Thu, 14 Jun 2012 15:43:58 +0000 (08:43 -0700)]
am
e6adde40: Merge "Shorten dumpsys media.audio_flinger output" into jb-dev
* commit '
e6adde403480333b613452ae0df442df9da4a5b2':
Shorten dumpsys media.audio_flinger output
Glenn Kasten [Thu, 14 Jun 2012 15:43:56 +0000 (08:43 -0700)]
am
49dd5cf3: Merge "Log track name on obtain/releaseBuffer warnings" into jb-dev
* commit '
49dd5cf3469cd755321f8ec10013ad4fcfaf723d':
Log track name on obtain/releaseBuffer warnings
Glenn Kasten [Thu, 14 Jun 2012 15:41:54 +0000 (08:41 -0700)]
Merge "Shorten dumpsys media.audio_flinger output" into jb-dev
Glenn Kasten [Thu, 14 Jun 2012 15:41:38 +0000 (08:41 -0700)]
Merge "Log track name on obtain/releaseBuffer warnings" into jb-dev
Eino-Ville Talvala [Thu, 14 Jun 2012 15:38:07 +0000 (08:38 -0700)]
Merge "Camera2: Improve error checking and debug logs."
Eino-Ville Talvala [Thu, 14 Jun 2012 15:38:03 +0000 (08:38 -0700)]
Merge "Camera2: Still image support"
The Android Automerger [Thu, 14 Jun 2012 14:01:45 +0000 (07:01 -0700)]
merge in jb-release history after reset to jb-dev
James Dong [Thu, 14 Jun 2012 03:51:33 +0000 (20:51 -0700)]
am
e20435de: Merge "Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/" into jb-dev
* commit '
e20435de10f63af812da9d4f801b61a8817733a0':
Add NOTICE and MODULE_LICENSE_APACH2 to libs build under /frameworks/av/