summaryrefslogtreecommitdiffstats
path: root/media
Commit message (Collapse)AuthorAgeFilesLines
...
* | MTP: Add support for restricting PTP to only certain subdirectories of the ↵Mike Lockwood2011-12-021-4/+7
| | | | | | | | | | | | | | | | | | storage Bug: 5527220 Change-Id: If68e7481617ecb62abd24e2d89e6b7dfdf95ba2b Signed-off-by: Mike Lockwood <lockwood@google.com>
* | MTP: Don't attempt to read more than 16K at a time from the MTP driverMike Lockwood2011-12-011-2/+4
| | | | | | | | | | | | | | | | This could happen sometimes if other operations increased the size of the data packet buffer to > 16K Change-Id: I4d316c7e2e558d3dd861d39accae6514fd9a62f5 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | am 10526a0b: am 2c2ed7be: Merge "Fixes a typo in AVIExtractor that would ↵Andreas Huber2011-12-011-1/+1
|\ \ | |/ | | | | | | | | | | advertise the wrong video dimensions" into ics-mr1 * commit '10526a0bfe070ac4d1e550a81ed68be35d261b16': Fixes a typo in AVIExtractor that would advertise the wrong video dimensions
| * Fixes a typo in AVIExtractor that would advertise the wrong video dimensionsAndreas Huber2011-12-011-1/+1
| | | | | | | | | | Change-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab related-to-bug: 5696324
* | 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
| * 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
| * | 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
* | | | 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-291-0/+32
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | 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
| * | | Merge "If an error occurs that prevents us from reallocating buffers during ↵Andreas Huber2011-11-291-0/+32
| |\ \ \ | | | | | | | | | | | | | | | a format change" into ics-mr1
| | * | | If an error occurs that prevents us from reallocating buffers during a ↵Andreas Huber2011-11-281-0/+32
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-292-7/+12
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | signal discontinuities" into ics-mr1 * commit '074133b260f8d12e484e93b9aa5a33a4983b7349': Updated (internal) API for IStreamSource to signal discontinuities
| * | | Merge "Updated (internal) API for IStreamSource to signal discontinuities" ↵Andreas Huber2011-11-292-7/+12
| |\ \ \ | | | | | | | | | | | | | | | into ics-mr1
| | * | | Updated (internal) API for IStreamSource to signal discontinuitiesAndreas Huber2011-11-292-7/+12
| | |/ / | | | | | | | | | | | | | | | | Change-Id: Idd4b9d8e7cec16b3e3c91c70e75144d42be30f96 related-to-bug: 5553055
* | | | resolved conflicts for merge of 998a929a to masterAndreas Huber2011-11-297-60/+151
|\ \ \ \ | |/ / / | | | | | | | | Change-Id: Id5cfbcf20e5ec28782cc88075040cf9edebfdfe8
| * | | 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-281-0/+2
| | | | | | | | | | | | Change-Id: I1eb691f7ca263d5895d871ab675bb5826e0323c6
* | | 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
* | | | am 31626b30: am cb6fbc89: Merge "Report a runtime error instead of asserting ↵Andreas Huber2011-11-221-57/+87
|\ \ \ \ | |/ / / |/| / / | |/ / | | | | | | | | | on malformed avc configuration data." into ics-mr1 * commit '31626b3075335f4cf579342e99436bb45870cf55': 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-221-57/+87
| |\ \ | | | | | | | | | | | | configuration data." into ics-mr1
| | * | Report a runtime error instead of asserting on malformed avc configuration data.Andreas Huber2011-11-181-57/+87
| | | | | | | | | | | | | | | | | | | | Change-Id: Ibcd9c3fb5b6532eba843ed80ecdcdacaf50d8845 related-to-bug: 5641069
* | | | am d0a25456: am 02740dc4: Merge "Fix log spamming during time lapse video ↵James Dong2011-11-212-10/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | recording" into ics-mr1 * commit 'd0a254566f5f0be5607b4d64839a575c888c94f6': Fix log spamming during time lapse video recording
| * | | Fix log spamming during time lapse video recordingJames Dong2011-11-212-10/+15
| | |/ | |/| | | | | | | | | | | | | Change-Id: I4fc0809203684ebb02eaf217d7abad00aefc898f related-to-bug: 5626569
| * | am d4b22ab4: status_t != boolMarco Nelissen2011-11-182-3/+3
| |\ \ | | |/ | |/| | | | | | | * commit 'd4b22ab4889f9b1885bfc0dc45667c846a171a98': status_t != bool
| | * status_t != boolMarco Nelissen2011-11-182-3/+3
| | | | | | | | | | | | | | | | | | b/5567433 Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
* | | status_t != boolMarco Nelissen2011-11-182-3/+3
| | | | | | | | | | | | | | | | | | b/5567433 Change-Id: I255ab8c3b0b5e0ea6a5cc7c05df757c667f3855e
* | | am 624efe45: am c1b1709b: Merge "Make sure not to cancel pending seek/EOS ↵Andreas Huber2011-11-172-8/+9
|\ \ \ | |/ / | | | | | | | | | | | | | | | notifications on a cache underrun..." into ics-mr1 * commit '624efe45671131903fb5165f6133ba39486092ab': Make sure not to cancel pending seek/EOS notifications on a cache underrun...
| * | Make sure not to cancel pending seek/EOS notifications on a cache underrun...Andreas Huber2011-11-162-8/+9
| | | | | | | | | | | | | | | | | | | | | or they are lost for good. Change-Id: I2f9f53efb05db4077961137c9dc8c27edac4ec62 related-to-bug: 5544907
* | | Merge "MidiFile uses C++ Thread not createThreadEtc"Glenn Kasten2011-11-172-7/+26
|\ \ \
| * | | MidiFile uses C++ Thread not createThreadEtcGlenn Kasten2011-11-162-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | This permits leveraging future improvements to Thread. Change-Id: I323b709e935c47fa3c6041cb8b82fda994e78b56
* | | | Merge "JetPlayer uses C++ Thread not createThreadEtc"Glenn Kasten2011-11-171-7/+2
|\ \ \ \
| * | | | JetPlayer uses C++ Thread not createThreadEtcGlenn Kasten2011-11-161-7/+2
| |/ / / | | | | | | | | | | | | | | | | | | | | This permits leveraging future improvements to Thread. Change-Id: I60deed8565ed54f13d9f770c76504e411b154276
* | | | Bug 4903178 Restore priority and cgroup on stopGlenn Kasten2011-11-162-12/+24
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | On AudioTrack and AudioRecord stop or failed start, restore the priority and cgroup of the caller to their previous values, rather than forcing to NORMAL. Dependent on new thread APIs. Also fixes bug where priority was set to AUDIO but cgroup not set. Change-Id: Ib83893918fb4fdf57c6b87884b51038997a631d8
* | | am 716747f7: am 481ffa50: Merge "Fix for issue 5309336 -add videoeditor ↵Hong Teng2011-11-151-3/+7
|\ \ \ | |/ / | | | | | | | | | | | | | | | maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage." into ics-mr1 * commit '716747f7cb29b45e41c2870f12d39095f4ed80c8': Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage.
| * | Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames ↵Hong Teng2011-11-151-3/+7
| |\ \ | | | | | | | | | | | | in media_profiles.xml to limit the total memory usage." into ics-mr1
| | * | Fix for issue 5309336Hong Teng2011-11-141-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage. Change-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509
* | | | am 8a065423: am 23217182: Merge "Didn\'t mean to check this in..." into ics-mr1Andreas Huber2011-11-111-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '8a0654231ff36d938bc3451190cf67231195f1d0': Didn't mean to check this in...
| * | | Merge "Didn't mean to check this in..." into ics-mr1Andreas Huber2011-11-111-1/+1
| |\ \ \
| | * | | Didn't mean to check this in...Andreas Huber2011-11-111-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: Ie5a1902ff2613cd349ca5724f63a3fe3306640c7
* | | | | am 2c29a5cf: am 1f8c6212: Merge "visualizer: reset buffer if playback is ↵Eric Laurent2011-11-111-3/+25
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | idle" into ics-mr1 * commit '2c29a5cf1658532bca4e34f816fa30312241a336': visualizer: reset buffer if playback is idle
| * | | | Merge "visualizer: reset buffer if playback is idle" into ics-mr1Eric Laurent2011-11-111-3/+25
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | visualizer: reset buffer if playback is idleEric Laurent2011-11-101-3/+25
| | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Visualizer capture buffer must be reset if audio framework has stopped calling process for a given period of time to get read of residual data from previous captures. Issue 5571920. Change-Id: I6e73f971bb812cdbb2979a3b5e763abab07634eb
* | | | am 40461ee7: am cd556b82: Merge "Instead of asserting, signal a runtime ↵Andreas Huber2011-11-111-2/+15
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | error if the session doesn\'t contain" into ics-mr1 * commit '40461ee70161d8568663332f72be2353b04c34e7': Instead of asserting, signal a runtime error if the session doesn't contain
| * | | Merge "Instead of asserting, signal a runtime error if the session doesn't ↵Andreas Huber2011-11-111-2/+15
| |\ \ \ | | | | | | | | | | | | | | | contain" into ics-mr1
| | * | | Instead of asserting, signal a runtime error if the session doesn't containAndreas Huber2011-11-101-2/+15
| | |/ / | | | | | | | | | | | | | | | | | | | | any playable tracks at all. Change-Id: Ibbbe2fdcd53b7e020da80c84c8229856107a87e6
| * | | Merge "DO NOT MERGE: Instead of asserting, remove active streams if their ↵Andreas Huber2011-11-111-15/+47
| |\ \ \ | | | | | | | | | | | | | | | sockets" into ics-mr1