summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | | Added some extra failure logging messagesJames Dong2012-10-172-0/+8
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | o related-to-bug: 7282066 Change-Id: I0896551a45aab61fb571fef19061397ff84321d9
* | | | | am dfb9d42f: am 6a2d62c1: Merge "Manually merge change #111620 from tc3 to ↵Glenn Kasten2012-10-172-3/+3
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | mainline, to keep the" * commit 'dfb9d42f78e0feb1168fc88c526f7401284a9b5a': Manually merge change #111620 from tc3 to mainline, to keep the
| * | | | am 6a2d62c1: Merge "Manually merge change #111620 from tc3 to mainline, to ↵Glenn Kasten2012-10-172-3/+3
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | keep the" * commit '6a2d62c1a972da25de53b1718c165f2b7df85a0e': Manually merge change #111620 from tc3 to mainline, to keep the
| | * | | Merge "Manually merge change #111620 from tc3 to mainline, to keep the"Glenn Kasten2012-10-172-3/+3
| | |\ \ \
| | | * | | Manually merge change #111620 from tc3 to mainline, to keep theDan Bornstein2012-10-172-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | automerger from choking on it. p4 sync p4 integrate -r -b android_to_tc3 //...@111620,111620 p4 resolve -a p4 resolve # resolve a couple merge travesties PRESUBMIT=passed BUG=1399648 TBR=edheyl OCL=111902 Change-Id: I854b01553dd92bbf9c864f5a9bd51a3d665f0ac2 Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | | | am 98d17231: am dbe1be24: Merge "Rename "Makefile" to "Android.mk" ↵Glenn Kasten2012-10-171-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | throughout the tree." * commit '98d172313eb675b2a1960059527518a8609b2fbe': Rename "Makefile" to "Android.mk" throughout the tree.
| * | | | | am dbe1be24: Merge "Rename "Makefile" to "Android.mk" throughout the tree."Glenn Kasten2012-10-171-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit 'dbe1be24c9e6fb92a88a38adbd12a56aa5337f74': Rename "Makefile" to "Android.mk" throughout the tree.
| | * | | | Merge "Rename "Makefile" to "Android.mk" throughout the tree."Glenn Kasten2012-10-171-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Rename "Makefile" to "Android.mk" throughout the tree.Dave Bort2012-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For <http://b/issue?id=960416>. I've tested this as much as I can, but 1500 open files = easy to mess things up. Please let me know if there's a problem rather than rolling back this change. PRESUBMIT=passed BUG=960416 TBR=joeo OCL=46537 Change-Id: I5a404caf0f398a7afa7ae7abaf2f2a1c6ab490eb Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | | | am 3b7e05ba: am 4cd2275d: Merge "Rename "TARGET" to "MODULE" in the build ↵Glenn Kasten2012-10-171-1/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | system." * commit '3b7e05bac887889323bb15e9c16407b9408822e6': Rename "TARGET" to "MODULE" in the build system.
| * | | | | am 4cd2275d: Merge "Rename "TARGET" to "MODULE" in the build system."Glenn Kasten2012-10-171-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '4cd2275d93a65296e20be27422a00f9e2a78d3a9': Rename "TARGET" to "MODULE" in the build system.
| | * | | | Merge "Rename "TARGET" to "MODULE" in the build system."Glenn Kasten2012-10-171-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Rename "TARGET" to "MODULE" in the build system.Dave Bort2012-10-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Part one of the grand renaming. API_CHANGE: Third parties may need to update their makefiles. Any variables with "LOCAL" and "TARGET" in their names should now use "MODULE" instead of "TARGET"; e.g., LOCAL_MODULE, LOCAL_MODULE_TAGS. PRESUBMIT=passed OCL=39840 Change-Id: Ica9a7937d3d9552ab84db46ac6eea8a290e404fe Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | | | am e89e9c78: am 108e1961: Merge "Tweak the SINC resampler parameters and ↵Glenn Kasten2012-10-171-3/+3
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | double the performance. It\'s using about 10% CPU in the worse case now." * commit 'e89e9c78fd2ca3d1887ac0e2cd64a9d8265680c1': Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now.
| * | | | | am 108e1961: Merge "Tweak the SINC resampler parameters and double the ↵Glenn Kasten2012-10-171-3/+3
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | performance. It\'s using about 10% CPU in the worse case now." * commit '108e1961ffb858374dcb39115d1dd831a4a4a75c': Tweak the SINC resampler parameters and double the performance. It's using about 10% CPU in the worse case now.
| | * | | | Merge "Tweak the SINC resampler parameters and double the performance. It's ↵Glenn Kasten2012-10-171-3/+3
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | using about 10% CPU in the worse case now."
| | | * | | Tweak the SINC resampler parameters and double the performance. It's using ↵Mathias Agopian2012-10-171-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | about 10% CPU in the worse case now. Change-Id: I50ac7e6c6702a427fa36ab6d976c507155057507 Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | | | am 9ad8de3b: am a19c8102: Merge "A sinc resampler for Audioflinger. It\'s ↵Glenn Kasten2012-10-171-13/+29
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time." * commit '9ad8de3b01ec276b84a8d6b70f49cc08a70e9bcd': A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time.
| * | | | | am a19c8102: Merge "A sinc resampler for Audioflinger. It\'s not enabled ↵Glenn Kasten2012-10-171-13/+29
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time." * commit 'a19c810289392e5733463703e865c7ae407868ad': A sinc resampler for Audioflinger. It's not enabled yet, but fully functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time.
| | * | | | Merge "A sinc resampler for Audioflinger. It's not enabled yet, but fully ↵Glenn Kasten2012-10-171-13/+29
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time."
| | | * | | A sinc resampler for Audioflinger. It's not enabled yet, but fully ↵Mathias Agopian2012-10-171-13/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | functional and apparently working. It need more "quality" tests. In the 48->44 KHz, it takes about 25% of the CPU time. Change-Id: I80eb5185e13ebdb907e0b85c49ba1272c23d60ec Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | | | am f0d3f344: am 5e8e3fc3: Merge "fix a few small typos in the FIR computation"Glenn Kasten2012-10-171-6/+2
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | * commit 'f0d3f344b4572832d3780de049a59b3eb8b995fb': fix a few small typos in the FIR computation
| * | | | | am 5e8e3fc3: Merge "fix a few small typos in the FIR computation"Glenn Kasten2012-10-171-6/+2
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '5e8e3fc30111534858fbd1f52a92e5128613af0e': fix a few small typos in the FIR computation
| | * | | | Merge "fix a few small typos in the FIR computation"Glenn Kasten2012-10-171-6/+2
| | |\ \ \ \ | | | |/ / /
| | | * | | fix a few small typos in the FIR computationMathias Agopian2012-10-171-6/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6e56b514fe520f30f7487f85c64ea5d2a7c19b40 Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | | | am 00f8cde8: am d2186701: Merge "This is a tool to compute the the ↵Glenn Kasten2012-10-172-0/+126
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reconstruction filter coefficients for a sinc audio resampler." * commit '00f8cde8584e184105879a01a276b8391d192273': This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler.
| * | | | | am d2186701: Merge "This is a tool to compute the the reconstruction filter ↵Glenn Kasten2012-10-172-0/+126
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | coefficients for a sinc audio resampler." * commit 'd218670119dc19fbbc5c804ae3ab7c0a5dd985d8': This is a tool to compute the the reconstruction filter coefficients for a sinc audio resampler.
| | * | | | Merge "This is a tool to compute the the reconstruction filter coefficients ↵Glenn Kasten2012-10-172-0/+126
| | |\ \ \ \ | | | |/ / / | | | | | | | | | | | | for a sinc audio resampler."
| | | * | | This is a tool to compute the the reconstruction filter coefficients for a ↵Mathias Agopian2012-10-172-0/+126
| | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sinc audio resampler. Change-Id: I99be2505139b8e0e7647200e1647509d4f7e6067 Signed-off-by: Glenn Kasten <gkasten@google.com>
* | | | | am ed653a35: am ecfbc952: Merge "Camera2: Improve quirks focusing behavior." ↵Eino-Ville Talvala2012-10-162-2/+9
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | into jb-mr1-dev * commit 'ed653a35784969b7d36e8b36bd421e2a54def0de': Camera2: Improve quirks focusing behavior.
| * | | | am ecfbc952: Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-devEino-Ville Talvala2012-10-162-2/+9
| |\ \ \ \ | | | |/ / | | |/| | | | | | | | | | | | * commit 'ecfbc952d51c71832f739b7483dcc8cb5fe68038': Camera2: Improve quirks focusing behavior.
| | * | | Merge "Camera2: Improve quirks focusing behavior." into jb-mr1-devEino-Ville Talvala2012-10-162-2/+9
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Camera2: Improve quirks focusing behavior.Eino-Ville Talvala2012-10-162-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - When scene mode is set and the AF quirk is in use, don't change AF mode and then cancel when AF cancel is received. Just change mode since that also implies a cancel. - Only trigger quirks switch when a focusing area is set. Bug: 7318812 Change-Id: I28d8755553bd78052e774701210cb94d84ee2046
* | | | | am aa00830e: am bbe11e46: Merge "Fix track estimation for presentation ↵Jean-Michel Trivi2012-10-161-4/+2
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | complete" into jb-mr1-dev * commit 'aa00830e46cb7494af7217246788c1bca83b1d04': Fix track estimation for presentation complete
| * | | | am bbe11e46: Merge "Fix track estimation for presentation complete" into ↵Jean-Michel Trivi2012-10-161-4/+2
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | jb-mr1-dev * commit 'bbe11e46faf8f9e3296431993c36d3efc61337b5': Fix track estimation for presentation complete
| | * | | Merge "Fix track estimation for presentation complete" into jb-mr1-devJean-Michel Trivi2012-10-161-4/+2
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Fix track estimation for presentation completeJean-Michel Trivi2012-10-161-4/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Audio tracks were not using the right latency estimation for signalling the completion of their presetation. This caused the synchronization mechanism between playback and record to be off, and a synchronized recording would contain some of the audio that was meant to be over once recording would start. Use the playback thread's latency reporting which takes the audio pipe into account. Bug 7237669 Change-Id: I23a907a53ad0b0d68d246789ec595a77a79fced5
* | | | | am 74a7bcc0: am 54717320: Camera2: Don\'t touch frame counter on output frames.Eino-Ville Talvala2012-10-161-1/+1
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '74a7bcc052d9bdd0f555e9be6f5ecaf92c6b22d8': Camera2: Don't touch frame counter on output frames.
| * | | | am 54717320: Camera2: Don\'t touch frame counter on output frames.Eino-Ville Talvala2012-10-161-1/+1
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | * commit '547173205b3fd909dd72b597f6372840c38460e4': Camera2: Don't touch frame counter on output frames.
| | * | | Camera2: Don't touch frame counter on output frames.Eino-Ville Talvala2012-10-161-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7357069 Change-Id: I9cd0cdcc23959bfecced5f47bb9e8c59c997dade
* | | | | am 522fa119: am d6cc4a62: Camera2: When focus is already locked in CAF mode, ↵Eino-Ville Talvala2012-10-163-4/+41
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | do not trigger HAL. * commit '522fa119fe2745cd950b6216ad6b49587372b7b3': Camera2: When focus is already locked in CAF mode, do not trigger HAL.
| * | | | am d6cc4a62: Camera2: When focus is already locked in CAF mode, do not ↵Eino-Ville Talvala2012-10-163-4/+41
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | trigger HAL. * commit 'd6cc4a62f3d94cad4dd36bd0a844ba8764177d26': Camera2: When focus is already locked in CAF mode, do not trigger HAL.
| | * | | Camera2: When focus is already locked in CAF mode, do not trigger HAL.Eino-Ville Talvala2012-10-163-4/+41
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In HAL2 CAF modes, once focus is locked by an AF trigger, additional triggers will not cause AF notifications, since the state will not change again until a cancelAutofocus call. Since the old API still expects to see a notification, short-circuit this at the service and send an immediate success notification. Bug: 7318298 Change-Id: Ib209a24eaf2a35a247d06aea671efe80a33d751e
* | | | am 2e5aa980: Merge "Fix log spam: Failed to open libwvm.so" into ↵Glenn Kasten2012-10-151-5/+8
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | jb-mr1-dev-plus-aosp * commit '2e5aa980c9eba995d99aa13e6b5fa2714dc9f61e': Fix log spam: Failed to open libwvm.so
| * | | Merge "Fix log spam: Failed to open libwvm.so" into jb-mr1-dev-plus-aospGlenn Kasten2012-10-151-5/+8
| |\ \ \
| | * | | Fix log spam: Failed to open libwvm.soGlenn Kasten2012-10-121-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 7342813 Change-Id: I98852f036e4679a653723fc2bf1435d6e9d7d34c
* | | | | am f93f5bf4: (-s ours) Reconcile with jb-mr1-factory-release jb-mr1-release ↵The Android Open Source Project2012-10-150-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | - do not merge * commit 'f93f5bf4a48df3b1557734a1e945b9556ce16f92':
| | | | |
| | \ \ \
| *-. \ \ \ Reconcile with jb-mr1-factory-release jb-mr1-release - do not mergeThe Android Open Source Project2012-10-150-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | Change-Id: I427041221d8f8f3237c806f3d8a3f67c0b3a4242
| | | * | | merge in jb-mr1-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | | |\ \ \ | | | | |/ / | | | |/| |
| | * | | | merge in jb-mr1-factory-release history after reset to jb-mr1-devThe Android Automerger2012-10-120-0/+0
| | |\ \ \ \ | | | |/ / / | | |/| | |
generated by cgit v1.1 at 2025-02-09 06:03:13 +0000