OSDN Git Service
The Android Open Source Project [Thu, 15 Dec 2011 00:08:46 +0000 (16:08 -0800)]
am
b14436d0: Reconcile with ics-mr1-release
* commit '
b14436d0700f6e837e4d6066ddcf672c61d7f033':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
The Android Open Source Project [Thu, 15 Dec 2011 00:05:32 +0000 (16:05 -0800)]
Reconcile with ics-mr1-release
Change-Id: I1b745b11729a3fda14ffe44f1f44854e087318c7
James Dong [Wed, 14 Dec 2011 18:57:05 +0000 (10:57 -0800)]
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck
1. Revert "Fix drm flag setting missed in false drm recognition fix."
This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
2. Revert "Fixed the false drm recognition."
This reverts commit
aadbd80b307c817698ce5110ff8e002804d1b230.
3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones"
This reverts commit
a5cbf023e349f2394ba6fc58d73b4375cfec4369.
4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."
This reverts commit
d0d19db1ca1c289b069db33f4665bcb9386064e9.
As a result of the reverting, many ANRs from WV sniffing are back.
related-to-bug:
5739618
Glenn Kasten [Wed, 14 Dec 2011 23:40:43 +0000 (15:40 -0800)]
Merge "Remove unnecessary this->"
Glenn Kasten [Wed, 14 Dec 2011 23:40:35 +0000 (15:40 -0800)]
Merge "Use const char correctly in AudioFlinger"
Glenn Kasten [Wed, 14 Dec 2011 23:40:27 +0000 (15:40 -0800)]
Merge "Use units after all times"
Glenn Kasten [Wed, 14 Dec 2011 23:40:11 +0000 (15:40 -0800)]
Merge "Delete obsolete includes"
Glenn Kasten [Wed, 14 Dec 2011 23:40:01 +0000 (15:40 -0800)]
Merge "Remove redundant clear()"
Glenn Kasten [Wed, 14 Dec 2011 23:39:52 +0000 (15:39 -0800)]
Merge "Fix includes"
Glenn Kasten [Wed, 14 Dec 2011 23:05:56 +0000 (15:05 -0800)]
Merge "AudioTrack::setVolume check range"
James Dong [Wed, 14 Dec 2011 21:53:31 +0000 (13:53 -0800)]
am
3f6a7d1e: am
d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
* commit '
3f6a7d1ee961a4544563932b7499535dc1cac1ec':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
James Dong [Wed, 14 Dec 2011 21:50:08 +0000 (13:50 -0800)]
am
d70c64db: Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
* commit '
d70c64db9f67dbe8f888de6b1bdcc835226ec526':
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck 1. Revert "Fix drm flag setting missed in false drm recognition fix." This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
Glenn Kasten [Fri, 8 Jul 2011 16:34:50 +0000 (09:34 -0700)]
Fix includes
Remove unused #include dlfcn.h
Add #include String8.h
Forward class declaration is only for references and pointers.
In this case, we need the full class declaration,
and were incorrectly depending on another header file to do it.
Change-Id: Iff65cceb3982698cc1ebaeec405695fc190c03ff
Glenn Kasten [Tue, 13 Dec 2011 19:23:47 +0000 (11:23 -0800)]
Remove redundant clear()
Change-Id: Ie5e4e63cbc8fa85ef50451dddf8f149fa864b132
Glenn Kasten [Mon, 12 Dec 2011 17:04:45 +0000 (09:04 -0800)]
Use const char correctly in AudioFlinger
Use const char [] instead of const char * to eliminate unnecessary pointer.
Make the array audio_interfaces also const, in addition to the strings.
Change-Id: I31f33d1dcb9a657ee136f4280fd2d46492496831
Glenn Kasten [Tue, 13 Dec 2011 19:45:07 +0000 (11:45 -0800)]
Remove unnecessary this->
Change-Id: I72038f5d4568f0633d3e4ab90f4b67e2dd22c332
Glenn Kasten [Wed, 30 Nov 2011 17:46:04 +0000 (09:46 -0800)]
AudioTrack::setVolume check range
Change-Id: Ie182bf0f741f1f49f68c02a1e7437a2a34d34fc5
James Dong [Wed, 14 Dec 2011 18:57:05 +0000 (10:57 -0800)]
Revert the following patches because they may lead to power regression because SHA/MD5 module is stuck
1. Revert "Fix drm flag setting missed in false drm recognition fix."
This reverts commit
9f704f6c46a171357e49c411c83458b9d4565f3b.
2. Revert "Fixed the false drm recognition."
This reverts commit
aadbd80b307c817698ce5110ff8e002804d1b230.
3. Revert "Fix drm enumeration order, resolves failure to play forward lock ringtones"
This reverts commit
a5cbf023e349f2394ba6fc58d73b4375cfec4369.
4. Revert "Fix ANRs due to Widevine DRM plugin sniff taking too long."
This reverts commit
d0d19db1ca1c289b069db33f4665bcb9386064e9.
As a result of the reverting, many ANRs from WV sniffing are back.
related-to-bug:
5739618
Glenn Kasten [Tue, 13 Dec 2011 19:04:14 +0000 (11:04 -0800)]
Use units after all times
Change-Id: I48d3f29c37228b5d03189e4c9600824c9360cac9
The Android Open Source Project [Wed, 14 Dec 2011 03:13:18 +0000 (19:13 -0800)]
am
16bdd1e6: Reconcile with ics-mr1-release
* commit '
16bdd1e65ef19379bbede40c38de2e9f816ba35b':
The Android Open Source Project [Wed, 14 Dec 2011 03:10:19 +0000 (19:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I27a7b110d3c376fd3b90b29d028b6678507955a8
The Android Automerger [Wed, 14 Dec 2011 00:03:26 +0000 (16:03 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Andreas Huber [Tue, 13 Dec 2011 20:04:35 +0000 (12:04 -0800)]
am
22e50edd: (-s ours) am
3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
* commit '
22e50edddc2a13fa9cc00f7cc5a5f6471cbece24':
DO NOT MERGE: Support for parsing of "folded" RTSP header values
Andreas Huber [Tue, 13 Dec 2011 20:01:46 +0000 (12:01 -0800)]
am
3ab63008: Merge "DO NOT MERGE: Support for parsing of "folded" RTSP header values" into ics-mr1
* commit '
3ab630084071eb5dc7f92b4a8a617f8cef10c514':
DO NOT MERGE: Support for parsing of "folded" RTSP header values
Andreas Huber [Fri, 9 Dec 2011 23:09:56 +0000 (15:09 -0800)]
DO NOT MERGE: Support for parsing of "folded" RTSP header values
and some tweaks to the AMR assembler contributed by Samsung (untested).
Change-Id: I6c3df31fa3a35433bfddfdda82747bb4c6ee86a1
related-to-bug:
5669027
The Android Open Source Project [Tue, 13 Dec 2011 13:40:57 +0000 (05:40 -0800)]
am
da296533: Reconcile with ics-mr1-release
* commit '
da29653305f299d6390492333a6360cfa78665d9':
The Android Open Source Project [Tue, 13 Dec 2011 13:11:43 +0000 (05:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: I96fd9c00680c7ff0e5c9fba04f8c08a31cf1cfa8
The Android Automerger [Tue, 13 Dec 2011 06:08:59 +0000 (22:08 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Mon, 12 Dec 2011 23:39:19 +0000 (15:39 -0800)]
am
40375099: Reconcile with ics-mr1-release
* commit '
40375099d10139b6c96c1db8b8295874d60c712e':
The Android Open Source Project [Mon, 12 Dec 2011 23:39:17 +0000 (15:39 -0800)]
am
f14dc291: Merge from ics-mr1
* commit '
f14dc29104340f8ccf9d42aef8dba2cc23f7f5e1':
Fix drm enumeration order, resolves failure to play forward lock ringtones
Jeff Tinker [Mon, 12 Dec 2011 23:30:16 +0000 (15:30 -0800)]
am
dc44e06e: am
ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
* commit '
dc44e06ef305be8de060af69a468e003e231ba05':
Fix drm flag setting missed in false drm recognition fix.
The Android Open Source Project [Mon, 12 Dec 2011 23:29:56 +0000 (15:29 -0800)]
am
175d5d76: Reconcile with ics-mr1-release
* commit '
175d5d76b0aa9808b4214522a6fdf461109560ec':
James Dong [Mon, 12 Dec 2011 23:29:46 +0000 (15:29 -0800)]
am
406dd5d1: am
aadbd80b: Fixed the false drm recognition.
* commit '
406dd5d1e48752177753666867403542e1f400ca':
Fixed the false drm recognition.
Glenn Kasten [Wed, 30 Nov 2011 17:05:19 +0000 (09:05 -0800)]
Delete obsolete includes
Change-Id: I960a179a026ff8d710b43b64cb358f18ee04de16
Andreas Huber [Mon, 12 Dec 2011 16:32:28 +0000 (08:32 -0800)]
Merge "Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler"
The Android Open Source Project [Mon, 12 Dec 2011 15:59:17 +0000 (07:59 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic9c27c987ae88da9ab333632b47837b0ff1dd6d3
The Android Open Source Project [Mon, 12 Dec 2011 15:47:34 +0000 (07:47 -0800)]
Merge from ics-mr1
Change-Id: I209499775ddf68b380d0ec801d558e1dc86ab953
Owen Lin [Mon, 12 Dec 2011 08:17:34 +0000 (16:17 +0800)]
Fix the build. (Change LOGV to ALOGV)
Change-Id: I14104540cfbd2bcdd7af1534db20554b88c4c0ce
Jeff Tinker [Sat, 10 Dec 2011 04:04:17 +0000 (20:04 -0800)]
Fix drm enumeration order, resolves failure to play forward lock ringtones
Change-Id: I58e8a26849409bc3bf98b066c5e07c2a0c91e0c9
related-to-bug:
5735466
Andreas Huber [Sat, 10 Dec 2011 02:09:21 +0000 (18:09 -0800)]
am
ebfce84f: am
68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1
* commit '
ebfce84f7fd3e25fa08c36b155db91df90a59b3d':
Don't perform RTSP seeks right away but queue them for 200ms
Andreas Huber [Sat, 10 Dec 2011 02:09:19 +0000 (18:09 -0800)]
am
aa82c39b: am
0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
* commit '
aa82c39bdb4ad9c1fdcb09f3bea11be5197d3ce6':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
The Android Automerger [Sat, 10 Dec 2011 00:17:04 +0000 (16:17 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Andreas Huber [Fri, 9 Dec 2011 23:09:56 +0000 (15:09 -0800)]
Support for parsing of "folded" RTSP header values and some tweaks to the AMR assembler
contributed by Samsung (untested).
Change-Id: I182561fe0a1a564126bdbb317e96aa52bf525726
The Android Open Source Project [Fri, 9 Dec 2011 22:57:48 +0000 (14:57 -0800)]
am
54854d31: Reconcile with ics-mr0-release ics-mr1-release
* commit '
54854d311731b321e2bb2faec06bacb11d1fe07f':
More fixing for issue #
5366535: Lockscreen has wrong layout...
DO NOT MERGE. Integrate from MR 1 to fix issue #
5366535: Lockscreen...
Jeff Tinker [Fri, 9 Dec 2011 22:25:49 +0000 (14:25 -0800)]
am
a5038d16: am
a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit '
a5038d169f47b2e2278c0056495dfd4808803f8a':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
Jeff Tinker [Fri, 9 Dec 2011 19:13:39 +0000 (11:13 -0800)]
am
ef664f62: Merge "Fix drm flag setting missed in false drm recognition fix." into ics-mr1
* commit '
ef664f62a1525e8f53d0937e889333544ffef3ad':
Fix drm flag setting missed in false drm recognition fix.
Jeff Tinker [Fri, 9 Dec 2011 16:57:23 +0000 (08:57 -0800)]
Fix drm flag setting missed in false drm recognition fix.
Change-Id: Ie38668c8a32969ef7c7df4ca3350e2364291953c
related-to-bug:
5732033
The Android Open Source Project [Fri, 9 Dec 2011 15:11:09 +0000 (07:11 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ieb1f3cdd9a69cff091b73983f68c03cb5d26b9d7
The Android Automerger [Fri, 9 Dec 2011 14:58:10 +0000 (06:58 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
James Dong [Fri, 9 Dec 2011 08:17:56 +0000 (00:17 -0800)]
am
aadbd80b: Fixed the false drm recognition.
* commit '
aadbd80b307c817698ce5110ff8e002804d1b230':
Fixed the false drm recognition.
James Dong [Fri, 9 Dec 2011 03:31:59 +0000 (19:31 -0800)]
Fixed the false drm recognition.
Change-Id: If0198e52ff7bbd7422f219f55a37aae97f7d74f1
related-to-bug:
5732033
The Android Automerger [Fri, 9 Dec 2011 01:35:27 +0000 (17:35 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Andreas Huber [Thu, 8 Dec 2011 21:35:53 +0000 (13:35 -0800)]
am
68f592a8: Merge "Don\'t perform RTSP seeks right away but queue them for 200ms" into ics-mr1
* commit '
68f592a8210af27df4339089bbee47fb602cae6a':
Don't perform RTSP seeks right away but queue them for 200ms
Andreas Huber [Thu, 8 Dec 2011 21:35:51 +0000 (13:35 -0800)]
am
0ba9380a: Merge "Fix Bitreader "putBits" implementation, make sure we emulate timestamps" into ics-mr1
* commit '
0ba9380a337d5e2eae9fd9e4eb8039403ed3815b':
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
Andreas Huber [Thu, 8 Dec 2011 21:33:16 +0000 (13:33 -0800)]
Merge "Don't perform RTSP seeks right away but queue them for 200ms" into ics-mr1
Andreas Huber [Thu, 8 Dec 2011 21:04:50 +0000 (13:04 -0800)]
Don't perform RTSP seeks right away but queue them for 200ms
and only execute the last one.
Change-Id: I9ab342396ec9c9c03624a4b0306d1e180ceca000
related-to-bug:
5732960
Andreas Huber [Thu, 8 Dec 2011 20:27:47 +0000 (12:27 -0800)]
Fix Bitreader "putBits" implementation, make sure we emulate timestamps
if we don't receive npt time mapping from the rtsp server (i.e. live stream)
Change-Id: I5147d665bd90c9a303ad6ffdafbf770f930f917c
related-to-bug:
5660357
The Android Open Source Project [Thu, 8 Dec 2011 18:21:43 +0000 (10:21 -0800)]
Reconcile with ics-mr0-release ics-mr1-release
Change-Id: Ia4cdb4ae14cd906ff06b5e92ef3baeb7394e654c
The Android Automerger [Thu, 8 Dec 2011 15:00:35 +0000 (07:00 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Jeff Tinker [Thu, 8 Dec 2011 08:16:22 +0000 (00:16 -0800)]
am
a693a4b5: Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
* commit '
a693a4b5553584a01b8b6b3640dc0393d2d88f28':
Fix ANRs due to Widevine DRM plugin sniff taking too long.
Jeff Tinker [Thu, 8 Dec 2011 08:13:43 +0000 (00:13 -0800)]
Merge "Fix ANRs due to Widevine DRM plugin sniff taking too long." into ics-mr1
Jeff Tinker [Thu, 8 Dec 2011 04:23:20 +0000 (20:23 -0800)]
Fix ANRs due to Widevine DRM plugin sniff taking too long.
Add a Widevine-specific format sniffer to avoid having to
refetch data from the remote server.
Change-Id: I5fdb21fe7a0d6e74f2a6f06e6fbf8070b068ac60
related-to-bug:
5725548
Dave Burke [Wed, 7 Dec 2011 22:11:14 +0000 (14:11 -0800)]
am
6727a43f: am
54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
* commit '
6727a43f6d8ff193b86ca90b2daa761c47157638':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
Dave Burke [Wed, 7 Dec 2011 22:08:13 +0000 (14:08 -0800)]
am
54a53841: Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
* commit '
54a53841a9ff48ba4cd004469ae4ff77caed900a':
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
Dave Burke [Wed, 7 Dec 2011 22:05:41 +0000 (14:05 -0800)]
Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." into ics-mr1
Andreas Huber [Wed, 7 Dec 2011 20:50:47 +0000 (12:50 -0800)]
Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.
Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59
related-to-bug:
5666532
The Android Open Source Project [Wed, 7 Dec 2011 15:44:31 +0000 (07:44 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ie377d01065e1c34c60a97df3725e56100bae3903
The Android Open Source Project [Wed, 7 Dec 2011 15:29:38 +0000 (07:29 -0800)]
am
6ee7bca1: (-s ours) am
3de8d36b: Reconcile with ics-mr0-release
* commit '
6ee7bca1ce7f93d33a70701bb7862c3d13e68b89':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
The Android Open Source Project [Wed, 7 Dec 2011 15:27:57 +0000 (07:27 -0800)]
am
3de8d36b: Reconcile with ics-mr0-release
* commit '
3de8d36b6fd166cf63ca256c455c0ea26a849668':
DO NOT MERGE: Remove the AVI extractor.
Disable wifiwatchdog for now
The Android Open Source Project [Wed, 7 Dec 2011 15:24:54 +0000 (07:24 -0800)]
Reconcile with ics-mr0-release
Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
Narayan Kamath [Wed, 7 Dec 2011 12:15:43 +0000 (04:15 -0800)]
Merge "Allow data uris to be data sources"
Andreas Huber [Wed, 7 Dec 2011 00:59:52 +0000 (16:59 -0800)]
am
92860d5d: (-s ours) am
791a3183: Merge "Merge commit \'
babb7200\' into manualmerge" into ics-mr1
* commit '
92860d5d4681e684d5f3936137c6c067c950121e':
DO NOT MERGE: Remove the AVI extractor.
The Android Automerger [Wed, 7 Dec 2011 00:54:17 +0000 (16:54 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Andreas Huber [Wed, 7 Dec 2011 00:22:07 +0000 (16:22 -0800)]
am
791a3183: Merge "Merge commit \'
babb7200\' into manualmerge" into ics-mr1
* commit '
791a31832ab586f056c2bcab8e0515d4bb1e2f7a':
DO NOT MERGE: Remove the AVI extractor.
James Dong [Wed, 7 Dec 2011 00:04:38 +0000 (16:04 -0800)]
am
49782b81: (-s ours) am
6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
* commit '
49782b8100a752056f044f6f3f1cf16a6a1f03b4':
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
Andreas Huber [Wed, 7 Dec 2011 00:04:36 +0000 (16:04 -0800)]
am
c4738293: (-s ours) am
05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
* commit '
c4738293527618f9a228c3f0f645c0a0704ada9c':
DO NOT MERGE: Remove the AVI extractor.
Andreas Huber [Tue, 6 Dec 2011 23:03:10 +0000 (15:03 -0800)]
Merge commit '
babb7200' into manualmerge
Andreas Huber [Tue, 6 Dec 2011 18:59:48 +0000 (10:59 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
James Dong [Tue, 6 Dec 2011 20:55:39 +0000 (12:55 -0800)]
am
6b8b5a0a: Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
* commit '
6b8b5a0a4183c0f8d1d5ceacc9e50194589a77d3':
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
James Dong [Tue, 6 Dec 2011 20:52:52 +0000 (12:52 -0800)]
Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames" into ics-mr1
Andreas Huber [Tue, 6 Dec 2011 20:46:46 +0000 (12:46 -0800)]
am
05d63069: Merge "DO NOT MERGE: Remove the AVI extractor." into ics-mr1
* commit '
05d630691127c022befd071b2bede87c707112a9':
DO NOT MERGE: Remove the AVI extractor.
Andreas Huber [Tue, 6 Dec 2011 18:01:27 +0000 (10:01 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
Andreas Huber [Tue, 6 Dec 2011 18:59:48 +0000 (10:59 -0800)]
DO NOT MERGE: Remove the AVI extractor.
Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
Narayan Kamath [Wed, 16 Nov 2011 15:57:29 +0000 (15:57 +0000)]
Allow data uris to be data sources
bug:
5571010
Change-Id: I0b6ae6c729ac34d46e9990fcceb08294eb4f7c58
The Android Open Source Project [Tue, 6 Dec 2011 17:02:57 +0000 (09:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I2790bcf28bdac1335b4106138fc6ad471ac40516
The Android Automerger [Tue, 6 Dec 2011 04:36:01 +0000 (20:36 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Eric Laurent [Tue, 6 Dec 2011 01:25:37 +0000 (17:25 -0800)]
am
5433e25f: am
7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
* commit '
5433e25f6ce013860ff2a074ad8d1158cc39ab91':
audioflinger: fix audio skipping over A2DP
Eric Laurent [Tue, 6 Dec 2011 01:22:58 +0000 (17:22 -0800)]
am
7b6aff23: Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
* commit '
7b6aff23735a9ef8759c5ecb4427784413e9b85b':
audioflinger: fix audio skipping over A2DP
Eric Laurent [Tue, 6 Dec 2011 01:20:53 +0000 (17:20 -0800)]
Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1
James Dong [Mon, 5 Dec 2011 20:41:06 +0000 (12:41 -0800)]
DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync frames
The current logic does not check the I-frame at zeroeth position and therefore
for the files with only 1 I-Frame at zeroeth postion does not play.
Originally authored by Braganza Sam Robertsh <sam.braganza@samsung.com>
Do not merge to master branch since we made some improvement to SampleTable.cpp in the master branch.
Change-Id: I068184dec71986f14a586f769c2af1f52b4bcf94
related-to-bug:
5711942
Andreas Huber [Mon, 5 Dec 2011 21:30:52 +0000 (13:30 -0800)]
resolved conflicts for merge of
07bacabe to master
Change-Id: Idb56996f7c1b78d96e3d3d3f08419c4d122db0b1
Andreas Huber [Mon, 5 Dec 2011 20:03:41 +0000 (12:03 -0800)]
am
f2e12498: Merge "Properly identify how much metadata we need to cache in order to instantiate" into ics-mr1
* commit '
f2e1249846a17c69d728189a8dc67f37261f0a59':
Properly identify how much metadata we need to cache in order to instantiate
Andreas Huber [Mon, 5 Dec 2011 19:34:43 +0000 (11:34 -0800)]
Properly identify how much metadata we need to cache in order to instantiate
the extractor without blocking (and therefore be able to abort).
Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3
related-to-bug:
5666532
Eric Laurent [Mon, 5 Dec 2011 17:47:19 +0000 (09:47 -0800)]
audioflinger: fix audio skipping over A2DP
The maximum sleep time allowed in the mixer thread when audio tracks
are enabled but not ready for mixing is derived from the latency
reported by the output stream.
This does not work for A2DP where the latency also reflects encoding, decoding
and transfer time.
Modified activeSleepTimeUs() to take A2DP case into account.
Issue
5682206.
Change-Id: I3784ac01fb6f836b5a6ce6f764fb15347586de35
The Android Open Source Project [Mon, 5 Dec 2011 16:53:06 +0000 (08:53 -0800)]
Reconcile with ics-mr1-release
Change-Id: I35fea7fba390129cec15616718e2880bfa3b414c
Mike Lockwood [Sat, 3 Dec 2011 01:57:19 +0000 (17:57 -0800)]
am
9f3f3c2f: (-s ours) am
1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
* commit '
9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Mike Lockwood [Sat, 3 Dec 2011 01:57:17 +0000 (17:57 -0800)]
am
7bbc3c4b: (-s ours) am
7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
* commit '
7bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2':
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
The Android Automerger [Sat, 3 Dec 2011 00:21:23 +0000 (16:21 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Mike Lockwood [Fri, 2 Dec 2011 21:22:17 +0000 (13:22 -0800)]
am
1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1
* commit '
1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
Mike Lockwood [Fri, 2 Dec 2011 21:22:15 +0000 (13:22 -0800)]
am
7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1
* commit '
7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1':
MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE