OSDN Git Service
Eric Laurent [Thu, 6 Mar 2014 00:59:04 +0000 (00:59 +0000)]
am
0c937b49: (-s ours) am
eb16bb5d: am
7028a2c8: am
7e92abea: audioflinger: fix offload write buffer offset
* commit '
0c937b4946fae178447d9f8d29200fa2798c05f9':
audioflinger: fix offload write buffer offset
Eric Laurent [Wed, 5 Mar 2014 22:48:11 +0000 (22:48 +0000)]
am
eb16bb5d: am
7028a2c8: am
7e92abea: audioflinger: fix offload write buffer offset
* commit '
eb16bb5dcecf430bfec1c2a4bd15851c83b9c3cc':
audioflinger: fix offload write buffer offset
Eric Laurent [Wed, 5 Mar 2014 22:44:59 +0000 (22:44 +0000)]
am
7028a2c8: am
7e92abea: audioflinger: fix offload write buffer offset
* commit '
7028a2c8106ee5a22db88da5dad581820ee07254':
audioflinger: fix offload write buffer offset
Eric Laurent [Wed, 5 Mar 2014 22:41:53 +0000 (22:41 +0000)]
am
7e92abea: audioflinger: fix offload write buffer offset
* commit '
7e92abeafb184e8a34213d7149592e95a72601b0':
audioflinger: fix offload write buffer offset
jpadmana [Wed, 5 Mar 2014 21:54:27 +0000 (21:54 +0000)]
am
57f87026: am
97504893: am
6b260425: am
85b3013e: fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
* commit '
57f87026a30f3e461f6a804e94b6dab7b385f3ca':
fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
Haynes Mathew George [Wed, 5 Mar 2014 21:54:27 +0000 (21:54 +0000)]
am
40e01b43: am
4287b414: am
fc04776a: am
50c3157c: audioflinger: check for condition before waiting
* commit '
40e01b4395ee2d8569fc392e889decc365b78288':
audioflinger: check for condition before waiting
Haynes Mathew George [Wed, 5 Mar 2014 21:54:26 +0000 (21:54 +0000)]
am
0504a198: am
632c3790: am
7c206e5b: am
e0cd1051: audioflinger: update track ready condition
* commit '
0504a198d6595e29e58d1d66ae59fac1d662384a':
audioflinger: update track ready condition
Haynes Mathew George [Wed, 5 Mar 2014 21:54:25 +0000 (21:54 +0000)]
am
d384a2c4: (-s ours) am
4f9e38c6: am
21e81bca: am
e010f65e: audioflinger: Fix for a deadlock in track creation
* commit '
d384a2c44810ce1b51277cc4ab4c5415ff7de6ee':
audioflinger: Fix for a deadlock in track creation
Eric Laurent [Fri, 22 Nov 2013 17:29:56 +0000 (09:29 -0800)]
audioflinger: fix offload write buffer offset
Fix current audio HAL write buffer offset calculation
which assumes that the frame size is a multiple of 2.
'
Bug:
12823725.
Change-Id: I0195ed5cfef225a6f114e7dd405a02680bb7254e
jpadmana [Wed, 5 Mar 2014 20:01:15 +0000 (20:01 +0000)]
am
97504893: am
6b260425: am
85b3013e: fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
* commit '
97504893a3ee96f612e0e1b47d331583a88e289b':
fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
Haynes Mathew George [Wed, 5 Mar 2014 20:01:15 +0000 (20:01 +0000)]
am
4287b414: am
fc04776a: am
50c3157c: audioflinger: check for condition before waiting
* commit '
4287b41411b40415b4186babf5763c3cfa0391ef':
audioflinger: check for condition before waiting
Haynes Mathew George [Wed, 5 Mar 2014 20:01:14 +0000 (20:01 +0000)]
am
632c3790: am
7c206e5b: am
e0cd1051: audioflinger: update track ready condition
* commit '
632c3790523896260dc43fd6cd40a158765cdb15':
audioflinger: update track ready condition
Haynes Mathew George [Wed, 5 Mar 2014 20:01:11 +0000 (20:01 +0000)]
am
4f9e38c6: am
21e81bca: am
e010f65e: audioflinger: Fix for a deadlock in track creation
* commit '
4f9e38c60cc79407a8b2966b3b9780a3e395b017':
audioflinger: Fix for a deadlock in track creation
jpadmana [Wed, 5 Mar 2014 19:26:49 +0000 (19:26 +0000)]
am
6b260425: am
85b3013e: fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
* commit '
6b2604259c12ee28b49f26ab2adac96eefe30934':
fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
Haynes Mathew George [Wed, 5 Mar 2014 19:26:48 +0000 (19:26 +0000)]
am
fc04776a: am
50c3157c: audioflinger: check for condition before waiting
* commit '
fc04776adc5572fcc323b1dca66dee27a537c619':
audioflinger: check for condition before waiting
Haynes Mathew George [Wed, 5 Mar 2014 19:26:47 +0000 (19:26 +0000)]
am
7c206e5b: am
e0cd1051: audioflinger: update track ready condition
* commit '
7c206e5bd24b5ae4565d0e60b637458a1054dfcf':
audioflinger: update track ready condition
Haynes Mathew George [Wed, 5 Mar 2014 19:26:47 +0000 (19:26 +0000)]
am
21e81bca: am
e010f65e: audioflinger: Fix for a deadlock in track creation
* commit '
21e81bca4d1e6f7d1ccac61b65da7c7a4a121064':
audioflinger: Fix for a deadlock in track creation
Robert Shih [Wed, 5 Mar 2014 01:59:39 +0000 (01:59 +0000)]
Merge "PlaylistFetcher: fix infinite loop when parsing ADTS."
jpadmana [Wed, 5 Mar 2014 01:24:11 +0000 (01:24 +0000)]
am
85b3013e: fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
* commit '
85b3013e06e8fe7802fe6259ecac80261e834332':
fix deadlock issues that arise when there are simultaneous effect control interface calls to proxy and to non sub-effect wrappers(eg., bundlewrapper) from audioflinger Also, return NO_ERROR when CMD_OFFLOAD succeeds
Haynes Mathew George [Wed, 5 Mar 2014 01:24:10 +0000 (01:24 +0000)]
am
50c3157c: audioflinger: check for condition before waiting
* commit '
50c3157c5a3e0617be77716beff1ae8801d8a72f':
audioflinger: check for condition before waiting
Haynes Mathew George [Wed, 5 Mar 2014 01:24:09 +0000 (01:24 +0000)]
am
e0cd1051: audioflinger: update track ready condition
* commit '
e0cd1051ed9fea0629745c29020516ae62298461':
audioflinger: update track ready condition
Haynes Mathew George [Wed, 5 Mar 2014 01:24:09 +0000 (01:24 +0000)]
am
e010f65e: audioflinger: Fix for a deadlock in track creation
* commit '
e010f65e6337267cb15f8894c950a3f64370dd36':
audioflinger: Fix for a deadlock in track creation
jpadmana [Thu, 14 Nov 2013 11:50:52 +0000 (17:20 +0530)]
fix deadlock issues that arise when there are simultaneous
effect control interface calls to proxy and to
non sub-effect wrappers(eg., bundlewrapper) from audioflinger
Also, return NO_ERROR when CMD_OFFLOAD succeeds
Whenever there are parallel calls to proxy and non sub-effects wrappers,
some of the calls are not completed. This is due to deadlock arsing out
of Proxy waiting for the subeffect call to return and subeffect waiting
for proxy to release lock.
The call flow is changed to a cleaner and simple one - Proxy gets the
aeli(effect library info) of subeffects during the EffectGetSubEffects()
call. Therby, proxy will manage the sub effects by itself rather than
going through effects factory.
Change-Id: If4b259da5776f151c1e81a78a0239d342046d923
Signed-off-by: jpadmana <jayashree.r.padmanaban@intel.com>
Bug:
12424044
Eric Laurent [Wed, 5 Mar 2014 00:10:26 +0000 (00:10 +0000)]
am
3cd7a13a: am
d26e6522: am
57159656: am
a4f24ff9: AudioTrack: fix position callback after restore
* commit '
3cd7a13a7926e210bd8dff65d6f43a257f5235e5':
AudioTrack: fix position callback after restore
Haynes Mathew George [Wed, 4 Dec 2013 05:26:02 +0000 (21:26 -0800)]
audioflinger: check for condition before waiting
AsyncCallbackThread must check for any condition that
was already been satisfied before waiting.
Bug:
11824817
Change-Id: I04683a1f355de4f440106cab47fd916aa39d5e35
Haynes Mathew George [Sat, 28 Dec 2013 00:09:28 +0000 (16:09 -0800)]
audioflinger: update track ready condition
Signal track ready if the track isStopping().
Bug:
12423190
Change-Id: I95e14905df10ebf301e398263478c8ca25d7e2ce
Haynes Mathew George [Fri, 13 Dec 2013 23:40:13 +0000 (15:40 -0800)]
audioflinger: Fix for a deadlock in track creation
AudioFlinger enters a deadlock (with itself) on trying to free a
RecordTrack or Track object that failed initialization. Clear this
bad object from the caller instead.
Bug:
12423233
Change-Id: I926f2beb922a70f6924e593e2bbf1a5b5df85b16
Eric Laurent [Tue, 4 Mar 2014 23:24:15 +0000 (23:24 +0000)]
am
d26e6522: am
57159656: am
a4f24ff9: AudioTrack: fix position callback after restore
* commit '
d26e652226b5e589d6784bd01f2c5fc381dc6e2c':
AudioTrack: fix position callback after restore
Eric Laurent [Tue, 4 Mar 2014 23:21:48 +0000 (23:21 +0000)]
am
57159656: am
a4f24ff9: AudioTrack: fix position callback after restore
* commit '
571596564f4b818b8e89c4bbe824e557e8e00075':
AudioTrack: fix position callback after restore
Eric Laurent [Tue, 4 Mar 2014 23:17:47 +0000 (23:17 +0000)]
am
a4f24ff9: AudioTrack: fix position callback after restore
* commit '
a4f24ff9b239300b4bb2098c1413c0a60edc2d7e':
AudioTrack: fix position callback after restore
Robert Shih [Fri, 7 Feb 2014 20:26:58 +0000 (12:26 -0800)]
PlaylistFetcher: fix infinite loop when parsing ADTS.
First check for embedded ID3 tag, then bail out if invalid.
Bug:
12934795
Change-Id: I74acebed4bfb2c6ca44dfe936166fdba8510233f
Andy McFadden [Tue, 4 Mar 2014 15:26:45 +0000 (15:26 +0000)]
Merge "Fix destructors"
Lajos Molnar [Tue, 4 Mar 2014 06:23:13 +0000 (22:23 -0800)]
stagefright: SoftOpus: add explicit include files
Also resolved new warnings
Change-Id: I41423b20f80400567bf192c4b4e95c6a29d84782
Andy McFadden [Tue, 4 Mar 2014 01:09:54 +0000 (17:09 -0800)]
Fix destructors
Make destructors private -- only RefBase should be able to destroy
instances of these.
Change-Id: Iff52e226995fe5740a9dfc35af53dd6dd9d74501
Lajos Molnar [Tue, 4 Mar 2014 00:05:14 +0000 (00:05 +0000)]
Merge "Opus Matroska support in OpenMax"
Vignesh Venkatasubramanian [Wed, 29 Jan 2014 17:00:46 +0000 (09:00 -0800)]
Opus Matroska support in OpenMax
Adding Openmax component for libopus software decoder. This can
decode opus audio files embedded in matroska containers.
Change-Id: I7e0691cfc6d719c4e927b9efbd05a3143be49abc
Note: This CL is part of adding Opus support to Android.
Narayan Kamath [Mon, 3 Mar 2014 11:18:28 +0000 (11:18 +0000)]
am
62a897c6: am
525b099a: Merge "Fix ALOGVs for 64bit"
* commit '
62a897c6c44d82fc19207fd95692a9c93ded458f':
Fix ALOGVs for 64bit
Narayan Kamath [Mon, 3 Mar 2014 11:11:48 +0000 (11:11 +0000)]
am
525b099a: Merge "Fix ALOGVs for 64bit"
* commit '
525b099ada155d6654300cb2e5d8c1a09f4eb8ba':
Fix ALOGVs for 64bit
Narayan Kamath [Mon, 3 Mar 2014 11:08:27 +0000 (11:08 +0000)]
Merge "Fix ALOGVs for 64bit"
Andy Hung [Sat, 1 Mar 2014 00:23:02 +0000 (16:23 -0800)]
Rename mSinkFormat to mMixerFormat for AudioMixer::track_t
AudioMixer::SINK_FORMAT also changes to AudioMixer::MIXER_FORMAT
Change-Id: Ic3f8be77d2c75c082c4fd140bc907e30c304d285
Signed-off-by: Andy Hung <hunga@google.com>
Andy Hung [Sat, 1 Mar 2014 01:54:57 +0000 (01:54 +0000)]
Merge "Use float_from_q19_12 conversion in AudioMixer"
Andy Hung [Fri, 28 Feb 2014 23:51:47 +0000 (15:51 -0800)]
Use float_from_q19_12 conversion in AudioMixer
Change-Id: Idbe84fb9610c7e636a84468f2e2402a913435ca9
Signed-off-by: Andy Hung <hunga@google.com>
Robert Shih [Sat, 1 Mar 2014 01:28:25 +0000 (01:28 +0000)]
Merge "Initial HLS seamless switch implementation."
Glenn Kasten [Sat, 1 Mar 2014 00:51:31 +0000 (00:51 +0000)]
Merge "Make openRecord_l more like createTrack_l for fast tracks: part 3"
Robert Shih [Thu, 20 Feb 2014 21:07:26 +0000 (13:07 -0800)]
Initial HLS seamless switch implementation.
Bug:
11854054
Change-Id: I75fc2a258111295039ac13cc37e407df25891dd2
Andy Hung [Fri, 28 Feb 2014 23:15:11 +0000 (23:15 +0000)]
Merge "Add MixerBuffer for accumulation of float audio"
Marco Nelissen [Fri, 28 Feb 2014 22:58:42 +0000 (22:58 +0000)]
Merge "Fix race condition in AwesomePlayer"
Andy Hung [Fri, 28 Feb 2014 22:34:43 +0000 (22:34 +0000)]
Merge "Rename mixBufferSize to mSinkBufferSize in AudioFlinger"
Andy Hung [Fri, 28 Feb 2014 22:28:44 +0000 (22:28 +0000)]
Merge "Rename constants for MixBufferSize to SinkBufferSize"
Andy Hung [Fri, 28 Feb 2014 22:28:00 +0000 (22:28 +0000)]
Merge "Rename mMixBuffer to mSinkBuffer in AudioFlinger"
Glenn Kasten [Fri, 28 Feb 2014 22:24:57 +0000 (22:24 +0000)]
Merge "Make openRecord_l more like createTrack_l for fast tracks: part 2"
Glenn Kasten [Thu, 27 Feb 2014 23:31:39 +0000 (15:31 -0800)]
Make openRecord_l more like createTrack_l for fast tracks: part 3
Create the callback thread earlier, before creating the IAudioRecord,
so that the thread's tid is available as a parameter to openRecord().
Also move initialization of mCbf to same point as in AudioTrack.cpp.
Change-Id: I61ea4c5e2724ccfc691aaf51bc02a7c10d5a7495
Glenn Kasten [Thu, 27 Feb 2014 21:35:06 +0000 (13:35 -0800)]
Make openRecord_l more like createTrack_l for fast tracks: part 2
Assume double-buffering because we don't know the true HAL sample rate,
and for fast tracks we must accomodate kernel scheduling and app
computation jitter.
Change-Id: I983d6048a8b4814cfa5bf789397cdd9f1572256c
Glenn Kasten [Mon, 3 Feb 2014 15:40:31 +0000 (07:40 -0800)]
Rename setStreamOutput to invalidateStream
And simplify by removing the unused I/O handle parameter 'output'.
Change-Id: Ie9c4df17a7378066312d4ed8790fda7a9125c95e
Glenn Kasten [Fri, 28 Feb 2014 19:49:48 +0000 (19:49 +0000)]
Merge "Make openRecord_l more like createTrack_l for fast tracks: part 1"
Marco Nelissen [Fri, 28 Feb 2014 18:00:21 +0000 (10:00 -0800)]
Fix race condition in AwesomePlayer
This fixes a race condition that could cause two threads to attempt to
connect to a server at the same time, resulting in multiple requests
and/or aborted connections. In some cases, it could cause other operations
on MediaPlayer to block until network access was complete.
b/
13187722
Change-Id: Ibf78acff15dbfbf6c443a4c60623e8eac967d955
Glenn Kasten [Fri, 28 Feb 2014 17:24:25 +0000 (17:24 +0000)]
am
e276aef8: am
0cf16339: Merge "Fix preventing from heap overwrite in capture command"
* commit '
e276aef8779a7763b318ebd3e8c09f35ff37a95c':
Fix preventing from heap overwrite in capture command
Glenn Kasten [Fri, 28 Feb 2014 17:16:26 +0000 (17:16 +0000)]
am
0cf16339: Merge "Fix preventing from heap overwrite in capture command"
* commit '
0cf1633922f970caee19e2cc2f5c042ca30b4aa6':
Fix preventing from heap overwrite in capture command
Glenn Kasten [Fri, 28 Feb 2014 17:12:12 +0000 (17:12 +0000)]
Merge "Fix preventing from heap overwrite in capture command"
Glenn Kasten [Thu, 27 Feb 2014 23:29:51 +0000 (15:29 -0800)]
Fix type of AudioTrack/AudioRecord parameter frameCount
It's size_t consistently
Change-Id: I29638ef59ac773218025f2403a3508a307b487e0
Glenn Kasten [Thu, 27 Feb 2014 23:30:41 +0000 (15:30 -0800)]
Fix type of AudioTrack/AudioRecord parameter notificationFrames
It's uint32_t consistently
Change-Id: If8298c7e9aeea2b951fe47b675adbdf48d104846
Kévin PETIT [Fri, 28 Feb 2014 10:48:38 +0000 (10:48 +0000)]
Fix ALOGVs for 64bit
Change-Id: I556f90f9e6ace1a897d24326e5c14e7bf1e9fe29
Signed-off-by: Kévin PETIT <kevin.petit@arm.com>
Andy Hung [Wed, 26 Feb 2014 01:24:40 +0000 (17:24 -0800)]
Add MixerBuffer for accumulation of float audio
Path into and out of MixerBuffer is set up, but not
currently enabled.
Change-Id: I9d50752607d22dd2a3d9cc7e053babf8dfb22958
Signed-off-by: Andy Hung <hunga@google.com>
Andy Hung [Thu, 27 Feb 2014 22:56:00 +0000 (14:56 -0800)]
Rename mixBufferSize to mSinkBufferSize in AudioFlinger
Change-Id: I4d1d18d716fa3ad8c0e7cc87f5a2823422f504eb
Signed-off-by: Andy Hung <hunga@google.com>
Andy Hung [Thu, 27 Feb 2014 22:30:47 +0000 (14:30 -0800)]
Rename constants for MixBufferSize to SinkBufferSize
Updated variable names are
kMinNormalSinkBufferSizeMs
kMaxNormalSinkBufferSizeMs
Change-Id: I91969eae3f8c10275db8778634cbf05fdec0712b
Signed-off-by: Andy Hung <hunga@google.com>
Andy Hung [Thu, 27 Feb 2014 22:00:06 +0000 (14:00 -0800)]
Rename mMixBuffer to mSinkBuffer in AudioFlinger
Change-Id: I1f55630425b8ce36e9df2aaf64e06a8960b69a47
Signed-off-by: Andy Hung <hunga@google.com>
Marco Nelissen [Thu, 27 Feb 2014 22:03:49 +0000 (22:03 +0000)]
Merge "Don't crash on remote read error, just return"
Glenn Kasten [Thu, 27 Feb 2014 21:34:29 +0000 (13:34 -0800)]
Make openRecord_l more like createTrack_l for fast tracks: part 1
Use the transfer mode to distinguish use cases, as the presence of
a callback handler is not sufficient. For example, the track could be
configured for synchronous transfer with write() or read(), and also
have a callback handler for position updates. But that does not mean
the track can operate in fast track mode.
Change-Id: I2a7f1f0ca98e68efe180b524496985109d8ce291
Glenn Kasten [Thu, 27 Feb 2014 21:29:46 +0000 (21:29 +0000)]
Merge "Move up AudioFlinger::createTrack and openRecord parameter checks"
Andy McFadden [Thu, 27 Feb 2014 21:28:49 +0000 (21:28 +0000)]
Merge "Add frame dump output"
Glenn Kasten [Wed, 5 Feb 2014 18:00:23 +0000 (10:00 -0800)]
Move up AudioFlinger::createTrack and openRecord parameter checks
Perform the basic sample rate, format, and channel masks tests as
early as possible. Now the thread methods only need to do the thread
type-specific checks.
Change-Id: I57d8319a228dda0446ca9b3ddcb7c9f67f28238c
Marco Nelissen [Thu, 27 Feb 2014 21:20:07 +0000 (13:20 -0800)]
Don't crash on remote read error, just return
Change-Id: I35a2af255f55e008d64142ed0eceb6e83473d630
Derek Sollenberger [Thu, 27 Feb 2014 19:45:26 +0000 (19:45 +0000)]
Merge "Fix includes to no longer pull in Skia includes directories."
Derek Sollenberger [Thu, 27 Feb 2014 19:29:56 +0000 (14:29 -0500)]
Fix includes to no longer pull in Skia includes directories.
bug:
13225538
Change-Id: I4fccc414923f7e62cd46d691c67cb44b9692c225
Andy Hung [Thu, 27 Feb 2014 17:55:52 +0000 (17:55 +0000)]
Merge "Add Track Sink Format to AudioMixer"
Narayan Kamath [Thu, 27 Feb 2014 14:02:51 +0000 (14:02 +0000)]
am
d4c6052d: am
096d72a3: Merge "AArch64: Correction for LP64"
* commit '
d4c6052dd41dd5b942295cea5568783da7670eb4':
AArch64: Correction for LP64
Narayan Kamath [Thu, 27 Feb 2014 13:54:51 +0000 (13:54 +0000)]
am
096d72a3: Merge "AArch64: Correction for LP64"
* commit '
096d72a32824a0a8c86a716ba44d589183b2b0b3':
AArch64: Correction for LP64
Narayan Kamath [Thu, 27 Feb 2014 13:18:33 +0000 (13:18 +0000)]
Merge "AArch64: Correction for LP64"
Chong Zhang [Thu, 27 Feb 2014 04:49:34 +0000 (04:49 +0000)]
Merge "initialize encoder at start() time for camera source"
Andy McFadden [Wed, 26 Feb 2014 02:29:06 +0000 (18:29 -0800)]
Add frame dump output
This adds the ability to dump frames as RGB data with a minimal
frame header. Only recommended for devices with small displays.
Enable with "--output-format=frames".
The "--raw" option is now selected with "--output-format=h264".
Bug
13140019
Change-Id: I61bee55cea97db3134a91e7ea06106783e5bf340
Andy Hung [Tue, 25 Feb 2014 03:26:52 +0000 (19:26 -0800)]
Add Track Sink Format to AudioMixer
Track Sink Format now allows both AUDIO_FORMAT_PCM_FLOAT and
AUDIO_FORMAT_PCM_16_BIT (default). The float case is not
enabled now.
Change-Id: Ibee70cab4725c8bc9905e49f1f9a9c2448f76e00
Signed-off-by: Andy Hung <hunga@google.com>
Glenn Kasten [Wed, 26 Feb 2014 23:35:56 +0000 (23:35 +0000)]
Merge "Simplify error handling after track creation"
Glenn Kasten [Wed, 26 Feb 2014 22:56:56 +0000 (22:56 +0000)]
Merge "Move initialize of mInput to match AudioTrack"
Glenn Kasten [Wed, 26 Feb 2014 21:56:11 +0000 (21:56 +0000)]
Merge "Update comments to match AudioTrack"
Glenn Kasten [Wed, 26 Feb 2014 20:53:10 +0000 (20:53 +0000)]
Merge "Move initialization of mRefreshRemaining to match AudioTrack"
Ying Wang [Wed, 26 Feb 2014 19:35:43 +0000 (19:35 +0000)]
am
e0a76795: am
5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"
* commit '
e0a76795125a81471c408d4a23112e98ae2f0ae3':
Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH
Ying Wang [Wed, 26 Feb 2014 19:24:40 +0000 (19:24 +0000)]
am
5969b408: Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"
* commit '
5969b40858d2046aa2b8481926e34c4cb9062a4a':
Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH
Ying Wang [Wed, 26 Feb 2014 19:18:45 +0000 (19:18 +0000)]
Merge "Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH"
Ying Wang [Wed, 26 Feb 2014 19:07:24 +0000 (11:07 -0800)]
Use multilib-friendly LOCAL_MODULE_RELATIVE_PATH
Change-Id: Ifef0dd59ab317b1799fc899bb2e898bb09d2e5f6
Chong Zhang [Wed, 26 Feb 2014 05:56:07 +0000 (21:56 -0800)]
initialize encoder at start() time for camera source
Bug:
13156212
Change-Id: I845ef51f662f04c50179dbfb128204922a424e1d
Marcus Oakland [Mon, 17 Feb 2014 08:28:25 +0000 (08:28 +0000)]
AArch64: Correction for LP64
In the Intra16x16PlanePrediction function, a u32 (unsigned 32-bit
integer) was being used for the "i" variable, and being used with a
value of 7 in the loop "for (i = 0, b = 0; i < 8; i++)" to access the
"above[6-i]" location where "above" is defined as "u8 *". Because "i"
was unsigned there was no sign extension on use with the __LP64__
64-bit pointer, so rather than 0xFFFFFFFF being treated as -1, it was
treated as 4,292,967,295 and that resulted in a SIGSEGV at an invalid
address. By changing the type of "i" to an i32 (signed 32-bit integer)
the expected sign extension occurs and the value is treated as -1.
This change fixes android.media.cts.DecoderTest#testCodeBasicH264 on
64-bit platforms
Change-Id: I85df58b0dc1d39f89ab421d04ab5481356520f0c
Signed-off-by: Marcus Oakland <marcus.oakland@arm.com>
Glenn Kasten [Mon, 24 Feb 2014 23:21:10 +0000 (15:21 -0800)]
Simplify error handling after track creation
IAudioFlinger::createTrack and IAudioFlinger::openRecord
both guarantee that (status == OK) == (sp<> != 0).
Change-Id: I91cb4f7e843019efb65cace7ba146f7da7aa5b59
Glenn Kasten [Tue, 25 Feb 2014 23:15:53 +0000 (15:15 -0800)]
Move initialize of mInput to match AudioTrack
Change-Id: I4dc977f22f51cd618dc83d800b4b8756929a4612
Glenn Kasten [Tue, 25 Feb 2014 23:14:45 +0000 (15:14 -0800)]
Update comments to match AudioTrack
Change-Id: I7dd14eabd78c9130a157da2063a1d65ec4f9c65a
Glenn Kasten [Tue, 25 Feb 2014 23:13:37 +0000 (15:13 -0800)]
Move initialization of mRefreshRemaining to match AudioTrack
This also fixes a bug where, for a re-created IAudioRecord,
mRefreshRemaining was not being reset correctly.
Change-Id: I9f721a4edf92aab859cf3f247ab7f65562d14fb0
Glenn Kasten [Tue, 25 Feb 2014 22:58:02 +0000 (22:58 +0000)]
Merge "mAudioRecord is always non-0 if set() is successful"
Glenn Kasten [Tue, 25 Feb 2014 21:23:36 +0000 (21:23 +0000)]
Merge "Unify comments and whitespace between AudioTrack and AudioRecord"
Glenn Kasten [Tue, 25 Feb 2014 20:57:35 +0000 (20:57 +0000)]
Merge "Update channel fields at same place in AudioTrack and AudioRecord"
Glenn Kasten [Tue, 25 Feb 2014 19:54:58 +0000 (19:54 +0000)]
Merge "Update mReqFrameCount at same point in AudioTrack and AudioRecord"
Glenn Kasten [Tue, 25 Feb 2014 19:48:41 +0000 (19:48 +0000)]
am
ed773ea8: am
8fc4d57d: Merge "Avoid a building error"
* commit '
ed773ea8db3d4ea828f1220e234922a987fefb3b':
Avoid a building error