OSDN Git Service
The Android Open Source Project [Mon, 1 Jul 2013 14:47:50 +0000 (07:47 -0700)]
am
f64bd473: (-s ours) Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
* commit '
f64bd473e4c500dc54923baac7261e6d2d72daa6':
Update HTTP proxy configuration for all media playback inside stagefright.
The Android Open Source Project [Mon, 1 Jul 2013 14:42:56 +0000 (07:42 -0700)]
Reconcile with jb-mr2-release jb-mr2-zeroday-release - do not merge
Change-Id: Idf0f0cdf02e6e94603ff003b6baf869b4414e1cf
The Android Automerger [Sun, 30 Jun 2013 12:55:22 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Andreas Huber [Fri, 28 Jun 2013 22:33:44 +0000 (15:33 -0700)]
am
0eefffd8: am
47a1fe04: am
a9aa6baa: Merge "Set u.ext_data to null after it has been freed"
* commit '
0eefffd8fc8abfbe694814fcec397aeac3f545b8':
Set u.ext_data to null after it has been freed
Andreas Huber [Fri, 28 Jun 2013 22:31:37 +0000 (15:31 -0700)]
am
47a1fe04: am
a9aa6baa: Merge "Set u.ext_data to null after it has been freed"
* commit '
47a1fe04637793f48d808261b1fac47acc3de1e1':
Set u.ext_data to null after it has been freed
Andreas Huber [Fri, 28 Jun 2013 22:29:01 +0000 (15:29 -0700)]
am
a9aa6baa: Merge "Set u.ext_data to null after it has been freed"
* commit '
a9aa6baa5d86fc1a5bd37fc636d766d9e3ad2507':
Set u.ext_data to null after it has been freed
Andreas Huber [Fri, 28 Jun 2013 22:26:42 +0000 (22:26 +0000)]
Merge "Set u.ext_data to null after it has been freed"
Andreas Huber [Wed, 29 May 2013 21:20:52 +0000 (14:20 -0700)]
Update HTTP proxy configuration for all media playback inside stagefright.
Change-Id: Ie0dd00045aba668d8b49da73224e7a7c9c04f69b
related-to-bug:
8873723
(cherry picked from commit
2704965b8a1ff3b7450ff58ccecf86d8ec688c40)
Glenn Kasten [Fri, 28 Jun 2013 17:48:43 +0000 (10:48 -0700)]
am
903871da: am
83790fcc: am
bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'."
* commit '
903871da7a7c71b8718133e60e2f0835837b5f3f':
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
Eric Laurent [Fri, 28 Jun 2013 17:48:21 +0000 (17:48 +0000)]
Merge "Public API changes for audio offload support."
Eino-Ville Talvala [Fri, 28 Jun 2013 16:47:36 +0000 (09:47 -0700)]
resolved conflicts for merge of
364a2677 to master
Change-Id: I21f23c1c5e4408c24c359bef6270dffce47a988d
Glenn Kasten [Fri, 28 Jun 2013 16:33:15 +0000 (09:33 -0700)]
am
83790fcc: am
bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'."
* commit '
83790fcce4f5cda1e7c89f1cbed452426502f227':
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
Glenn Kasten [Fri, 28 Jun 2013 16:30:58 +0000 (09:30 -0700)]
am
bdf33c98: Merge "Fix compilation warning: incorrect format specifier for type \'ssize_t\'."
* commit '
bdf33c98912090176183d3e9b9a9217dbbdca6da':
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
Glenn Kasten [Fri, 28 Jun 2013 16:28:48 +0000 (16:28 +0000)]
Merge "Fix compilation warning: incorrect format specifier for type 'ssize_t'."
Eino-Ville Talvala [Fri, 28 Jun 2013 14:07:29 +0000 (07:07 -0700)]
am
a691ff3c: Camera2/3: Don\'t allow recording and callbacks to coexist.
* commit '
a691ff3c03e38e148bbefed35ebb15e552a12613':
Camera2/3: Don't allow recording and callbacks to coexist.
Christer Fletcher [Tue, 18 Jun 2013 06:55:09 +0000 (08:55 +0200)]
Set u.ext_data to null after it has been freed
SEGV_MAPPER crash could happen in MetaData::typed_data::freeStorage.
The faulty address could be both random pointers and
deadbaad. It
seems like free could be called more than once on u.ext_data. Set
u.ext_data to null after it has been freed as there already is a
null check before trying to free it.
Change-Id: I710c49f9c231bd8852159914c0b2add58a685f0e
Richard Fitzgerald [Mon, 25 Mar 2013 16:54:37 +0000 (16:54 +0000)]
Public API changes for audio offload support.
NOTE: this does _not_ include all private member variables added
to classes as part of offload support. Only public/protected functions
and stubs functions/variables needed to make the changes buildable.
- isOffloadSupported() added to audio policy service
A stub implementation is required to build, this always returns false
- setParameters() added to IAudioTrack
A stub implementation is required to build, this always returns
INVALID_OPERATION
- CBlk flag for stream end
- Change AudioSystem::getRenderPosition() to take an audio_output_t
so caller can specify which output to query
- Add AudioSystem::isOffloadSupported()
This is fully implemented down to the AudioFlinger function
AudioPolicyServer::isOffloadSupported() which is just a stub
that always returns false.
- Add EVENT_STREAM_END to AudioTrack interface.
STREAM_END is used to signal when the hardware has actually finished
playing all the data it was sent.
- Add event type enumeration to media player interface AudioSink callbacks
so that the same callback can be used to handle multiple types of
event. For offloaded tracks we also have to handle STREAM_END and
TEAR_DOWN events
- Pass audio_offload_info_t to various functions used for opening outputs,
tracks and audio players. This passes additional information about the
compressed stream down to the HAL when using offload.
For publicly-available APIs this is an optional parameter (for some of
the internal and low-level APIs around the HAL interface it is mandatory)
- Add getParameters() and setParameters() API to AudioTrack
Currently dummy implementations.
- Change AudioPlayer contructor so that it takes a set of bitflags defining what
options are required. This replaces the original bool which only specified
whether to use deep buffering.
- Changes to StageFright class definition related to handling tearing-down of
an offloaded track when we need to switch back to software decode
- Define new StageFright utility functions used for offloaded tracks
Currently dummy implementations.
- AudioFlinger changes to use extended audio_config_t.
Fills in audio_offload_info_t member if this info is passed in when
opening an output.
- libvideoeditor changes required to add the new event type parameter
to AudioSink callback functions
- libmediaplayerservice changes required to add the new event type parameter
to AudioSink callback functions
Change-Id: I3ab41138aa1083d81fe83b886a9b1021ec7320f1
Signed-off-by: Richard Fitzgerald <rf@opensource.wolfsonmicro.com>
Signed-off-by: Eric Laurent <elaurent@google.com>
Eino-Ville Talvala [Thu, 27 Jun 2013 01:23:23 +0000 (18:23 -0700)]
Camera2/3: Don't allow recording and callbacks to coexist.
- Tear down conflicting streams when necessary.
- Shut down callbacks if recording starts
- Do not allow callbacks to start if recording is active
Per the current camera API, recording and preview callbacks cannot be
active simultaneously. However, the framework did not explicitly
disallow this, and in fact left the streams configured once they were
created, even if switching between the two operational modes.
In addition, no guards existed for trying to enable both recording and
callbacks at the same time.
Bug:
9423825
Change-Id: I7d6e6114c2e14fcfb5299b4c72ad557895cbf4b8
Scott Fan [Sun, 28 Apr 2013 02:13:54 +0000 (10:13 +0800)]
Fix compilation warning: incorrect format specifier for type 'ssize_t'.
warning: format '%ld' expects argument of type 'long int',
but argument 7 has type 'ssize_t {aka int}' [-Wformat]
Change-Id: I823835a26320a3abb82f8dff9fbe82e5132e7556
Signed-off-by: Scott Fan <fancp2007@gmail.com>
The Android Open Source Project [Wed, 26 Jun 2013 00:02:16 +0000 (17:02 -0700)]
am
bdebd481: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
bdebd4817cfe49fafedfe8f9c65930e03f9b508b':
Jean-Baptiste Queru [Tue, 25 Jun 2013 23:30:54 +0000 (16:30 -0700)]
am
1aee0be6: am
3a4ff0b8: am
d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httplive link"
* commit '
1aee0be6cc9ecb4ff3d86228bb68c295c12bde9c':
libstagefright: fix the duration "00:00" for some httplive link
The Android Open Source Project [Tue, 25 Jun 2013 23:12:03 +0000 (16:12 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I4de46f3bfcfb80867bbeb52a76d383f5870e74f4
Lajos Molnar [Tue, 25 Jun 2013 22:07:56 +0000 (22:07 +0000)]
Merge "Adds VP9 decoding support for stagefright."
Jean-Baptiste Queru [Tue, 25 Jun 2013 17:40:38 +0000 (10:40 -0700)]
am
3a4ff0b8: am
d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httplive link"
* commit '
3a4ff0b8bf464c9c286d63326bea42609527051e':
libstagefright: fix the duration "00:00" for some httplive link
Jean-Baptiste Queru [Tue, 25 Jun 2013 17:38:44 +0000 (10:38 -0700)]
am
d74a9ee8: Merge "libstagefright: fix the duration "00:00" for some httplive link"
* commit '
d74a9ee83fd6e033fd2260ca3777390d7e5f817a':
libstagefright: fix the duration "00:00" for some httplive link
Jean-Baptiste Queru [Tue, 25 Jun 2013 17:37:28 +0000 (17:37 +0000)]
Merge "libstagefright: fix the duration "00:00" for some httplive link"
Glenn Kasten [Tue, 25 Jun 2013 14:37:21 +0000 (14:37 +0000)]
Merge "Workaround AudioRecord bug for large buffer sizes"
Glenn Kasten [Tue, 25 Jun 2013 14:33:05 +0000 (14:33 +0000)]
Merge "Use mFutex as an event flag rather than semaphore"
Igor Murashkin [Tue, 25 Jun 2013 00:38:03 +0000 (00:38 +0000)]
Merge changes I5b2eeab2,I71568560
* changes:
Make android.hardware.photography.Camera work on HAL3+ devices
Initial implementation of android.hardware.photography.CameraDevice (service)
The Android Automerger [Mon, 24 Jun 2013 21:55:06 +0000 (14:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Automerger [Mon, 24 Jun 2013 21:41:40 +0000 (14:41 -0700)]
Merge remote-tracking branch 'origin/jb-mr2-zeroday-release' into HEAD
Glenn Kasten [Mon, 24 Jun 2013 19:10:45 +0000 (12:10 -0700)]
Workaround AudioRecord bug for large buffer sizes
Bug:
9556436
Change-Id: I92d1238b623d2cfd648e0a684d0e710fb0bd8b43
Glenn Kasten [Mon, 24 Jun 2013 19:06:46 +0000 (12:06 -0700)]
Use mFutex as an event flag rather than semaphore
An event flag can be more fault-tolerant in case of loss of synchronization,
as it cannot overflow. It also allows more bits to be used in the future.
See http://en.wikipedia.org/wiki/Event_flag
Change-Id: I01ca25d951eb263124da54bb4738f0d94ec4a48b
hkuang [Mon, 24 Jun 2013 18:21:17 +0000 (11:21 -0700)]
Adds VP9 decoding support for stagefright.
Also change the VP8 encoder role name from
video_encoder.vpx to video_encoder.vp8 for
future VP9 encoder support.
Requires the change in frameworks/native and media_codecs.xml
corresponding to the device.
VP9 decoding test will be added to cts repo later.
Lajos Molnar [Mon, 24 Jun 2013 17:47:54 +0000 (17:47 +0000)]
Merge "stagefright: support for video decoder metadata mode"
Lajos Molnar [Thu, 2 May 2013 23:37:36 +0000 (16:37 -0700)]
stagefright: support for video decoder metadata mode
Change-Id: Id360f29236798163f9f3a82135f601083a8a5058
Signed-off-by: Lajos Molnar <lajos@google.com>
Bug:
7093648
The Android Open Source Project [Fri, 21 Jun 2013 18:58:20 +0000 (11:58 -0700)]
am
e6105c26: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
e6105c26a5b506f96e9fe1d3fec64a8b2ed1d6dd':
The Android Open Source Project [Fri, 21 Jun 2013 18:56:55 +0000 (11:56 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id1c9edbb5b7b398fb863cbbd79e673ab2c10df9a
The Android Automerger [Fri, 21 Jun 2013 18:35:26 +0000 (11:35 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Jean-Michel Trivi [Fri, 21 Jun 2013 05:26:08 +0000 (22:26 -0700)]
am
455479bc: am
209bbbcf: Apply EQ and bass boost first in effect chain
* commit '
455479bc2c6a88746d4801f3f5a0e8d9f8609528':
Apply EQ and bass boost first in effect chain
Jean-Michel Trivi [Fri, 21 Jun 2013 05:23:58 +0000 (22:23 -0700)]
am
209bbbcf: Apply EQ and bass boost first in effect chain
* commit '
209bbbcf4190231f9dede758cbe77d109919f9f1':
Apply EQ and bass boost first in effect chain
Igor Murashkin [Thu, 20 Jun 2013 02:51:04 +0000 (19:51 -0700)]
Make android.hardware.photography.Camera work on HAL3+ devices
Bug:
9213377
Change-Id: I5b2eeab28985f53dfcb7b8e3029930f5adcd74f5
Igor Murashkin [Wed, 12 Jun 2013 01:10:18 +0000 (18:10 -0700)]
Initial implementation of android.hardware.photography.CameraDevice (service)
* Verified preview streaming requests
* Other things *should* work but unverified / unimplemented in client side
Missing:
* CameraService needs to return static camera info metadata
Bug:
9213377
Change-Id: I71568560fcf18d0e2b408ed1c4d0066647314868
Alex Ray [Fri, 21 Jun 2013 00:55:00 +0000 (17:55 -0700)]
camera2/3: Warn on missing active array size parameters
Change-Id: I752659e1f0522392b902839cd7f4d997dcd85966
Jean-Michel Trivi [Thu, 20 Jun 2013 23:49:25 +0000 (16:49 -0700)]
Apply EQ and bass boost first in effect chain
EQ and bass boost can improperly interact with other effects
(e.g. virtualizer) outside of the bundle. Apply them first
in an effect chain, which is equivalent to using them to affect
the content of a track, rather than how a track is presented,
when additional effects are cascaded behind EQ and BB.
Bug
8589316
Change-Id: Ifb34e46bc1969f613cdc90ee2a79af677e2fad92
Glenn Kasten [Thu, 20 Jun 2013 22:18:16 +0000 (15:18 -0700)]
am
d3ac2fc0: am
f3e21c30: am
60f3f102: Merge "Prevent AudioCommands being freed before read"
* commit '
d3ac2fc0c5429003f69d161e42bba7e94434ec09':
Prevent AudioCommands being freed before read
Glenn Kasten [Thu, 20 Jun 2013 22:16:00 +0000 (15:16 -0700)]
am
f3e21c30: am
60f3f102: Merge "Prevent AudioCommands being freed before read"
* commit '
f3e21c301b8fef49eecf9c716373fcbfbaa47670':
Prevent AudioCommands being freed before read
Glenn Kasten [Thu, 20 Jun 2013 22:13:19 +0000 (15:13 -0700)]
am
60f3f102: Merge "Prevent AudioCommands being freed before read"
* commit '
60f3f102ba2973cc31e5c7ea00d95bbf19968e8b':
Prevent AudioCommands being freed before read
Glenn Kasten [Thu, 20 Jun 2013 22:11:25 +0000 (22:11 +0000)]
Merge "Prevent AudioCommands being freed before read"
Christer Fletcher [Fri, 18 Jan 2013 14:27:03 +0000 (15:27 +0100)]
Prevent AudioCommands being freed before read
When AudioCommandThread::threadLoop process AudioCommands it was
possible for it to delete a command where the posting thread still
hadn't read that status from it.
If a second command signaled the thread loop to continue after it
had inserted a new command while the thread loop was actually waiting
for the first command to report that it had read the status the
thread loop would continue and delete the first command.
Changed the wait condition when waiting for the calling thread to
read status to use command->mCond instead of mWaitWorkCV. This way
it's guaranteed that the signal to continue comes from the correct
thread.
Change-Id: Ia69b48cb4fdfaf8b4c83b56a197fb9f2058a92d1
Eino-Ville Talvala [Wed, 19 Jun 2013 21:25:08 +0000 (14:25 -0700)]
am
9c8714da: am
e6478de7: Camera2/3: Avoid shutdown race in callback processor.
* commit '
9c8714daaf6a402abd85557e9b652c86f0df86e4':
Camera2/3: Avoid shutdown race in callback processor.
Eino-Ville Talvala [Wed, 19 Jun 2013 21:23:22 +0000 (14:23 -0700)]
am
e6478de7: Camera2/3: Avoid shutdown race in callback processor.
* commit '
e6478de72a8ae1d3abb3e8c20898977c45354a4f':
Camera2/3: Avoid shutdown race in callback processor.
Eino-Ville Talvala [Wed, 19 Jun 2013 15:42:17 +0000 (08:42 -0700)]
Camera2/3: Avoid shutdown race in callback processor.
It's possible, during shutdown, for callback processor's heap to be
destroyed when it's about to send the callback back to the user.
Properly copy the heap reference to a local variable before unlocking
the mutex.
Bug:
9485959
Change-Id: I301347b77145f19c7ac721b9127dc74f122acce2
Eino-Ville Talvala [Mon, 17 Jun 2013 23:29:19 +0000 (16:29 -0700)]
am
bda5d1f2: am
241b5279: Camera3: Power: Properly shut down unused thread.
* commit '
bda5d1f2a34f9b7ded0bc0441be4856e78ec066c':
Camera3: Power: Properly shut down unused thread.
Eino-Ville Talvala [Mon, 17 Jun 2013 23:23:56 +0000 (16:23 -0700)]
am
241b5279: Camera3: Power: Properly shut down unused thread.
* commit '
241b52798809d8db3d369af05ace1f73f723f29b':
Camera3: Power: Properly shut down unused thread.
Marco Nelissen [Mon, 17 Jun 2013 23:16:09 +0000 (23:16 +0000)]
Merge "Speed up id3v2 unsynchronization"
Marco Nelissen [Mon, 17 Jun 2013 23:14:39 +0000 (16:14 -0700)]
Speed up id3v2 unsynchronization
Instead of doing many overlapping memmoves, do a single copy pass
that skips over the inserted unsynchronization bytes. For some
files this reduces parsing time from minutes to milliseconds.
b/
9463262
Change-Id: I735b7051e77a093d86fb7a3e46209875946225ed
Eino-Ville Talvala [Mon, 17 Jun 2013 20:29:16 +0000 (13:29 -0700)]
Camera3: Power: Properly shut down unused thread.
Bug:
9466221
Change-Id: I9ed0740561b2e04954eebc1b8aec89cfab40a3a0
Andreas Huber [Mon, 17 Jun 2013 16:12:02 +0000 (16:12 +0000)]
Merge "The software avc decoder would silently drop output frames if not"
The Android Open Source Project [Sun, 16 Jun 2013 14:45:34 +0000 (07:45 -0700)]
am
05e87d53: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
05e87d536ed2b7cf1d68135121b630031e5d56c2':
The Android Open Source Project [Sun, 16 Jun 2013 14:44:00 +0000 (07:44 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I2ab98a5fccea49e0f4e6d22fddca485ad50b63b8
The Android Automerger [Sun, 16 Jun 2013 12:55:26 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
Andreas Huber [Fri, 14 Jun 2013 18:58:27 +0000 (11:58 -0700)]
The software avc decoder would silently drop output frames if not
enough room was available in the output queue at the time they were
available. No more.
Change-Id: I5957290d40ba31bda7944271ec7f2aa0f1f7043c
Eino-Ville Talvala [Fri, 14 Jun 2013 16:11:21 +0000 (09:11 -0700)]
am
0cc75491: am
26bc908b: Camera2/3: Make sure to wait for idle after still capture.
* commit '
0cc754918a3c1353164ccc5798f63b28f65db406':
Camera2/3: Make sure to wait for idle after still capture.
Eino-Ville Talvala [Fri, 14 Jun 2013 16:11:20 +0000 (09:11 -0700)]
am
e4a453d4: am
214a17fd: Camera3: Always close HAL device even in face of errors.
* commit '
e4a453d4b7563d1dab674df6ce52c291e63c6ca7':
Camera3: Always close HAL device even in face of errors.
Glenn Kasten [Fri, 14 Jun 2013 16:11:18 +0000 (09:11 -0700)]
Eino-Ville Talvala [Fri, 14 Jun 2013 15:35:48 +0000 (08:35 -0700)]
am
26bc908b: Camera2/3: Make sure to wait for idle after still capture.
* commit '
26bc908b3dafb5d80f092a22c5c71116526eae06':
Camera2/3: Make sure to wait for idle after still capture.
Eino-Ville Talvala [Fri, 14 Jun 2013 15:35:48 +0000 (08:35 -0700)]
am
214a17fd: Camera3: Always close HAL device even in face of errors.
* commit '
214a17fd37ef85fc841d3157b1e9096e1aa1b42f':
Camera3: Always close HAL device even in face of errors.
Glenn Kasten [Fri, 14 Jun 2013 12:48:38 +0000 (05:48 -0700)]
Glenn Kasten [Fri, 14 Jun 2013 12:43:03 +0000 (05:43 -0700)]
Glenn Kasten [Fri, 14 Jun 2013 12:39:16 +0000 (12:39 +0000)]
Merge "Fix typo."
Eino-Ville Talvala [Fri, 14 Jun 2013 01:04:28 +0000 (18:04 -0700)]
Camera2/3: Make sure to wait for idle after still capture.
While this wait should be immediate, it's important to guarantee
that preview is stopped when takePicture completes, and that the
device knows itself to be idle.
Bug:
9413025
Change-Id: I1c151ba920e226107ee048918187364990f444c0
Glenn Kasten [Fri, 14 Jun 2013 00:24:44 +0000 (00:24 +0000)]
Merge "AudioRecord must be used as sp<> only"
Alex Ray [Thu, 13 Jun 2013 23:15:59 +0000 (23:15 +0000)]
Merge "camera2: accept 4-value active array size"
Glenn Kasten [Thu, 13 Jun 2013 20:47:02 +0000 (13:47 -0700)]
AudioRecord must be used as sp<> only
Bug:
9423855
Change-Id: I78ba8228c60dff11fb466156bb632c5dda45cdaf
Alex Ray [Thu, 13 Jun 2013 18:22:47 +0000 (11:22 -0700)]
camera2: accept 4-value active array size
Change-Id: Ia320a022b201a938a025efc30a54c05fcfe5b02f
Eino-Ville Talvala [Thu, 13 Jun 2013 19:20:02 +0000 (12:20 -0700)]
Camera3: Always close HAL device even in face of errors.
To improve robustness, make sure the HAL device instance is always
closed, even if it cannot be put into the IDLE state.
Bug:
9414167
Change-Id: I8e7035ff0afe7214951f9824e561b340cb37592e
Eino-Ville Talvala [Thu, 13 Jun 2013 17:43:49 +0000 (10:43 -0700)]
am
ccc366a9: am
1191454a: Merge "Camera3: Skipping no-ops good, not updating state machine bad." into jb-mr2-dev
* commit '
ccc366a90fdd8d9df5de27820f04bc534d122c07':
Camera3: Skipping no-ops good, not updating state machine bad.
Eino-Ville Talvala [Thu, 13 Jun 2013 17:43:48 +0000 (10:43 -0700)]
am
4541531a: am
c4a8d2dd: Merge "Camera2/3: Create JPEG stream unconditionally." into jb-mr2-dev
* commit '
4541531a6e64329764ad7359775689a8f5aca165':
Camera2/3: Create JPEG stream unconditionally.
Eino-Ville Talvala [Thu, 13 Jun 2013 17:34:07 +0000 (10:34 -0700)]
am
1191454a: Merge "Camera3: Skipping no-ops good, not updating state machine bad." into jb-mr2-dev
* commit '
1191454a3a960a1972b0f36e625796c6c1b2c9ca':
Camera3: Skipping no-ops good, not updating state machine bad.
Eino-Ville Talvala [Thu, 13 Jun 2013 17:34:07 +0000 (10:34 -0700)]
am
c4a8d2dd: Merge "Camera2/3: Create JPEG stream unconditionally." into jb-mr2-dev
* commit '
c4a8d2ddfff6d91e493692251733f20ece3e713d':
Camera2/3: Create JPEG stream unconditionally.
Eino-Ville Talvala [Thu, 13 Jun 2013 17:33:20 +0000 (17:33 +0000)]
Merge "Camera3: Skipping no-ops good, not updating state machine bad." into jb-mr2-dev
Eino-Ville Talvala [Thu, 13 Jun 2013 17:33:07 +0000 (17:33 +0000)]
Merge "Camera2/3: Create JPEG stream unconditionally." into jb-mr2-dev
The Android Open Source Project [Thu, 13 Jun 2013 15:25:37 +0000 (08:25 -0700)]
am
a4539807: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
a45398078e4f798a34310a2d5213e07eefb14238':
The Android Open Source Project [Thu, 13 Jun 2013 15:22:42 +0000 (08:22 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: Id9419bf573d550f1ebebcc96fe615e1aaf8f36ef
The Android Automerger [Thu, 13 Jun 2013 12:55:17 +0000 (05:55 -0700)]
merge in jb-mr2-zeroday-release history after reset to jb-mr2-dev
The Android Open Source Project [Thu, 13 Jun 2013 01:06:09 +0000 (18:06 -0700)]
am
a1d73d9b: (-s ours) Reconcile with jb-mr2-release - do not merge
* commit '
a1d73d9be0beafd10642d6db0136b16353a32096':
audioflinger: fix effects on direct output threads
The Android Open Source Project [Thu, 13 Jun 2013 01:04:12 +0000 (18:04 -0700)]
Reconcile with jb-mr2-release - do not merge
Change-Id: I024b04bf1e47cc7c10209e83f640cc6f12e03274
Eino-Ville Talvala [Thu, 13 Jun 2013 00:06:41 +0000 (17:06 -0700)]
Camera3: Skipping no-ops good, not updating state machine bad.
If a HAL-level stream reconfigure is not needed, still need to
transition camera device to ACTIVE state in configureStreams.
Otherwise, shutdown functions will not wait for device to drain
properly.
Bug:
9413025
Change-Id: I0b15792097c7e5771015f2a362735d5f88b8c6ea
Glenn Kasten [Tue, 18 Dec 2012 23:57:32 +0000 (15:57 -0800)]
New control block for AudioTrack and AudioRecord
Main differences between old and new control block:
- removes the mutex, which was a potential source of priority inversion
- circular indices into shared buffer, which is now always a power-of-2 size
Change-Id: I4e9b7fa99858b488ac98a441fa70e31dbba1b865
Eric Laurent [Tue, 11 Jun 2013 21:38:48 +0000 (14:38 -0700)]
audioflinger: fix effects on direct output threads
PlaybackThread::addTrack_l() uses the assumption that
effects are attached to a track only if the track accumulation
buffer is different from the mixer thread output buffer.
This is not true for direct output threads where only one track is active
an only one buffer is needed.
This assumption is an optimization to avoid checking for effect chains with
the same session ID each time a track is processed. The optimization
is not key if only one track is attached to the thread which is the case for
direct outputs.
Current code fails to increment the active track count in the effect chain
on direct output threads when a track is started thus making the effect
framework clear the mix buffer and produce silence each time the mixer runs.
The fix consists in removing the optimization described above.
Bug:
9324989.
Change-Id: Id7a6337450ed90d326299c2ce9fc02f4b9e2fa6f
Andreas Huber [Wed, 12 Jun 2013 17:26:19 +0000 (10:26 -0700)]
Converter now takes the desired _output_ format instead of the
input format, allowing control over the type of encoding.
Change-Id: Iaaa1a825f447ea130e373bbd8e5dc96f2762db18
Lajos Molnar [Wed, 12 Jun 2013 16:32:30 +0000 (09:32 -0700)]
am
f8af99b7: am
0662f7b6: Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev
* commit '
f8af99b7c10f1441d9a52676724b168f20752270':
stagefright: synchronously change nativewindow crop
Lajos Molnar [Wed, 12 Jun 2013 16:29:43 +0000 (09:29 -0700)]
am
0662f7b6: Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev
* commit '
0662f7b6735df0a140f6512285d05f8f9a38bb98':
stagefright: synchronously change nativewindow crop
Lajos Molnar [Wed, 12 Jun 2013 16:27:40 +0000 (16:27 +0000)]
Merge "stagefright: synchronously change nativewindow crop" into jb-mr2-dev
Eric Laurent [Wed, 12 Jun 2013 15:47:34 +0000 (08:47 -0700)]
am
bb35be24: am
7be48189: Merge "audioflinger: fix effects on direct output threads" into jb-mr2-dev
* commit '
bb35be24239f05f59715960a93cd491a4cd3b4d6':
audioflinger: fix effects on direct output threads
Eric Laurent [Wed, 12 Jun 2013 15:46:03 +0000 (08:46 -0700)]
am
7be48189: Merge "audioflinger: fix effects on direct output threads" into jb-mr2-dev
* commit '
7be48189c0aefb82825a7689d9e1005175570779':
audioflinger: fix effects on direct output threads
Eric Laurent [Wed, 12 Jun 2013 15:44:42 +0000 (15:44 +0000)]
Merge "audioflinger: fix effects on direct output threads" into jb-mr2-dev
The Android Open Source Project [Wed, 12 Jun 2013 14:25:58 +0000 (07:25 -0700)]
am
765f99f3: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
765f99f30fdc18396ce4edc9facbe6632c9b858e':
The Android Open Source Project [Wed, 12 Jun 2013 14:23:29 +0000 (07:23 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I87a7986866714bfd922259cf961d6d5f5b752362