OSDN Git Service
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:23 +0000 (13:07 -0800)]
am
be9a7055: Merge "stagefright aacenc: Remove a stray semicolon"
* commit '
be9a705586edafcedc9fabb94d3259f882b7cbd7':
stagefright aacenc: Remove a stray semicolon
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:20 +0000 (13:07 -0800)]
am
fe5f5d77: Merge "stagefright amrwb: Make a global const array static"
* commit '
fe5f5d7728b7f8be24716fda6eb1480eb9dfb72f':
stagefright amrwb: Make a global const array static
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:16 +0000 (13:07 -0800)]
am
94ee1bf2: Merge "stagefright amrwbenc: Change keyword ordering"
* commit '
94ee1bf232d1f1cc97902dab1e4148eb478cd304':
stagefright amrwbenc: Change keyword ordering
Jean-Baptiste Queru [Mon, 27 Feb 2012 21:07:12 +0000 (13:07 -0800)]
am
5aff259c: Merge "stagefright aacenc: Don\'t address a Word32 with a Word16 pointer"
* commit '
5aff259c61e54e441ed04bf77e3cc69a0374432d':
stagefright aacenc: Don't address a Word32 with a Word16 pointer
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:09:58 +0000 (11:09 -0800)]
Merge "stagefright aacenc: Remove a stray semicolon"
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:08:08 +0000 (11:08 -0800)]
Merge "stagefright amrwb: Make a global const array static"
Jean-Baptiste Queru [Mon, 27 Feb 2012 19:06:24 +0000 (11:06 -0800)]
Merge "stagefright amrwbenc: Change keyword ordering"
Jean-Baptiste Queru [Mon, 27 Feb 2012 18:58:50 +0000 (10:58 -0800)]
Merge "stagefright aacenc: Don't address a Word32 with a Word16 pointer"
Martin Storsjo [Wed, 18 May 2011 09:25:42 +0000 (12:25 +0300)]
stagefright amrwb: Make a global const array static
This fixes compilation as C - while the source files are named
.cpp, they actually are compileable as pure C. Prior to this,
this table produced multiple definitions of the same symbol.
This was committed on the master branch of the opencore
repository in commit
a803bd49a631317e0d52ff060cf1799f7741a47e,
based on AOSP contribution 10017.
Change-Id: Id76274964242b119ab61b8181e557477df1e1521
Jean-Baptiste Queru [Fri, 24 Feb 2012 19:02:29 +0000 (11:02 -0800)]
am
6a300a54: Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
* commit '
6a300a5413898ff8b728e77c5a23290cae60e9b5':
stagefright aacenc: Make the bits to write in WriteBits unsigned
Martin Storsjo [Thu, 12 Jan 2012 12:28:30 +0000 (14:28 +0200)]
stagefright aacenc: Remove a stray semicolon
This avoids warnings about an empty body in an if statement.
mem_free does the same null check, so the accidental extra
semicolon was harmless, and the whole if statement actually
is needless. But if removing the if statements, all the
other ones should be removed too, for consistency.
(This could be done as a separate change).
Change-Id: I1b6064dedd15ffa949043bb5396148aaed9b43f6
Martin Storsjo [Thu, 12 Jan 2012 12:53:17 +0000 (14:53 +0200)]
stagefright amrwbenc: Change keyword ordering
This avoids warnings about 'static' not being at the beginning
of the declarations.
Change-Id: I80f91b8a0f7f61edcdca96c206fedbd74ec0d88e
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:28:00 +0000 (10:28 -0800)]
Merge "stagefright aacenc: Make the bits to write in WriteBits unsigned"
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:26:53 +0000 (10:26 -0800)]
am
d6a25154: Merge "stagefright aacenc: Fix an inline asm constraint"
* commit '
d6a25154d94c48ab2ef12641c789458ab14ca94f':
stagefright aacenc: Fix an inline asm constraint
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:24:34 +0000 (10:24 -0800)]
am
ea227787: Merge changes I903353c5,I822dcc74
* commit '
ea227787253e29da2d688399b097e05708d3bf73':
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:22:33 +0000 (10:22 -0800)]
Merge "stagefright aacenc: Fix an inline asm constraint"
Jean-Baptiste Queru [Fri, 24 Feb 2012 18:07:47 +0000 (10:07 -0800)]
Merge changes I903353c5,I822dcc74
* changes:
stagefright amrnb: Properly negate all values
stagefright amrnb: Fix a bug on architectures where long is 64 bit
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:54:58 +0000 (09:54 -0800)]
am
bf45bbf3: Merge "stagefright aacenc: Zero-initialize a struct"
* commit '
bf45bbf3b4a54976b81234ffc8ac41520bc052fc':
stagefright aacenc: Zero-initialize a struct
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:47:22 +0000 (09:47 -0800)]
Merge "stagefright aacenc: Zero-initialize a struct"
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:45:40 +0000 (09:45 -0800)]
am
e5bdd24b: Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
* commit '
e5bdd24b69c4033163d478d721247691e11cea36':
stagefright aacenc: Avoid warnings about incompatible pointer types
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:20:44 +0000 (09:20 -0800)]
am
47b56c5a: Merge "stagefright aacenc: Add const declarations to some pointers"
* commit '
47b56c5a46287ea226c05e3c0238a91f4702491a':
stagefright aacenc: Add const declarations to some pointers
Jean-Baptiste Queru [Fri, 24 Feb 2012 17:20:36 +0000 (09:20 -0800)]
Merge "stagefright aacenc: Avoid warnings about incompatible pointer types"
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:53:24 +0000 (08:53 -0800)]
Merge "stagefright aacenc: Add const declarations to some pointers"
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:50:32 +0000 (08:50 -0800)]
am
1b704610: Merge "stagefright aacenc: Fix inline asm"
* commit '
1b7046108c0f381fa8b7efaebae02c1a2b3099b3':
stagefright aacenc: Fix inline asm
Jean-Baptiste Queru [Fri, 24 Feb 2012 16:38:22 +0000 (08:38 -0800)]
Merge "stagefright aacenc: Fix inline asm"
Jean-Baptiste Queru [Fri, 24 Feb 2012 15:53:43 +0000 (07:53 -0800)]
am
bf1e85bf: Merge "stagefright aacenc: Fix inline asm constraints"
* commit '
bf1e85bfc8293646d57f0017afbfb0e09a1a41d7':
stagefright aacenc: Fix inline asm constraints
Jean-Baptiste Queru [Fri, 24 Feb 2012 15:39:02 +0000 (07:39 -0800)]
Merge "stagefright aacenc: Fix inline asm constraints"
The Android Open Source Project [Mon, 30 Jan 2012 21:36:34 +0000 (13:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic6454a4b7929bbf2f453022fd8ae596e215657c2
Martin Storsjo [Wed, 22 Dec 2010 21:33:03 +0000 (22:33 +0100)]
stagefright aacenc: Avoid warnings about incompatible pointer types
Change-Id: Ida53cd1030ebb9feb0d6916e42e8ba67a90e86c7
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 [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"
The Android Automerger [Tue, 24 Jan 2012 21:33:01 +0000 (13:33 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
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: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 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
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
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
The Android Open Source Project [Thu, 19 Jan 2012 21:06:50 +0000 (13:06 -0800)]
Reconcile with ics-mr1-release
Change-Id: I151eb9ed3a43b1576a15e15b343832c8f9e9509b
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)
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
Martin Storsjo [Wed, 22 Dec 2010 21:23:06 +0000 (22:23 +0100)]
stagefright aacenc: Add const declarations to some pointers
This avoids some compilation warnings.
Change-Id: Ia89ab94020a9f1ee4c1df48823fb89325cca7d36
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:25:09 +0000 (11:25 -0800)]
am
d75961ee: am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
d75961eecbfeb3f7e027a2a1f6011a26dd7d2d2d':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Jean-Baptiste Queru [Fri, 13 Jan 2012 19:22:08 +0000 (11:22 -0800)]
am
b4cee0f8: Merge "stagefright aacenc/amrwbenc: Remove trailing whitespace"
* commit '
b4cee0f871e0f5a2abd6c6f05b65710b69423f2c':
stagefright aacenc/amrwbenc: Remove trailing whitespace
Martin Storsjo [Thu, 12 Jan 2012 12:27:01 +0000 (14:27 +0200)]
stagefright aacenc: Properly terminate a comment
This avoids a warning about /* within a comment.
Change-Id: I9079909734d35db5ab0fd54b46173d7a1848d0c9
Martin Storsjo [Thu, 12 Jan 2012 12:25:29 +0000 (14:25 +0200)]
stagefright aacenc: Fix an inline asm constraint
Output-only parameters should use =r or =&r constrains, never +r.
This avoids a warning about the variable 'result' being used
uninitialized.
This avoids loading the uninitialized value into the register,
before it is overwritten by the multiplication.
Change-Id: I0ef6179e133c35d290feb8e12bea180ecae11a05
Mans Rullgard [Tue, 5 Apr 2011 14:42:38 +0000 (17:42 +0300)]
stagefright aacenc: Fix inline asm
- don't write input-only registers
- use temp variables instead of hardcoded regs
- don't build constants manually, specify as asm inputs
- remove unnecessary volatile qualifiers
Change-Id: I3b9bb2d30768bcf409dc478bde4489135eeb50d7
Mans Rullgard [Tue, 5 Apr 2011 14:42:16 +0000 (17:42 +0300)]
stagefright aacenc: Fix inline asm constraints
Output-only parameters should use =r or =&r constrains, never +r.
This fixes a lot of warnings about the variable 'result' being
used uninitialized.
Change-Id: Ie689fce8c6ecd874d4fc66e87687c67551d9ab6a
Martin Storsjo [Tue, 5 Apr 2011 14:33:25 +0000 (17:33 +0300)]
stagefright aacenc: Zero-initialize a struct
This avoids using uninitialized data in some cases, according
to valgrind.
Change-Id: I2eb5242b93c4d83a1cf6a15f022ec9579e0742a4
Martin Storsjo [Tue, 5 Apr 2011 14:35:49 +0000 (17:35 +0300)]
stagefright aacenc: Fix type definitions for 64 bit platforms
Also don't require LINUX to be defined, enable the MSVC typedefs
only within _MSC_VER.
This fixes a lot of warnings about dereferencing pointer 'winPtr'
breaking strict aliasing rules.
Change-Id: I4afbe0ed81295ebe6e5ee2c7f0fb0cc2dc83c89b
Martin Storsjo [Wed, 22 Dec 2010 21:39:18 +0000 (22:39 +0100)]
stagefright aacenc: Don't address a Word32 with a Word16 pointer
Currently, a pointer to a Word32 is used as a pointer to Word16, which
doesn't work as intended on big endian architectures.
This change needs to be analyzed and tested properly so that it doesn't
cause issues with overflows in these variables. Another solution would be
to change all the scf arrays to 32 bit instead.
Change-Id: I53d9eb83bdaf8d3b1530eb5064dd10b08bce737a
Martin Storsjo [Wed, 22 Dec 2010 21:09:51 +0000 (22:09 +0100)]
stagefright amrwbenc: Make the mem_malloc function 64-bit safe
Change-Id: Iab0dbfdc6be09c62d353bee46596635686b784a6
Martin Storsjo [Thu, 21 Apr 2011 09:58:34 +0000 (12:58 +0300)]
stagefright aacenc: Make the bits to write in WriteBits unsigned
They shouldn't, as far as I know, ever be a signed value.
Change-Id: I64429c7c0b2b52bec768a04d3c3eb0eb252955fa
Martin Storsjo [Wed, 31 Aug 2011 07:49:51 +0000 (10:49 +0300)]
stagefright aacenc: Add missing newlines at the end of files
This avoids compiler warnings about missing newlines.
Change-Id: Ieb2bb7152d794dca47c629588879032d3ba65677
The Android Open Source Project [Thu, 12 Jan 2012 16:56:17 +0000 (08:56 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie242914fa4cfdf35675bbd2777f0817186860526
Mans Rullgard [Tue, 5 Apr 2011 14:40:06 +0000 (17:40 +0300)]
stagefright aacenc/amrwbenc: Remove trailing whitespace
This was applied in AOSP master earlier, in commit
b21611e5b0f1797e39e781d91ade023bac87637f, but when merged
into the Google internal tree in
88c2d4d26d79384f32a25bd775cf873cb678b12a, none of these
changes have been brought in. (The diff of this merge commit
and its first parent,
d94b71d, is empty.)
Therefore, reapply the rest of these changes on the files
that still are present in the current version.
Change-Id: I645a9b9134769958a11808a06163123d28d83e46
The Android Automerger [Thu, 12 Jan 2012 00:29:04 +0000 (16:29 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Laurent [Wed, 11 Jan 2012 19:12:45 +0000 (11:12 -0800)]
am
c15cf3d2: Merge "stagefright: limit audio gap for looped playback" into ics-mr1
* commit '
c15cf3d286f3d63d141b73f639a5a61ddb028029':
stagefright: limit audio gap for looped playback
Eric Laurent [Mon, 9 Jan 2012 21:47:48 +0000 (13:47 -0800)]
stagefright: limit audio gap for looped playback
The audio gap when looping audio is mostly due to
a delay requested by the audio player when executing
the end of stream message. This is to allow the audio
to be drained out of the pipe before actually stopping the
AudioTrack.
This delay is not needed when looping as the AudioTrack
is not stopped.
The fix consists in ignoring the requested delay when the
looping flag is set in awesome player.
Issue
5800981.
Change-Id: Ib32d2930c53ecebc21ca8440e6e054c7e20db4a5
The Android Open Source Project [Sat, 7 Jan 2012 02:15:13 +0000 (18:15 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id0aeb30eb75c6c4aee7abbc9877aa5b16389778c
The Android Automerger [Sat, 7 Jan 2012 00:32:11 +0000 (16:32 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eino-Ville Talvala [Fri, 6 Jan 2012 23:49:17 +0000 (15:49 -0800)]
am
7944704e: Merge "Switch camera sounds to always use the system enforced audio stream." into ics-mr1
* commit '
7944704e6c4cc10105838b78d3d8403bf66a066b':
Switch camera sounds to always use the system enforced audio stream.
Eino-Ville Talvala [Thu, 5 Jan 2012 23:34:53 +0000 (15:34 -0800)]
Switch camera sounds to always use the system enforced audio stream.
Instead of picking between the music stream and the enforced audio
stream, change the camera service to always play sounds through
enforced system stream. Also update the currently-hidden CameraSound
API to match.
Bug:
5778365
Change-Id: I3cc64b1d1ff567dbac8020a665d5b19846197ff3
The Android Open Source Project [Thu, 5 Jan 2012 15:45:28 +0000 (07:45 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8a74c329fc7dd115e36d5180fab8e8680d6df4f8
The Android Automerger [Thu, 5 Jan 2012 00:42:23 +0000 (16:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Laurent [Wed, 4 Jan 2012 21:00:49 +0000 (13:00 -0800)]
am
fb578b6b: Merge "audioflinger: fix clicks on 48kHz audio." into ics-mr1
* commit '
fb578b6b88af51812b71a86ad4dd3a7de56e394b':
audioflinger: fix clicks on 48kHz audio.
Eric Laurent [Fri, 23 Dec 2011 00:08:41 +0000 (16:08 -0800)]
audioflinger: fix clicks on 48kHz audio.
The calculation done in prepareTracks_l() for the minimum amount
off frames needed to mix one output buffer had 2 issues:
- the additional sample needed for interpolation was not included
- the fact that the resampler does not acknowledge the frames consumed
immediately after each mixing round but only once all frames requested have been used
was not taken into account.
Thus the number of frames available in track buffer could be considered sufficient although
it was not and the resampler would abort producing a short silence perceived as a click.
Issue
5727099.
Change-Id: I7419847a7474c7d9f9170bedd0a636132262142c
The Android Open Source Project [Tue, 20 Dec 2011 21:08:33 +0000 (13:08 -0800)]
Reconcile with ics-mr1-release
Change-Id: I123bd5ae61ab8c4f6de1a6640faf0bab89f6aa78
The Android Automerger [Fri, 16 Dec 2011 20:01:35 +0000 (12:01 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Fri, 16 Dec 2011 16:08:07 +0000 (08:08 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib2cbd92ed2d3567e22921b66ca2202a968fdd0da
Jamie Gennis [Fri, 16 Dec 2011 02:14:05 +0000 (18:14 -0800)]
SurfaceMediaSource: use the HW_TEXTURE usage bit
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a
temporary workaround for what is likely a Gralloc bug.
Bug:
5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
The Android Automerger [Fri, 16 Dec 2011 04:50:02 +0000 (20:50 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jamie Gennis [Fri, 16 Dec 2011 02:14:05 +0000 (18:14 -0800)]
SurfaceMediaSource: use the HW_TEXTURE usage bit
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a
temporary workaround for what is likely a Gralloc bug.
Bug:
5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
Dave Burke [Fri, 16 Dec 2011 03:25:07 +0000 (19:25 -0800)]
am
ac279de9: Merge "SurfaceMediaSource: use the HW_TEXTURE usage bit" into ics-mr1
* commit '
ac279de9d9fcfd59a336298cfdd5b1f4ab6d038f':
SurfaceMediaSource: use the HW_TEXTURE usage bit
Jamie Gennis [Fri, 16 Dec 2011 02:14:05 +0000 (18:14 -0800)]
SurfaceMediaSource: use the HW_TEXTURE usage bit
This change makes SurfaceMediaSource request Gralloc buffers with the
HW_TEXTURE usage bit rather than the VIDEO_ENCODER bit. It is a
temporary workaround for what is likely a Gralloc bug.
Bug:
5771063
Change-Id: I9cce615e80fc14a1644fae27ba06970c262dd179
The Android Automerger [Thu, 15 Dec 2011 06:14:25 +0000 (22:14 -0800)]
merge in ics-mr1-release history after reset to ics-mr1