OSDN Git Service
Glenn Kasten [Tue, 30 Jul 2013 16:35:09 +0000 (16:35 +0000)]
Merge "AudioRecord and HAL input stream must be 16-bit PCM only"
Glenn Kasten [Fri, 12 Jul 2013 16:45:18 +0000 (09:45 -0700)]
Rename control block server to mServer and add comments
Change-Id: Ieabd91acee92d0e84e66fbd358df5282b856306e
Glenn Kasten [Wed, 17 Jul 2013 00:17:28 +0000 (17:17 -0700)]
Use correct type for OutputDescriptor::format
Change-Id: Ide608ef452d57da29b708180d90470361c123d1d
Glenn Kasten [Tue, 30 Jul 2013 14:36:19 +0000 (14:36 +0000)]
Merge "Fix theoretical race using TrackBase::sampleRate()"
Glenn Kasten [Tue, 30 Jul 2013 00:17:38 +0000 (17:17 -0700)]
Remove CC_LIKELY and CC_UNLIKELY where not needed
Only keep them in performance-sensitive code
Change-Id: Ib257ddd7bc39ce9896997ffae008c524ac743d01
Glenn Kasten [Thu, 29 Nov 2012 16:48:51 +0000 (08:48 -0800)]
Rename RecordThread::mInputBytes to the more generic mBufferSize
This prepares for using it in PlaybackThreads later
Change-Id: Id90a92aa6372e4b69914b0008cef07296ca5d6a3
Glenn Kasten [Tue, 16 Jul 2013 18:37:48 +0000 (11:37 -0700)]
Move members from ThreadBase to PlaybackThread
Move mNormalFrameCount and frameCountHAL(), since they're not used by
record threads. Also comment which fields are updated by readParameters().
Change-Id: I5fc0a8a89cc637976f22d49271a5a3e136dab4e1
Andreas Huber [Mon, 29 Jul 2013 23:10:53 +0000 (23:10 +0000)]
Merge "Fix typo in AwesomePlayer"
Glenn Kasten [Mon, 29 Jul 2013 21:13:08 +0000 (21:13 +0000)]
Merge "Use standard name and type for channel mask"
Igor Murashkin [Mon, 29 Jul 2013 20:54:20 +0000 (20:54 +0000)]
Merge "camera2 api: Override default RGBx formats to IMPLEMENTATION_DEFINED"
Glenn Kasten [Mon, 29 Jul 2013 20:24:15 +0000 (20:24 +0000)]
Merge "Simplify getParameters()"
Glenn Kasten [Mon, 29 Jul 2013 20:19:23 +0000 (20:19 +0000)]
Merge "Treat mChannelCount as uint32_t consistently"
Marco Nelissen [Mon, 29 Jul 2013 20:19:01 +0000 (20:19 +0000)]
Merge "Fail more gracefully on version mismatch"
Glenn Kasten [Tue, 16 Jul 2013 18:16:27 +0000 (11:16 -0700)]
Treat mChannelCount as uint32_t consistently
mChannelCount was 8-, 16-, or 32-bits
Change-Id: I2cc2fedf3e33144e5c8bbd9894763282d9217f63
Igor Murashkin [Mon, 29 Jul 2013 19:25:59 +0000 (12:25 -0700)]
camera2 api: Override default RGBx formats to IMPLEMENTATION_DEFINED
Bug:
9487482
Change-Id: I09d3b4e41454d350c4bc7b1f8e893c3dad655e73
Marco Nelissen [Mon, 29 Jul 2013 18:22:27 +0000 (11:22 -0700)]
Fail more gracefully on version mismatch
b/
9900647
Change-Id: I9ea508a2685ff8adc780edd5ecec30dd1a9b0997
Glenn Kasten [Mon, 29 Jul 2013 18:18:05 +0000 (18:18 +0000)]
Merge "Move local variable declarations to point of first use"
Glenn Kasten [Mon, 29 Jul 2013 17:59:04 +0000 (17:59 +0000)]
Merge "Declare methods in binder opcode order"
Glenn Kasten [Wed, 17 Jul 2013 17:10:23 +0000 (10:10 -0700)]
Declare methods in binder opcode order
Change-Id: I5f624b7a51ffe1a17a67c056cf984f74e4c56eac
Glenn Kasten [Mon, 29 Jul 2013 17:37:58 +0000 (17:37 +0000)]
Merge "Remove obsolete mBufferEnd"
Glenn Kasten [Mon, 29 Jul 2013 17:06:17 +0000 (17:06 +0000)]
Merge "Move delete AudioMixer closer to point of re-allocation"
Glenn Kasten [Thu, 25 Jul 2013 21:21:35 +0000 (14:21 -0700)]
Remove obsolete mBufferEnd
Change-Id: I507c6109d66000bb30933ca23b912a1316f55e5e
Glenn Kasten [Thu, 25 Jul 2013 21:21:14 +0000 (14:21 -0700)]
Remove obsolete TrackBase::step(), mStepCount, mStepServerFailed
Change-Id: I6347096f066b8b19451c6472db7b0671f0cf7702
Glenn Kasten [Mon, 29 Jul 2013 14:27:55 +0000 (14:27 +0000)]
Merge "Simplify RecordTrack::stop()"
Glenn Kasten [Sat, 27 Jul 2013 00:00:33 +0000 (00:00 +0000)]
Merge "CBLK_OVERRUN, not CBLK_UNDERRUN, is for record threads"
Glenn Kasten [Fri, 26 Jul 2013 23:24:50 +0000 (23:24 +0000)]
Merge "Remove obsolete TrackBase::reset()"
Glenn Kasten [Fri, 26 Jul 2013 21:33:40 +0000 (21:33 +0000)]
Merge "HAL stream format for mixer output threads must be stereo 16-bit PCM"
Richard Fitzgerald [Tue, 14 May 2013 14:52:03 +0000 (15:52 +0100)]
stagefright: offload playback support
Offloading of compressed audio decoding to audio DSP
is implemented for audio only, non streamed content.
when the datasource is
AudioPlayer:
- Create an offloaded sink when playing a compressed
source
- Send metadata to audio HAL
- Return sink start error to AwesomePlayer so that a
new player for PCM audio can be created in case of problem.
- Forward stream end and tear down callback events to AwesomePlayer
- Stop the sink and wait for stream end callback when EOS is reached.
- Pause and restart the sink if needed before flushing when seeking
(otherwise flush is a no op).
- For current media time, directly query the render position from the
sink and offset by the start position (seek to time)
AwesomePlayer:
- When initializing the audio decoder, check with audio policy manager
if offloading is supported. If yes, create the software decoder in
case a reconfiguration is needed but connect the audio track directly
to the AudioPlayer.
- In case of error when starting the AudioPlayer, reconnect the software
decoder (OMXSource) and recreate a PCM AudioPlayer.
- Handle AudioPlayer tear down event by detroying and recreating the
AudioPlayer to allow transitions between situations were offloading
is supported or not.
- Force tear down of offloaded AudioPlayer when paused for a certain time:
This will close the sink and allow the DSP to power down.
Utils:
- Added helper methods:
- send meta data to audio ia sink setParameters
- query audio policy manager if offloading is supported for a
given audio content
Change-Id: I115842ce424f947b966d45e253a74d3fd5df9aae
Signed-off-by: Eric Laurent <elaurent@google.com>
Richard Fitzgerald [Tue, 14 May 2013 12:18:21 +0000 (13:18 +0100)]
libmediaplayerservice: offload playback support
Main change is to how recycled tracks are used for gapless
playback. If we are playing offloaded tracks that can't be
recycled we don't open a new offloaded output until we have
closed the previous one. This is because offloaded tracks
are a limited resource so we don't want to spuriously create
unnecessary instances. If the tracks cannot be recycled
this means that the formats are incompatible and so the
hardware most likely will also be unable to use the existing
output channel for the new track. If we already have the
maximum number of hardware offload channels open (which could
be only one) then creation of the next output would fail if
we attempted it while the previous output was still open.
Change-Id: I4f5958074e7ffd2e17108157fee86329506730ea
Signed-off-by: Eric Laurent <elaurent@google.com>
Glenn Kasten [Thu, 25 Jul 2013 21:37:52 +0000 (14:37 -0700)]
Simplify RecordTrack::stop()
Change-Id: Ib959c1e9dc9544d12277ce11bea445118b2e0521
Glenn Kasten [Thu, 25 Jul 2013 21:41:19 +0000 (14:41 -0700)]
CBLK_OVERRUN, not CBLK_UNDERRUN, is for record threads
Change-Id: I8948f76ef4717a423c37cd6ea7db4381636af612
Glenn Kasten [Thu, 25 Jul 2013 21:34:57 +0000 (14:34 -0700)]
Remove obsolete TrackBase::reset()
Change-Id: I38100b7e28a12d7af8cb40ae3f4d9cb4a0ebe701
Richard Fitzgerald [Tue, 14 May 2013 11:12:21 +0000 (12:12 +0100)]
libmedia: offloaded playback support
- start() returns a status so that upper layers can
recreate a non offloaded track in case of error.
- Added states to handle offloaded tracks specific:
- waiting for stream end (drain) notification by
audio flinger
- allow pause while waiting for stream end notification
- getPosition() queries the render position directly from
audio HAL.
- disable APIs not applicable to offloaded tracks
- Modified track restoring behavior for invalidated
offloaded tracks: just send the callback and wait for
upper layers to create a new track.
- Added wait for stream end management in audio track client
proxy. Similar to obtainBuffer and should be factored in.
Change-Id: I0fc48117946364cb255afd653195498891f622bd
Signed-off-by: Eric Laurent <elaurent@google.com>
Eric Laurent [Mon, 7 Jan 2013 17:53:42 +0000 (09:53 -0800)]
AudioFlinger: offload playback, non-blocking write
- Added specialized playback thread class for offload playback,
derived from directoutput thread.
This thread type handles specific state transitions for offloaded
tracks and offloading commands (pause/resume/drain/flush..) to audio HAL.
As opposed to other threads, does not go to standby if the track is paused.
- Added support for asynchronous write and drain operations at audio HAL.
Use a thread to handle async callback events from HAL: this avoids locking
playback thread mutex when executing the callback and cause deadlocks when
calling audio HAL functions with the playback thread mutex locked.
- Better accouting for track activity: call start/stop and release Output
methods in audio policy manager when tracks are actually added and removed
from the active tracks list.
Added a command thread in audio policy service to handle stop/release commands
asynchronously and avoid deadlocks with playback thread.
- Track terminated status is not a state anymore. This condition is othogonal
to state to permitted state transitions while terminated.
Change-Id: Id157f4b3277620568d8eace7535d9186602564de
Glenn Kasten [Thu, 25 Jul 2013 17:09:11 +0000 (10:09 -0700)]
Move delete AudioMixer closer to point of re-allocation
No need to delete AudioMixer before readOutputParameters
Change-Id: Icafa785c9021bbe8d985e4f9527f8fc8c5e62622
Glenn Kasten [Wed, 17 Jul 2013 00:18:58 +0000 (17:18 -0700)]
HAL stream format for mixer output threads must be stereo 16-bit PCM
Direct and tunnel output threads can support various HAL stream formats,
included encoded. But currently there are stereo 16-bit PCM assumptions
in several places for mixer and duplicating output threads:
- mMixBuffer and mixBuffer()
- AudioMixer including resampler
- FastMixer's mixBuffer
- effects
- NBAIO_Format
- anywhere FCC_2 is used
- possibly other places
Until those assumptions are removed, this CL enforces stereo 16-bit
PCM in mixer and duplicating threads at the place where the HAL format
is read. It was already being checked in checkForNewParameters_l(),
but not in readOutputParameters().
Change-Id: Ibe344cc922743da234299097aa1bb1f54795cc9b
Glenn Kasten [Tue, 16 Jul 2013 21:17:15 +0000 (14:17 -0700)]
Simplify getParameters()
Change-Id: Iedfeca3cd477d023c350d6d4e6eed874ee467a32
Glenn Kasten [Wed, 26 Jun 2013 18:29:02 +0000 (11:29 -0700)]
Move local variable declarations to point of first use
Change-Id: Ideb83dea2c3002651c34fa646753cba598e29e93
Andy McFadden [Thu, 25 Jul 2013 14:27:30 +0000 (14:27 +0000)]
Merge "Update error message"
Glenn Kasten [Wed, 17 Jul 2013 00:19:58 +0000 (17:19 -0700)]
Use standard name and type for channel mask
Former name 'channels' was ambiguous with respect to channel count.
Change-Id: I716f792d95a7e0c787d27514ad6e93dbcef8a415
Andy McFadden [Wed, 24 Jul 2013 23:35:12 +0000 (16:35 -0700)]
Update error message
The color format used for surfaces has two different names. The
one in the error message is the "native" name, which doesn't mean
anything to external developers.
Change-Id: Ic0561f4ad12970b0e0a60bd17b4e3997af1a9f0e
Glenn Kasten [Wed, 17 Jul 2013 00:23:39 +0000 (17:23 -0700)]
AudioRecord and HAL input stream must be 16-bit PCM only
Currently there are 16-bit PCM assumptions in several places for capture:
- resampler API
- mRsmpInBuffer and mRsmpOutBuffer
- RecordThread::threadLoop upmix, downmix, and resampling
- possibly other places
Until those assumptions are removed, this CL enforces 16-bit PCM in both
client and server at all places where a format is checked.
Change-Id: I08b0570bff626ad0d341804825a72c14e61b4233
Zhijun He [Wed, 24 Jul 2013 20:56:24 +0000 (20:56 +0000)]
Merge "camera2: Implement ICameraDeviceUser::waitUntilIdle"
Jeff Tinker [Wed, 24 Jul 2013 19:38:27 +0000 (19:38 +0000)]
Merge "Remove obsolete drm manager code"
Andy McFadden [Wed, 24 Jul 2013 00:26:25 +0000 (00:26 +0000)]
Merge "Don't abort on unusual state transition"
Andy McFadden [Tue, 23 Jul 2013 22:49:10 +0000 (22:49 +0000)]
Merge "Prototype screen recording command"
Andy McFadden [Mon, 22 Jul 2013 19:23:07 +0000 (12:23 -0700)]
Prototype screen recording command
This records the screen contents as a movie. It works by feeding
the output of a virtual display to the video/avc encoder. Recording
continues until Ctrl-C is hit.
Video only, no sound. Does not track screen rotations.
Change-Id: I91d5c4e781792c740699b7a83590e846295b3617
Andy McFadden [Tue, 23 Jul 2013 20:05:29 +0000 (13:05 -0700)]
Don't abort on unusual state transition
The state transition check was too strict, and we were crashing
mediaserver inappropriately.
Bug
9819944
Change-Id: I1482ed1cfee37088d4893ee81cf1b2b950d2e930
Jeff Tinker [Mon, 22 Jul 2013 22:54:42 +0000 (15:54 -0700)]
Remove obsolete drm manager code
bug:
9545965
Change-Id: Ia6e09efa826b1349d027045e782980daeb7d7596
Geremy Condra [Tue, 23 Jul 2013 18:11:55 +0000 (18:11 +0000)]
Merge "Fix typo in socket name"
Chad Brubaker [Tue, 23 Jul 2013 18:09:19 +0000 (11:09 -0700)]
Fix typo in socket name
Change-Id: I29171368f1b69333ef7eae53ada2fab94e3e28b9
Zhijun He [Tue, 23 Jul 2013 15:02:53 +0000 (08:02 -0700)]
camera2: Implement ICameraDeviceUser::waitUntilIdle
Also fixed some logging typo
Change-Id: Ib254bdb137dca10b12595c23aeb1c53097423425
Geremy Condra [Tue, 23 Jul 2013 17:56:36 +0000 (17:56 +0000)]
Merge "Add routing sockets for the requesting user"
Zhijun He [Tue, 23 Jul 2013 00:34:34 +0000 (17:34 -0700)]
Camera: ProCamera connect need support HAL3 device
Change-Id: Iae7e5f9e6387f61f1c4bbb91f75803fc1fdf2668
Glenn Kasten [Mon, 22 Jul 2013 15:02:08 +0000 (15:02 +0000)]
Merge "Use AudioSystem::setLowRamDevice() to configure memory"
Glenn Kasten [Mon, 22 Jul 2013 14:43:59 +0000 (14:43 +0000)]
Merge "Revert "Fix Audioflinger crash when TeeSink is enabled""
Glenn Kasten [Mon, 22 Jul 2013 14:43:19 +0000 (14:43 +0000)]
Merge "Fix compile warning"
Zhijun He [Sat, 20 Jul 2013 01:09:39 +0000 (01:09 +0000)]
Merge "camera2: Fix request ID bug"
Mathias Agopian [Sat, 20 Jul 2013 01:02:37 +0000 (01:02 +0000)]
Merge "update to new Consumer APIs"
The Android Open Source Project [Fri, 19 Jul 2013 23:02:29 +0000 (16:02 -0700)]
am
f2d744d9: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
f2d744d9535ca59be6cd878830176f81a0a8fbc6':
Camera2/3: Fix deadlock when starting recording before preview.
Eino-Ville Talvala [Fri, 19 Jul 2013 23:02:11 +0000 (16:02 -0700)]
am
b0177ff2: am
46910bdc: Camera2/3: Fix deadlock when starting recording before preview.
* commit '
b0177ff25e3e620be6ebe1e2c3f645b2f05dd57e':
Camera2/3: Fix deadlock when starting recording before preview.
Glenn Kasten [Fri, 19 Jul 2013 22:59:07 +0000 (22:59 +0000)]
Merge "Make AudioFlinger::instantiate() more resilient when called from separate module"
Chad Brubaker [Tue, 16 Jul 2013 04:17:03 +0000 (21:17 -0700)]
Add routing sockets for the requesting user
Mediaserver sockets are now routed as if the connection was in the
requesting app in per user routing.
Change-Id: I60f4649c3c4145a65264b54c1aa2c6c7741efaba
The Android Open Source Project [Fri, 19 Jul 2013 21:20:40 +0000 (14:20 -0700)]
Reconcile with jb-mr2-zeroday-release - do not merge
Change-Id: I48e936434971feedd176c2d5eafd0fdf43b75f74
Andreas Huber [Fri, 19 Jul 2013 18:00:43 +0000 (11:00 -0700)]
Enable support for explicitly requesting an encoded keyframe from the vp8
encoder.
Change-Id: I370d5831f7d6037faf361a92521390f19f179cbe
Eino-Ville Talvala [Fri, 19 Jul 2013 20:43:00 +0000 (13:43 -0700)]
am
46910bdc: Camera2/3: Fix deadlock when starting recording before preview.
* commit '
46910bdc57c35ac36bd4adcbb76f4f3a590e3f21':
Camera2/3: Fix deadlock when starting recording before preview.
Zhijun He [Fri, 19 Jul 2013 20:18:43 +0000 (13:18 -0700)]
camera2: Fix request ID bug
Wrong request id was pushed in request list.
Change-Id: I55bf7ae84ca41eec79db1a81d2cde35beaa2a6b9
Andreas Huber [Fri, 19 Jul 2013 18:32:07 +0000 (11:32 -0700)]
Minor tweaks to DirectRenderer and Converter
Converter now supports automatic prepending of SPS/PPS to IDR frames (h264)
as well as using the encoder in "surface-input" mode.
The new features are all opt-in and should not affect existing clients.
Change-Id: I543cf1d31ba068c1a01ab4e6814ac8d817b63faa
Glenn Kasten [Fri, 19 Jul 2013 17:32:41 +0000 (10:32 -0700)]
Fix compile warning
Change-Id: I80de4a013dc65eb7c532561438fd10e005354c03
Glenn Kasten [Mon, 15 Jul 2013 21:45:07 +0000 (14:45 -0700)]
Use AudioSystem::setLowRamDevice() to configure memory
Bug:
9798886
Change-Id: I9321e3f369f1ed9429ae222e3926ebdeb012b8b0
Glenn Kasten [Mon, 15 Jul 2013 23:09:26 +0000 (16:09 -0700)]
Revert "Fix Audioflinger crash when TeeSink is enabled"
This reverts commit
84e391686d7eced293913d1d7993721224ee0ba1.
Bug:
8834855
Change-Id: I8211ef5ea5d87d97ada115723df31c8057f38ca8
Glenn Kasten [Mon, 15 Jul 2013 18:23:36 +0000 (11:23 -0700)]
Make AudioFlinger::instantiate() more resilient when called from separate module
Bug:
8834855
Change-Id: I4cd842cdfb09d2aaaaab9df9ac3bec6179709bd3
Eino-Ville Talvala [Fri, 19 Jul 2013 02:15:17 +0000 (19:15 -0700)]
Camera2/3: Fix deadlock when starting recording before preview.
Move 3A notification synthesis for HAL3 devices from
Camera3Device::processCaptureResult to Camera2Client's
FrameProcessor. This will ensure that calls to processCaptureResult
from HAL can never block on Camera2Client internal mutexes.
Bug:
9923891
Change-Id: I5184649bf45c0807babe6b8c0e1239e959cd3480
Eino-Ville Talvala [Fri, 19 Jul 2013 02:15:17 +0000 (19:15 -0700)]
Camera2/3: Fix deadlock when starting recording before preview.
Move 3A notification synthesis for HAL3 devices from
Camera3Device::processCaptureResult to Camera2Client's
FrameProcessor. This will ensure that calls to processCaptureResult
from HAL can never block on Camera2Client internal mutexes.
Bug:
9923891
Change-Id: I5184649bf45c0807babe6b8c0e1239e959cd3480
Andreas Huber [Thu, 18 Jul 2013 22:14:33 +0000 (22:14 +0000)]
Merge "ANetworkSession and ParsedMessage are now part of stagefright foundation."
Andreas Huber [Thu, 18 Jul 2013 21:36:18 +0000 (14:36 -0700)]
ANetworkSession and ParsedMessage are now part of stagefright foundation.
Also fixes some bugs in ParseMessage and adds "WebSocket" mode to
ANetworkSession, something that's opt-in and should not affect existing clients
of the API.
Change-Id: I86d5748e0d818231d85d3590d86c2b41d4f8b1f1
Dima Zavin [Thu, 18 Jul 2013 20:37:19 +0000 (20:37 +0000)]
Merge "stagefright: set scaling mode for blank frames in ACodec"
Dima Zavin [Thu, 18 Jul 2013 18:43:39 +0000 (11:43 -0700)]
stagefright: set scaling mode for blank frames in ACodec
Analogous to
1d5ac80d0c6d3deabcc9e9b4abc9e3ef536aeb27
(by jgennis), this sets the scaling mode for the ANativeWindow
to SCALE_TO_WINDOW prior to pushing the blank frames during
decoder tear down.
Without this, the window defaults to FREEZE and SF ignores the
new frames.
Bug:
9516405
Change-Id: I39ef30922d733034bf01100d7ff24ac9c0c33b7d
Signed-off-by: Dima Zavin <dima@android.com>
Glenn Kasten [Thu, 18 Jul 2013 14:59:36 +0000 (14:59 +0000)]
Merge "Fix theoretical memory leak in mConfigEvents"
Glenn Kasten [Wed, 17 Jul 2013 16:08:51 +0000 (09:08 -0700)]
Fix theoretical memory leak in mConfigEvents
Change-Id: I137f70676c8919661e716c33e0dd9c25c2b6285c
Glenn Kasten [Wed, 17 Jul 2013 23:26:33 +0000 (23:26 +0000)]
Merge "Clean up references to AUDIO_FORMAT_PCM_8_24_BIT"
Andreas Huber [Wed, 17 Jul 2013 22:29:43 +0000 (22:29 +0000)]
Merge "Support "suspension" of a video encoder in "surface-input" mode."
Andreas Huber [Wed, 17 Jul 2013 20:55:26 +0000 (13:55 -0700)]
Support "suspension" of a video encoder in "surface-input" mode.
i.e. feed no more input frames to the encoder while suspended.
Change-Id: I51391e18c1517548e869f8ddece19f4af37e78f9
Andreas Huber [Wed, 17 Jul 2013 22:13:17 +0000 (22:13 +0000)]
Merge "Experimental support for enabling the use of "surface input" mode"
Andreas Huber [Wed, 17 Jul 2013 21:02:31 +0000 (14:02 -0700)]
Experimental support for enabling the use of "surface input" mode
even with the software VP8 encoder.
This relies heavily on the fact that the "Nexus" devices use ARGB32 as
the colorspace for the data underlying a surface provided by SurfaceFlinger
(mirroring). Generally there are no such guarantees.
Change-Id: I1de32f591a3bb935ca76151816b3a02665bec40b
leozwang@google.com [Wed, 17 Jul 2013 21:14:37 +0000 (21:14 +0000)]
Merge "Output more detailed error message if loading library fails"
leozwang@google.com [Sun, 14 Jul 2013 04:52:50 +0000 (21:52 -0700)]
Output more detailed error message if loading library fails
Bug:
9805979
Change-Id: I77b19d6a65ff9fb72e7428ce79b117628e4c8658
Glenn Kasten [Wed, 17 Jul 2013 15:14:16 +0000 (15:14 +0000)]
Merge "Fix indentation"
Glenn Kasten [Wed, 17 Jul 2013 14:44:50 +0000 (14:44 +0000)]
Merge "Add comments"
Glenn Kasten [Wed, 17 Jul 2013 14:24:14 +0000 (14:24 +0000)]
Merge "Fix typo in logs"
Mathias Agopian [Wed, 17 Jul 2013 05:54:39 +0000 (22:54 -0700)]
update to new Consumer APIs
Change-Id: I3c5d4be2a2e8783fbf98b3e268fd02658f71dc7d
Mathias Agopian [Tue, 16 Jul 2013 02:17:39 +0000 (02:17 +0000)]
Merge "always pass the BufferQueue explicitely to consumers"
Igor Murashkin [Sat, 13 Jul 2013 00:52:16 +0000 (17:52 -0700)]
camera2: Implement ICameraDeviceUser::getCameraInfo
Bug:
9529161
Change-Id: I927e39c124cd5fb19e38423506f4463acc381cb0
Mathias Agopian [Sat, 13 Jul 2013 05:06:20 +0000 (22:06 -0700)]
always pass the BufferQueue explicitely to consumers
Change-Id: Ic2d9a9cf184a482b3c78a481ed693ee32df5ca13
Glenn Kasten [Thu, 11 Jul 2013 20:11:55 +0000 (20:11 +0000)]
Merge "AudioTrackShared cleanup"
Glenn Kasten [Thu, 11 Jul 2013 20:07:50 +0000 (20:07 +0000)]
Merge "Fix AudioTrack::flush()"
Glenn Kasten [Thu, 11 Jul 2013 17:35:38 +0000 (10:35 -0700)]
Fix AudioTrack::flush()
It was only flushing at a surface level, and even then only the first time
the server observed the client's flush request. Now it flushes at a
deeper level, but there may be even deeper device-specific flushing.
Bug:
9770947
Change-Id: I687cc3410ff9e5e5d4a5dcb9e3b129501e53d247
The Android Open Source Project [Thu, 11 Jul 2013 17:17:25 +0000 (10:17 -0700)]
am
1bb59258: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
1bb59258458350af518170558120783bc2f9e61d':
The Android Open Source Project [Thu, 11 Jul 2013 15:08:09 +0000 (08:08 -0700)]
am
0a95b17c: (-s ours) Reconcile with jb-mr2-zeroday-release - do not merge
* commit '
0a95b17c93f8ca0a4ed46bdc5797aa81f46f028c':
Andy McFadden [Thu, 11 Jul 2013 14:40:58 +0000 (14:40 +0000)]
Merge "Pass additional arg to acquireBuffer calls."