summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Fetch at least 192KB to avoid our mp3 sniffer from blocking on data." ↵Dave Burke2011-12-071-2/+2
|\ | | | | | | into ics-mr1
| * Fetch at least 192KB to avoid our mp3 sniffer from blocking on data.Andreas Huber2011-12-071-2/+2
| | | | | | | | | | Change-Id: Icb10c129249bb9b69e91f6633a385840c94efa59 related-to-bug: 5666532
* | Reconcile with ics-mr0-releaseThe Android Open Source Project2011-12-070-0/+0
|\ \ | |/ |/| | | Change-Id: I5341d7d7de8ec8dfa86095e8d8d45a912bb01a47
| * DO NOT MERGE: Remove the AVI extractor.Andreas Huber2011-12-063-6/+0
| | | | | | | | Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
* | Merge commit 'babb7200' into manualmergeAndreas Huber2011-12-060-0/+0
|\ \
| * | DO NOT MERGE: Remove the AVI extractor.Andreas Huber2011-12-063-6/+0
| |/ | | | | | | Change-Id: Ib9cb4a48bd817da703ef53eb14932616d2973ee0
* | Merge "DO NOT MERGE - Consider I-Frame at zeroeth position when searching ↵James Dong2011-12-061-0/+8
|\ \ | | | | | | | | | for sync frames" into ics-mr1
| * | DO NOT MERGE - Consider I-Frame at zeroeth position when searching for sync ↵James Dong2011-12-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | DO NOT MERGE: Remove the AVI extractor.Andreas Huber2011-12-063-6/+0
| | | | | | | | | | | | Change-Id: Ifce6c0d3d87aad2f5cc7f40ad6304936cbfa795e
* | | Merge "audioflinger: fix audio skipping over A2DP" into ics-mr1Eric Laurent2011-12-052-8/+14
|\ \ \ | |/ / |/| |
| * | audioflinger: fix audio skipping over A2DPEric Laurent2011-12-052-8/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Properly identify how much metadata we need to cache in order to instantiateAndreas Huber2011-12-053-41/+136
| | | | | | | | | | | | | | | | | | | | | the extractor without blocking (and therefore be able to abort). Change-Id: Id2acdde897e02baaeabadae70b7c95b66c9041b3 related-to-bug: 5666532
* | | MTP: Add support for restricting PTP to only certain subdirectories of the ↵Mike Lockwood2011-12-021-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | storage DO NOT MERGE Bug: 5527220 Change-Id: I81d6de590ea3002118ba46eb4b6d5fe9061c998c Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | MTP: Don't attempt to read more than 16K at a time from the MTP driver DO ↵Mike Lockwood2011-12-021-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE This could happen sometimes if other operations increased the size of the data packet buffer to > 16K Change-Id: I10f85f0ce32df39f46b0a984361958c0a13f6800 Signed-off-by: Mike Lockwood <lockwood@google.com>
* | | Fixes a typo in AVIExtractor that would advertise the wrong video dimensionsAndreas Huber2011-12-011-1/+1
| | | | | | | | | | | | | | | Change-Id: I587a5ce259b04c973ed2d7614e874cb74c521aab related-to-bug: 5696324
* | | 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
* | | | 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 "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
* | | | 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
* | | | 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
* | | 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 "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
* | | | Fix log spamming during time lapse video recordingJames Dong2011-11-214-14/+18
| |/ / |/| | | | | | | | | | | | | | 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
* | Merge "Make sure not to cancel pending seek/EOS notifications on a cache ↵Andreas Huber2011-11-172-8/+9
|\ \ | | | | | | | | | underrun..." into ics-mr1
| * | 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
* | | No-op merge from ics-mr0The Android Open Source Project2011-11-160-0/+0
|\ \ \ | |/ / |/| / | |/ Change-Id: I6be81522ac3e6d4d8fab545abde4d81e5bb2a2c6
| * Reconcile with ics-factoryrom-2-releaseThe Android Open Source Project2011-11-160-0/+0
| |\ | | | | | | | | | Change-Id: Idf18e15df810885a373fb4057f0db064771afc8e
* | \ Merge "Fix for issue 5309336 -add videoeditor maximum prefetch YUV frames ↵Hong Teng2011-11-152-8/+22
|\ \ \ | | | | | | | | | | | | in media_profiles.xml to limit the total memory usage." into ics-mr1
| * | | Fix for issue 5309336Hong Teng2011-11-142-8/+22
| | | | | | | | | | | | | | | | | | | | | | | | -add videoeditor maximum prefetch YUV frames in media_profiles.xml to limit the total memory usage. Change-Id: I41ffbc192fcce4c7635e5b0a1f2835852e5ee509
* | | | Merge "audioflinger: fix noise when skipping to next song" into ics-mr1Eric Laurent2011-11-142-13/+35
|\ \ \ \
| * | | | audioflinger: fix noise when skipping to next songEric Laurent2011-11-112-13/+35
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When audio effects are enabled, a noise can be heard at the beginning of the new song when skipping to next song in music app. This is because some effects (especially virtualizer) have a tail. This tail was not played when previous song was stopped because effects were not processed when no tracks were present on a given session. This is to reduce CPU load when effects are enabled but no audio is playing. The tail was then rendered when the new song was started. Added a delay before stopping effect process after all tracks have been removed from a session. Issue 5584880. Change-Id: I815e0f7441f9302e8dfe413dc269a94e4cc6fd95
* | | | 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
* | | | | 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
* | | | 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
| * | | | DO NOT MERGE: Instead of asserting, remove active streams if their socketsAndreas Huber2011-11-101-15/+47
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | return failure Change-Id: Icb47adfd2fbe0398c473ba66e068186311c9cc79 related-to-bug: 5593654
* | | | Merge "Disconnect on socket error on the RTSP control connection." into ics-mr1Andreas Huber2011-11-112-64/+72
|\ \ \ \
| * | | | Disconnect on socket error on the RTSP control connection.Andreas Huber2011-11-102-64/+72
| |/ / / | | | | | | | | | | | | Change-Id: Ib52a69f9b0830b481c6f5c9b1991d1f4cb36ec7b
* | | | Add support for retrieving location information in mp4/3gpp filesJames Dong2011-11-104-0/+38
|/ / / | | | | | | | | | | | | Change-Id: Ib8427704ef9ee5a4fa8fe1818c8a62d77b4ea687 related-to-bug: 5560253
* | | Merge "Send RTSP control connection keep-alive requests" into ics-mr1Andreas Huber2011-11-101-2/+92
|\ \ \
generated by cgit v1.1 at 2024-08-07 13:59:12 +0000