OSDN Git Service
Glenn Kasten [Fri, 27 Jan 2012 15:22:30 +0000 (07:22 -0800)]
Merge "AudioStreamIn and AudioStreamOut"
Glenn Kasten [Fri, 27 Jan 2012 15:19:53 +0000 (07:19 -0800)]
Merge "Declare methods in binder opcode order"
Glenn Kasten [Fri, 27 Jan 2012 15:19:10 +0000 (07:19 -0800)]
Merge "Use enum effect_state consistently"
Glenn Kasten [Fri, 27 Jan 2012 15:18:23 +0000 (07:18 -0800)]
Merge "Use enum track_state consistently"
Glenn Kasten [Fri, 27 Jan 2012 15:16:46 +0000 (07:16 -0800)]
Merge "Use enum mixer_state consistently"
Andreas Huber [Fri, 27 Jan 2012 00:00:38 +0000 (16:00 -0800)]
Merge "The software AAC encoder is now an OMX component."
Glenn Kasten [Thu, 26 Jan 2012 17:46:34 +0000 (09:46 -0800)]
AudioStreamIn and AudioStreamOut
These are immutable, so make the fields const.
getOutput() and getInput() methods are now const.
Change-Id: I128246ebd56ea50b3e542be43f2aa1bcb55f1373
Andreas Huber [Thu, 26 Jan 2012 22:39:50 +0000 (14:39 -0800)]
The software AAC encoder is now an OMX component.
Yay.
Change-Id: I74938a20b4e0a622836ea5184d3761180eb0f5de
Glenn Kasten [Thu, 26 Jan 2012 21:40:12 +0000 (13:40 -0800)]
Declare methods in binder opcode order
This makes it easier to compare interface and implementation.
Change-Id: Ie060e43dec348902abcf40f5a610cec639d6d0d3
Glenn Kasten [Thu, 26 Jan 2012 21:37:52 +0000 (13:37 -0800)]
Use enum mixer_state consistently
Change-Id: I5b71ed20f939dfc4b98143334b7aa064d282f584
Glenn Kasten [Thu, 26 Jan 2012 21:43:46 +0000 (13:43 -0800)]
Use enum effect_state consistently
Also fix indentation
Change-Id: I393ef9e37ffceed5ad4a78df439726ae1fe139df
Glenn Kasten [Thu, 26 Jan 2012 21:39:18 +0000 (13:39 -0800)]
Use enum track_state consistently
Change-Id: Ie5ebb7befa092e1de1e4df9c6e2d51e6bcfd176a
Ben Cheng [Wed, 25 Jan 2012 21:42:42 +0000 (13:42 -0800)]
Preserve NEON callee-save registers d8-d15.
BUG:
5918479
Change-Id: I574bd5845d9e7e007c637aabbf170d03217d10ad
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:33:42 +0000 (10:33 -0800)]
am
95306d85: am
64085d03: am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
95306d85005f165e10a25ad45cadadec6e1f6a31':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:30:31 +0000 (10:30 -0800)]
am
64085d03: am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
64085d03efcd2abf3b8cd64f4e6344a1ece014c3':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Baptiste Queru [Wed, 25 Jan 2012 18:27:41 +0000 (10:27 -0800)]
am
12045502: Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
* commit '
12045502c49bfee40d7d3cb806d9b70d3b5d3ed3':
stagefright aacenc: Fix type definitions for 64 bit platforms
Jean-Baptiste Queru [Wed, 25 Jan 2012 17:17:45 +0000 (09:17 -0800)]
Merge "stagefright aacenc: Fix type definitions for 64 bit platforms"
Jean-Baptiste Queru [Wed, 25 Jan 2012 16:57:36 +0000 (08:57 -0800)]
am
e2594b85: am
4cd2b343: am
98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '
e2594b85093441e03150c7cfc540abc626884eaf':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Jean-Baptiste Queru [Wed, 25 Jan 2012 16:57:32 +0000 (08:57 -0800)]
am
a3946104: am
fc2ea24b: am
d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit '
a39461047eae6022e2c0ef873ffa2c7241b393a9':
stagefright aacenc: Add missing newlines at the end of files
Eric Laurent [Wed, 25 Jan 2012 16:57:23 +0000 (08:57 -0800)]
am
535b0264: am
7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
* commit '
535b0264a4cfa790e549bd9cd09980788f1375f4':
AudioFlinger: refine mixer sleep time logic
Eric Laurent [Wed, 25 Jan 2012 16:57:20 +0000 (08:57 -0800)]
am
dd347d51: (-s ours) am
41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '
dd347d515d4a4e42b2aba89a8e471392026b7824':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:15:36 +0000 (15:15 -0800)]
am
4cd2b343: am
98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '
4cd2b343272429adae1fc68e0ec0628c69e88e6d':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:15:33 +0000 (15:15 -0800)]
am
fc2ea24b: am
d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit '
fc2ea24b024f7a015d67054adb7bb09ff3a0a97b':
stagefright aacenc: Add missing newlines at the end of files
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:13:45 +0000 (15:13 -0800)]
am
98539a4e: Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
* commit '
98539a4eba7677c0b1ddc12f800c7075851ef302':
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Jean-Baptiste Queru [Tue, 24 Jan 2012 23:13:42 +0000 (15:13 -0800)]
am
d80cbb8c: Merge "stagefright aacenc: Add missing newlines at the end of files"
* commit '
d80cbb8c7b13203704c00e2f5941588811c15665':
stagefright aacenc: Add missing newlines at the end of files
Jean-Baptiste Queru [Tue, 24 Jan 2012 22:26:30 +0000 (14:26 -0800)]
Merge "stagefright amrwbenc: Make the mem_malloc function 64-bit safe"
Eric Laurent [Tue, 24 Jan 2012 19:51:50 +0000 (11:51 -0800)]
am
7eeaf3f0: Merge "AudioFlinger: refine mixer sleep time logic" into ics-mr1
* commit '
7eeaf3f07aa6fb10639d9f96c1367eb98c3e8839':
AudioFlinger: refine mixer sleep time logic
Eric Laurent [Tue, 24 Jan 2012 19:51:47 +0000 (11:51 -0800)]
am
41773d46: Merge "DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""" into ics-mr1
* commit '
41773d46556aa47d4322ff89fdaf7d1345c2d1f2':
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
Jean-Baptiste Queru [Tue, 24 Jan 2012 18:34:24 +0000 (10:34 -0800)]
Merge "stagefright aacenc: Add missing newlines at the end of files"
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:46:26 +0000 (08:46 -0800)]
am
10c4641c: am
2ae5805c: am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
10c4641c2e2f747f8fef7d217d550b7f9a6de588':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:43:14 +0000 (08:43 -0800)]
am
2ae5805c: am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
2ae5805cf18ad6bdbea5def03a488e14c1a8804c':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 16:40:50 +0000 (08:40 -0800)]
am
164a9842: Merge "stagefright aacenc: Properly terminate a comment"
* commit '
164a984224f5d430757628028f2522329987350f':
stagefright aacenc: Properly terminate a comment
Jean-Baptiste Queru [Tue, 24 Jan 2012 15:51:11 +0000 (07:51 -0800)]
Merge "stagefright aacenc: Properly terminate a comment"
Eric Laurent [Tue, 24 Jan 2012 02:56:59 +0000 (18:56 -0800)]
AudioFlinger: refine mixer sleep time logic
When an AudioTrack is in underrun state, the AudioFlinger mixer will
sleep for a short period of time to give the app a chance to fill the
AudioTrack buffer. If the AudioTrack is still not ready during next mixing round,
the mixer will proceed with other tracks.
If an application keeps a steady underrun condition, the AudioFlinger mixer will
alternate between ready and not ready states. In the longer term this will cause the
audio HAL to underrun.
There is a mechanism to reduce the sleep period if the mixer is not ready several times in a
row but this mechanism is defeated by the alternating ready/not ready conditions.
The fix consists in only increasing sleep time if the mixer is ready for at least two
consecutive times.
Issue
5904527.
Change-Id: Id0139bca9be8c4e425ec6d428515c4d8f718e8c9
Eric Laurent [Tue, 24 Jan 2012 02:35:10 +0000 (18:35 -0800)]
DO NOT MERGE Revert "Revert "AudioFlinger: mix track only when really ready (2)""
This reverts commit
b918035d34422a2041b6ec8c09c566bb93345b40.
Change-Id: I093bcfa56ad54a080b930208b6b79169d33581fb
Justin Ho [Mon, 23 Jan 2012 23:16:00 +0000 (15:16 -0800)]
am
feb1d988: (-s ours) am
fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit '
feb1d988c8ea1a67a4edbf1914ea41ea73519e12':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
Justin Ho [Mon, 23 Jan 2012 23:13:19 +0000 (15:13 -0800)]
am
fee5a860: Merge "DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"" into ics-mr1
* commit '
fee5a860a8355cda071ff23644e943414ba7f65d':
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
Justin Ho [Mon, 23 Jan 2012 22:01:15 +0000 (14:01 -0800)]
DO NOT MERGE Revert "AudioFlinger: mix track only when really ready (2)"
This reverts commit
71c4496a9757438afd30b4404824f296f6158a49.
Change-Id: Iff10c49ea728bb10023ddeb50a3b708db770fff2
Glenn Kasten [Sat, 21 Jan 2012 01:16:36 +0000 (17:16 -0800)]
Merge "Remove AudioFlinger dependencies on client"
Glenn Kasten [Sat, 21 Jan 2012 01:00:00 +0000 (17:00 -0800)]
Remove AudioFlinger dependencies on client
Change-Id: Ibb591e41a3ca5d7015e2b66b98b8fef5f415fb37
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:37:52 +0000 (16:37 -0800)]
am
ee567e08: am
c3c36b4f: am
9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '
ee567e08d973c0fad214889e8d980f9bfb535b34':
Rename LOG_ASSERT to ALOG_ASSERT
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:37:49 +0000 (16:37 -0800)]
am
45470559: (-s ours) am
12b7da69: am
6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '
45470559cd4a499fd5d38cf708f0b531dc081fed':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:35:20 +0000 (16:35 -0800)]
am
db2b3930: (-s ours) am
f3f650db: am
a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit '
db2b39300a8f763cf2d0c9808deb86db87d5492c':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:32:45 +0000 (16:32 -0800)]
am
dde686e2: (-s ours) am
08d3c6e5: am
4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '
dde686e2bdf7ea679dae4fd4edbf94c71802dc28':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:30:21 +0000 (16:30 -0800)]
am
a1e87397: (-s ours) am
7ae84204: am
ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit '
a1e873975704814416ee4d5023bf0740ec195ec0':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Jean-Baptiste Queru [Sat, 21 Jan 2012 00:28:04 +0000 (16:28 -0800)]
am
d6b5584b: (-s ours) am
97aa8ee8: Merge
ee4618bc
* commit '
d6b5584b67f8a2f3d8ea20d748652673d5761e33':
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
The Android Open Source Project [Fri, 20 Jan 2012 23:52:27 +0000 (15:52 -0800)]
am
5d0c713a: Reconcile with ics-mr1-release
* commit '
5d0c713a87e9fd3cc7a775092aef9fc1194c7440':
Glenn Kasten [Fri, 20 Jan 2012 23:06:01 +0000 (15:06 -0800)]
Merge "Fix warning for redundant typedef"
Glenn Kasten [Thu, 12 Jan 2012 20:27:51 +0000 (12:27 -0800)]
Use audio_format_t consistently, continued
Was int or uint32_t.
When AudioFlinger::format can't determine the correct format,
return INVALID rather than DEFAULT.
Init mFormat to INVALID rather than DEFAULT in the constructor.
Subclass constructors will set mFormat to the correct value.
Change-Id: I9b62640aa107d24d2d27925f5563d0d7407d1b73
Eino-Ville Talvala [Fri, 20 Jan 2012 22:32:22 +0000 (14:32 -0800)]
Merge "Add ANativeWindow timestamp support to camera service."
Andreas Huber [Fri, 20 Jan 2012 21:43:39 +0000 (13:43 -0800)]
Merge "Starhub RTSP apparently does not establish time on all tracks"
Andreas Huber [Fri, 20 Jan 2012 21:30:03 +0000 (13:30 -0800)]
Starhub RTSP apparently does not establish time on all tracks
i.e. the "SR" RTCP packet is sent for only one of the two tracks.
fake timestamps if that's the case, previously we'd only fake timestamps
if we didn't receive _any_ "SR" packets.
Change-Id: Id63d4940d453ba6c04c62e02ab9a0ad843936bc1
related-to-bug:
5669027
Glenn Kasten [Fri, 20 Jan 2012 20:16:06 +0000 (12:16 -0800)]
Merge "Fix typos in string constants"
Glenn Kasten [Fri, 20 Jan 2012 20:15:38 +0000 (12:15 -0800)]
Merge "Remove dead file include/media/thread_init.h"
Glenn Kasten [Fri, 20 Jan 2012 20:14:32 +0000 (12:14 -0800)]
Merge "Remove redundant get()"
Glenn Kasten [Fri, 20 Jan 2012 19:49:04 +0000 (11:49 -0800)]
Merge "Move memcpy_to_i16_from_u8 to audio_utils"
Glenn Kasten [Tue, 10 Jan 2012 18:46:34 +0000 (10:46 -0800)]
Remove redundant get()
get() is almost always unnecessary, except in a LOG.
Also no need to check for != 0 before calling get().
Change-Id: Ib06e7a503f86cf102f09acc1ffb2ad085025516d
Glenn Kasten [Fri, 20 Jan 2012 19:11:08 +0000 (11:11 -0800)]
Fix warning for redundant typedef
frameworks/base/media/libmedia/autodetect.cpp:22: warning: 'typedef' was ignored in this declaration
Change-Id: I8c7404b9f5aa515c0fe92a5a46f24248d6fe96bf
Glenn Kasten [Fri, 20 Jan 2012 18:07:06 +0000 (10:07 -0800)]
Merge "Remove dead setRingerMode(mode, mask)"
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:26:16 +0000 (17:26 -0800)]
am
9d25b82d: Merge "Rename LOG_ASSERT to ALOG_ASSERT"
* commit '
9d25b82d280c2d979d500e7da4447148f32f820b':
Rename LOG_ASSERT to ALOG_ASSERT
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:26:12 +0000 (17:26 -0800)]
am
6df477be: Merge "Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)"
* commit '
6df477be186233e36fc370c4d2db6c1ed928a740':
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:26:08 +0000 (17:26 -0800)]
am
a826f9e2: Merge "Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)"
* commit '
a826f9e2c4f6329d8d48c927f6e942e78ffaf92f':
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:26:03 +0000 (17:26 -0800)]
am
4f367f33: Merge "Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)"
* commit '
4f367f3387887c538c81c34cc8becaea6fa5e430':
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:25:58 +0000 (17:25 -0800)]
am
ba7f0d2a: Merge "Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)"
* commit '
ba7f0d2a03643ce429421b81febf18fd50473070':
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Jean-Baptiste Queru [Fri, 20 Jan 2012 01:18:25 +0000 (17:18 -0800)]
Merge
ee4618bc
Change-Id: Ie1dc6ad38e7c30636d80f6caef11cf6673144940
Steve Block [Mon, 9 Jan 2012 18:35:44 +0000 (18:35 +0000)]
Rename LOG_ASSERT to ALOG_ASSERT
Change-Id: Ie2c7ea6560656d65bad791a61996174c75677517
Steve Block [Fri, 6 Jan 2012 19:20:56 +0000 (19:20 +0000)]
Rename (IF_)LOGE(_IF) to (IF_)ALOGE(_IF)
Change-Id: I1de629b4632a4b3187ca1a28d6416daccd35f924
Steve Block [Thu, 5 Jan 2012 23:22:43 +0000 (23:22 +0000)]
Rename (IF_)LOGW(_IF) to (IF_)ALOGW(_IF)
Change-Id: I8fbdfa7a7581f481968dbb65aa40f7042936d7cb
Steve Block [Wed, 4 Jan 2012 20:05:49 +0000 (20:05 +0000)]
Rename (IF_)LOGI(_IF) to (IF_)ALOGI(_IF)
Change-Id: I26f76452ac49e2890b14d133c065493d8df0fb4a
Steve Block [Tue, 20 Dec 2011 16:23:08 +0000 (16:23 +0000)]
Rename (IF_)LOGD(_IF) to (IF_)ALOGD(_IF)
Change-Id: I44f267700356967dc51e8f85ebf457dc85cfb229
Steve Block [Thu, 20 Oct 2011 10:56:00 +0000 (11:56 +0100)]
Rename (IF_)LOGV(_IF) to (IF_)ALOGV(_IF)
Change-Id: I5321ebd12e9c6248a108529e82c4e1af2a4405e3
Andreas Huber [Thu, 19 Jan 2012 22:40:44 +0000 (14:40 -0800)]
Merge "Make sure the ThrottledSource reports the proper mime type"
Andreas Huber [Thu, 19 Jan 2012 22:17:49 +0000 (14:17 -0800)]
Make sure the ThrottledSource reports the proper mime type
of the underlying source.
Change-Id: I7cfd5c9f10d4b07781ed82fbdc9bf3db2e86cf84
The Android Open Source Project [Thu, 19 Jan 2012 21:06:50 +0000 (13:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b
Glenn Kasten [Thu, 19 Jan 2012 18:13:52 +0000 (10:13 -0800)]
Remove dead file include/media/thread_init.h
Change-Id: I98688bb7109b5f82953988935c7c33fe3c7f4ec0
Eric Laurent [Thu, 19 Jan 2012 18:00:02 +0000 (10:00 -0800)]
resolved conflicts for merge of
05683c85 to master
Change-Id: I7846b7da8c5813b7a9b1f3f71aede0229689ff0d
Glenn Kasten [Thu, 19 Jan 2012 16:14:08 +0000 (08:14 -0800)]
Fix typos in string constants
These were copy/paste errors in code that was copied from AudioTrack.
Change-Id: I64a04d6026667884ddb1fefba67a71d69c691d62
Glenn Kasten [Thu, 19 Jan 2012 14:10:37 +0000 (06:10 -0800)]
Merge "Fix incorrect includes of AudioTrack.h"
Glenn Kasten [Thu, 19 Jan 2012 14:09:20 +0000 (06:09 -0800)]
Merge "Simplify range check for audio_mode_t (continued)"
Glenn Kasten [Thu, 19 Jan 2012 14:09:05 +0000 (06:09 -0800)]
Merge "Add units to time periods"
Glenn Kasten [Thu, 19 Jan 2012 14:08:53 +0000 (06:08 -0800)]
Merge "Use const const strings for arrays and pointers to strings"
Glenn Kasten [Thu, 19 Jan 2012 14:08:40 +0000 (06:08 -0800)]
Merge "For booleans, use ! instead of == false"
The Android Automerger [Thu, 19 Jan 2012 05:17:55 +0000 (21:17 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Laurent [Thu, 19 Jan 2012 00:08:06 +0000 (16:08 -0800)]
am
db2e7163: Merge "AudioFlinger: mix track only when really ready (2)" into ics-mr1
* commit '
db2e71635968f455ad4f41b2e24fb8b909c24ca0':
AudioFlinger: mix track only when really ready (2)
Glenn Kasten [Wed, 18 Jan 2012 22:54:46 +0000 (14:54 -0800)]
Fix incorrect includes of AudioTrack.h
Remove unnecessary includes of AudioTrack.h.
Use forward declaration of class names in preference to #include when possible.
Change-Id: I12982811fa75c2c7695d8bbfa595a7aaec047dc0
Glenn Kasten [Wed, 18 Jan 2012 22:58:32 +0000 (14:58 -0800)]
Simplify range check for audio_mode_t (continued)
Missed one place in earlier CL of same name
Change-Id: I0dd25364d0b8d5d731c02d352f139a0c8d4df1a8
Glenn Kasten [Mon, 9 Jan 2012 16:33:38 +0000 (08:33 -0800)]
Add units to time periods
Change-Id: Ib980e2676cecf5d9b0c2e388da6dc8e370df8abb
Glenn Kasten [Mon, 9 Jan 2012 16:41:22 +0000 (08:41 -0800)]
Use const const strings for arrays and pointers to strings
Change-Id: I0a073e17ebf6ad59e7edbedac104c6fa4bcaf9c9
Glenn Kasten [Fri, 13 Jan 2012 23:54:24 +0000 (15:54 -0800)]
For booleans, use ! instead of == false
Change-Id: Ibc115936d2d0b0b7744ebe9b52839ea5b42c4edd
Glenn Kasten [Wed, 18 Jan 2012 22:56:06 +0000 (14:56 -0800)]
Remove dead setRingerMode(mode, mask)
Change-Id: Ia4cc8be8424a40b3dcb7ebd0264fdff4e5247f7f
Eric Laurent [Wed, 18 Jan 2012 03:20:12 +0000 (19:20 -0800)]
AudioFlinger: mix track only when really ready (2)
This problem due to the way audio buffers are mixed when
low power mode is active was addressed by commits
19ddf0eb
and
8a04fe03 but only partially. As a matter of fact, when more
than one audio track is playing, the problem is still present.
This is most noticeable when playing music with screen off
and a notification or navigation instruction is played: in this case,
the music or notification is likely to skip.
The fix consists in declaring the mixer ready if all active tracks
are ready. Previous behavior was to declare ready if at least one track was
ready. To avoid that one application failing to fill the track buffer blocks other
tracks indefinitely, this condition is respected only if the mixer was ready
in the previous round.
Issue
5799167.
Change-Id: Iabd4ca08d3d45f563d9824c8a03c2c68a43ae179
Andreas Huber [Wed, 18 Jan 2012 19:01:00 +0000 (11:01 -0800)]
Merge "Temporarily restore AudioSystem/AudioTrack APIs with their former signatures"
Andreas Huber [Wed, 18 Jan 2012 18:51:55 +0000 (10:51 -0800)]
Temporarily restore AudioSystem/AudioTrack APIs with their former signatures
until we get updated prebuilts from vendor.
Change-Id: I8aae81d2513edca0ab268053a11c8c4206879e61
Andreas Huber [Wed, 18 Jan 2012 17:29:56 +0000 (09:29 -0800)]
Merge "AVIExtractor: adding a H264 fourCC which is also specified in the reference. (H264 code can be found avi file which is encoded with FFmpeg.)"
Bryan Mawhinney [Wed, 18 Jan 2012 16:58:19 +0000 (08:58 -0800)]
Merge "Make sure seek triggers a reconnect if needed."
Glenn Kasten [Wed, 18 Jan 2012 15:46:18 +0000 (07:46 -0800)]
Merge "Track volume cleanup"
Bryan Mawhinney [Wed, 18 Jan 2012 13:40:07 +0000 (13:40 +0000)]
Make sure seek triggers a reconnect if needed.
Previously, if we had disconnected at the high watermark,
the read immediately following a seek would fail, and would
not be retried, resulting in an error.
Change-Id: I45a53563fe17d6b54893815abc7750a7dfb0a124
Eric Laurent [Wed, 18 Jan 2012 01:35:03 +0000 (17:35 -0800)]
Merge "audio framework: manage stream volume per device"
Glenn Kasten [Tue, 17 Jan 2012 20:20:54 +0000 (12:20 -0800)]
Track volume cleanup
Always read and write track volumes atomically. In most places this was
already being done, but there were a couple places where the left and
right channels were read independently.
Changed constant MAX_GAIN_INT to be a uint32_t instead of a float.
It is always used as a uint32_t in comparisons and assignments.
Use MAX_GAIN_INT in more places.
Now that volume is always accessed atomically, removed the union
and alias for uint16_t volume[2], and kept only volumeLR.
Removed volatile as it's meaningless.
In AudioFlinger, clamp the track volumes read from shared memory
before applying master and stream volume.
Change-Id: If65e2b27e5bc3db5bf75540479843041b58433f0
Glenn Kasten [Wed, 11 Jan 2012 17:52:19 +0000 (09:52 -0800)]
Move memcpy_to_i16_from_u8 to audio_utils
This will make it easier for this kind of code to be optimized
for each target architecture.
Change-Id: I9efd27d6c0175b00b9a784353244805cec63c0b8