summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-300-0/+0
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | | | | | | Change-Id: I00b8d5eecea650df527aa3c21bb4a7270a196401
| * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-300-0/+0
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-280-0/+0
| | |\ \ \ \ | | | |_|/ / | | |/| | |
* | | | | | am c040e1e7: am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage ↵Jamie Gennis2011-11-301-1/+1
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | bit" into ics-mr1 * commit 'c040e1e77923d81050f2d3dbdac5d07e01be72f6': SurfaceMediaSource: use the vid enc usage bit
| * | | | | am 6f1dd757: Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1Jamie Gennis2011-11-291-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '6f1dd757cb158d17c76baeb170f7db2271802ef8': SurfaceMediaSource: use the vid enc usage bit
| | * | | | Merge "SurfaceMediaSource: use the vid enc usage bit" into ics-mr1Jamie Gennis2011-11-291-1/+1
| | |\ \ \ \
| | | * | | | SurfaceMediaSource: use the vid enc usage bitJamie Gennis2011-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes SurfaceMediaSource add the VIDEO_ENC usage bit when allocating its GraphicBuffers rather than the HW_TEXTURE bit. Change-Id: Ie20e225c894fdbc31cad6bb82b3b64c7e98074eb
* | | | | | | resolved conflicts for merge of 3d630e86 to masterAndreas Huber2011-11-302-2/+20
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | Change-Id: I9eb7b7c1668b5f0de85ec8b1e9257cf1ec4d8b9e
| * | | | | | am 564fee36: Merge "Make sure we can properly shutdown even if" into ics-mr1Andreas Huber2011-11-292-2/+20
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | * commit '564fee36667e2699c59a29102136220dc2f65862': Make sure we can properly shutdown even if
| | * | | | | Merge "Make sure we can properly shutdown even if" into ics-mr1Andreas Huber2011-11-292-2/+20
| | |\ \ \ \ \
| | | * | | | | Make sure we can properly shutdown even ifAndreas Huber2011-11-282-2/+20
| | | | |/ / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | a) one of the two decoders has a pending discontinuity b) the renderer holds on to all output buffers for that decoder c) the renderer is paused if all three conditions are met the decoder won't ask for more input data and therefore never see the discontinuity. To avoid this we briefly resume the renderer just before shutting down. Change-Id: I9e08af2a1eb4298d1cd00497d6aa33f4ad184e9a related-to-bug: 5655016
* | | | | | | Merge "Add camera focus move callback."Wu-cheng Li2011-11-291-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Add camera focus move callback.Wu-cheng Li2011-11-291-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5534973 Change-Id: Iaadcb2738ad040f94849be30ee531326f6199431
* | | | | | | | Fix the broken buildJames Dong2011-11-291-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib508514891474d24f14ac69d721b0c9c700a0c3f
* | | | | | | | am 52607c53: am d12dc284: Merge "If an error occurs that prevents us from ↵Andreas Huber2011-11-292-0/+34
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reallocating buffers during a format change" into ics-mr1 * commit '52607c5364446df6ac5b2f55cb50e146e6023a4f': If an error occurs that prevents us from reallocating buffers during a format change
| * | | | | | | am d12dc284: Merge "If an error occurs that prevents us from reallocating ↵Andreas Huber2011-11-292-0/+34
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | buffers during a format change" into ics-mr1 * commit 'd12dc28460f622ab29e83fa688ad83a8263e9417': If an error occurs that prevents us from reallocating buffers during a format change
| | * | | | | | Merge "If an error occurs that prevents us from reallocating buffers during ↵Andreas Huber2011-11-292-0/+34
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | a format change" into ics-mr1
| | | * | | | | | If an error occurs that prevents us from reallocating buffers during a ↵Andreas Huber2011-11-282-0/+34
| | | | |/ / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format change we need to transition to executing state anyway to be able to properly flush/shutdown in the future. Change-Id: Ie48bc09ea31942009ae3a5a45aabc9ffad9fb91f related-to-bug: 5655016
* | | | | | | | am 074133b2: am 351143fb: Merge "Updated (internal) API for IStreamSource to ↵Andreas Huber2011-11-293-13/+23
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | signal discontinuities" into ics-mr1 * commit '074133b260f8d12e484e93b9aa5a33a4983b7349': Updated (internal) API for IStreamSource to signal discontinuities
| * | | | | | | am 351143fb: Merge "Updated (internal) API for IStreamSource to signal ↵Andreas Huber2011-11-293-13/+23
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | discontinuities" into ics-mr1 * commit '351143fb0e2fcfb7dc2ef1045d693c71eb0ea329': Updated (internal) API for IStreamSource to signal discontinuities
| | * | | | | | Merge "Updated (internal) API for IStreamSource to signal discontinuities" ↵Andreas Huber2011-11-293-13/+23
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1
| | | * | | | | | Updated (internal) API for IStreamSource to signal discontinuitiesAndreas Huber2011-11-293-13/+23
| | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96 related-to-bug: 5553055
* | | | | | | | resolved conflicts for merge of 998a929a to masterAndreas Huber2011-11-297-60/+151
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
| * | | | | | | am 405a4e34: Merge "Finer granularity discontinuity support." into ics-mr1Andreas Huber2011-11-297-60/+151
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit '405a4e34032f8a07028138266fe9f79f6753b466': Finer granularity discontinuity support.
| | * | | | | | Finer granularity discontinuity support.Andreas Huber2011-11-287-60/+151
| | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No clients can signal a format change on either audio or video track (or both) and a time discontinuity (timestamps changed) independantly. Change-Id: I3e6cf4e7c260e85759879d61a9b517f68431c22f related-to-bug: 5553055
* | | | | | | split ComposerService out of SurfaceComposerClient.hMathias Agopian2011-11-282-0/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
* | | | | | | Merge "Make AudioTrack a RefBase so wrappers not needed"Glenn Kasten2011-11-281-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Make AudioTrack a RefBase so wrappers not neededGlenn Kasten2011-11-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2305abe586ac41251af04a194bc818c110a1b293
* | | | | | | | am f6422f5f: am 20398fac: Merge "audioflinger: reduce sleep time to avoid ↵Eric Laurent2011-11-231-1/+23
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | underrun" into ics-mr1 * commit 'f6422f5f5d04aab47f8f36a0ea92e2140bed0105': audioflinger: reduce sleep time to avoid underrun
| * | | | | | | am 20398fac: Merge "audioflinger: reduce sleep time to avoid underrun" into ↵Eric Laurent2011-11-231-1/+23
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '20398fac99ff78cb3ec3dd122930e45d409e0524': audioflinger: reduce sleep time to avoid underrun
| | * | | | | | audioflinger: reduce sleep time to avoid underrunEric Laurent2011-11-221-1/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Progressively reduce the sleep time applied in MixerThread::threadLoop() in case of consecutive application underruns to avoid starving the audio HAL. As the default sleep time is longer than the duration of an audio buffer we ended up writing less data than needed by the audio HAL if the condition persisted. Issue 5553055. Change-Id: I2b23ee79c032efa945025db228beaecd1e07a2e5
* | | | | | | | Merge "Fix a subtitle bug: multiple blank lines in SubRip(srt) file."James Dong2011-11-221-6/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix a subtitle bug: multiple blank lines in SubRip(srt) file.Insun Kang2011-11-221-6/+11
| | |_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | TimedTextParser should handle multiple blank lines between subtitles in SRT format. Change-Id: Id81e0a14d9984141f68b9f0919942c85562301b3
* | | | | | | | Reconcile with ics-mr0-release ics-mr1-releaseThe Android Open Source Project2011-11-220-0/+0
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | Change-Id: I3200e581a74858b3b7728db974f10c2ed68004ad
| * | | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-220-0/+0
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
* | | | | | | | am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting ↵Andreas Huber2011-11-222-57/+91
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | on malformed avc configuration data." into ics-mr1 * commit '31626b3075335f4cf579342e99436bb45870cf55': Report a runtime error instead of asserting on malformed avc configuration data.
| * | | | | | am cb6fbc89: Merge "Report a runtime error instead of asserting on malformed ↵Andreas Huber2011-11-222-57/+91
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | avc configuration data." into ics-mr1 * commit 'cb6fbc89c25298643ab342b4a228e772b0e56978': Report a runtime error instead of asserting on malformed avc configuration data.
| | * | | | | Merge "Report a runtime error instead of asserting on malformed avc ↵Andreas Huber2011-11-222-57/+91
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | configuration data." into ics-mr1
| | | * | | | | Report a runtime error instead of asserting on malformed avc configuration data.Andreas Huber2011-11-182-57/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845 related-to-bug: 5641069
* | | | | | | | am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video ↵James Dong2011-11-214-14/+18
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | recording" into ics-mr1 * commit 'd0a254566f5f0be5607b4d64839a575c888c94f6': Fix log spamming during time lapse video recording
| * | | | | | | am 02740dc4: Merge "Fix log spamming during time lapse video recording" into ↵James Dong2011-11-214-14/+18
| |\ \ \ \ \ \ \ | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ics-mr1 * commit '02740dc49df86fc94c872454aa9db98737d5e8c8': Fix log spamming during time lapse video recording
| | * | | | | | Fix log spamming during time lapse video recordingJames Dong2011-11-214-14/+18
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f related-to-bug: 5626569
* | | | | | | Reconcile with ics-mr0-release ics-mr1-releaseThe Android Open Source Project2011-11-180-0/+0
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | | | | | | | Change-Id: I31643242d240b4d1efef685583ec21934a88cc02
| * | | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-170-0/+0
| |\ \ \ \ \ \
| | * \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-160-0/+0
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-150-0/+0
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-130-0/+0
| | | | |\ \ \ \ \ \
* | | | | \ \ \ \ \ \ am a1cd09e0: am 7ff7821a: am d4b22ab4: status_t != boolMarco Nelissen2011-11-180-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a1cd09e0e6a239eafa5112c0e8a09b7efc154a78': status_t != bool
| * | | | | | | | | | am 7ff7821a: am d4b22ab4: status_t != boolMarco Nelissen2011-11-182-3/+3
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7ff7821a601a39fffb318e29873957b4a3703c46': status_t != bool
| | * | | | | | | | | am d4b22ab4: status_t != boolMarco Nelissen2011-11-182-3/+3
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | / | | | | |_|_|_|_|_|/ | | | |/| | | | | | * commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98': status_t != bool
generated by cgit v1.1 at 2024-07-04 11:18:29 +0000